diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go index ba6da4c03..05c4d6646 100644 --- a/runtime/v2/runc/v1/service.go +++ b/runtime/v2/runc/v1/service.go @@ -119,7 +119,6 @@ func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, co "-namespace", ns, "-id", id, "-address", containerdAddress, - "-ttrpc-address", containerdTTRPCAddress, } cmd := exec.Command(self, args...) cmd.Dir = cwd diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go index e0ddfd3f4..9bdef0e24 100644 --- a/runtime/v2/runc/v2/service.go +++ b/runtime/v2/runc/v2/service.go @@ -135,7 +135,6 @@ func newCommand(ctx context.Context, id, containerdBinary, containerdAddress, co "-namespace", ns, "-id", id, "-address", containerdAddress, - "-ttrpc-address", containerdTTRPCAddress, } cmd := exec.Command(self, args...) cmd.Dir = cwd diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index c05d75b49..2b527c48b 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -89,11 +89,14 @@ var ( socketFlag string bundlePath string addressFlag string - ttrpcAddressFlag string containerdBinaryFlag string action string ) +const ( + ttrpcAddressEnv = "TTRPC_ADDRESS" +) + func parseFlags() { flag.BoolVar(&debugFlag, "debug", false, "enable debug output in logs") flag.StringVar(&namespaceFlag, "namespace", "", "namespace that owns the shim") @@ -102,7 +105,6 @@ func parseFlags() { flag.StringVar(&bundlePath, "bundle", "", "path to the bundle if not workdir") flag.StringVar(&addressFlag, "address", "", "grpc address back to main containerd") - flag.StringVar(&ttrpcAddressFlag, "ttrpc-address", "", "ttrpc address back to main containerd") flag.StringVar(&containerdBinaryFlag, "publish-binary", "containerd", "path to publish binary (used for publishing events)") flag.Parse() @@ -165,7 +167,9 @@ func run(id string, initFunc Init, config Config) error { } } - publisher, err := newPublisher(ttrpcAddressFlag) + ttrpcAddress := os.Getenv(ttrpcAddressEnv) + + publisher, err := newPublisher(ttrpcAddress) if err != nil { return err } @@ -204,7 +208,7 @@ func run(id string, initFunc Init, config Config) error { } return nil case "start": - address, err := service.StartShim(ctx, idFlag, containerdBinaryFlag, addressFlag, ttrpcAddressFlag) + address, err := service.StartShim(ctx, idFlag, containerdBinaryFlag, addressFlag, ttrpcAddress) if err != nil { return err } diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go index 044a6ead6..c8efd0dac 100644 --- a/runtime/v2/shim/util.go +++ b/runtime/v2/shim/util.go @@ -50,7 +50,6 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd args := []string{ "-namespace", ns, "-address", containerdAddress, - "-ttrpc-address", containerdTTRPCAddress, "-publish-binary", self, } args = append(args, cmdArgs...) @@ -96,7 +95,11 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd cmd := exec.Command(cmdPath, args...) cmd.Dir = path - cmd.Env = append(os.Environ(), "GOMAXPROCS=2") + cmd.Env = append( + os.Environ(), + "GOMAXPROCS=2", + fmt.Sprintf("%s=%s", ttrpcAddressEnv, containerdTTRPCAddress), + ) cmd.SysProcAttr = getSysProcAttr() if opts != nil { d, err := proto.Marshal(opts)