github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8189 from dmcgowan/shim-max-version

Browse Source 
Add max shim version environment variable
This commit is contained in:
Fu Wei 2023-03-02 07:50:13 +08:00 committed by GitHub
commit f681d409ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/v2/shim/shim.go
View File

@ -149,6 +149,7 @@ const (
ttrpcAddressEnv = "TTRPC_ADDRESS" ttrpcAddressEnv = "TTRPC_ADDRESS"
grpcAddressEnv = "GRPC_ADDRESS" grpcAddressEnv = "GRPC_ADDRESS"
namespaceEnv = "NAMESPACE" namespaceEnv = "NAMESPACE"
maxVersionEnv = "MAX_SHIM_VERSION"
) )
func parseFlags() { func parseFlags() {

1
runtime/v2/shim/util.go
View File

@ -68,6 +68,7 @@ func Command(ctx context.Context, config *CommandConfig) (*exec.Cmd, error) {
cmd.Env = append( cmd.Env = append(
os.Environ(), os.Environ(),
"GOMAXPROCS=2", "GOMAXPROCS=2",
fmt.Sprintf("%s=2", maxVersionEnv),
fmt.Sprintf("%s=%s", ttrpcAddressEnv, config.TTRPCAddress), fmt.Sprintf("%s=%s", ttrpcAddressEnv, config.TTRPCAddress),
fmt.Sprintf("%s=%s", grpcAddressEnv, config.Address), fmt.Sprintf("%s=%s", grpcAddressEnv, config.Address),
fmt.Sprintf("%s=%s", namespaceEnv, ns), fmt.Sprintf("%s=%s", namespaceEnv, ns),