hashicorp · ndhanushkodi · Feb 9, 2021 · Jan 30, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ## UNRELEASED
 
 BREAKING CHANGES
+* Connect: the `lifecycle-sidecar` command has been renamed to `consul-sidecar`. [[GH-428](https://github.com/hashicorp/consul-k8s/pull/428)]
+* Connect: the `consul-connect-lifecycle-sidecar` container name has been changed to `consul-sidecar` and the `consul-connect-envoy-sidecar` container name has been changed to `envoy-sidecar`. 
+[[GH-428](https://github.com/hashicorp/consul-k8s/pull/428)]
 * Connect: the `-default-protocol` and `-enable-central-config` flags are no longer supported.
   The `consul.hashicorp.com/connect-service-protocol` annotation on Connect pods is also
   no longer supported. [[GH-418](https://github.com/hashicorp/consul-k8s/pull/418)]

diff --git a/commands.go b/commands.go
@@ -4,12 +4,12 @@ import (
 	"os"
 
 	cmdACLInit "github.com/hashicorp/consul-k8s/subcommand/acl-init"
+	cmdConsulSidecar "github.com/hashicorp/consul-k8s/subcommand/consul-sidecar"
 	cmdController "github.com/hashicorp/consul-k8s/subcommand/controller"
 	cmdCreateFederationSecret "github.com/hashicorp/consul-k8s/subcommand/create-federation-secret"
 	cmdDeleteCompletedJob "github.com/hashicorp/consul-k8s/subcommand/delete-completed-job"
 	cmdGetConsulClientCA "github.com/hashicorp/consul-k8s/subcommand/get-consul-client-ca"
 	cmdInjectConnect "github.com/hashicorp/consul-k8s/subcommand/inject-connect"
-	cmdLifecycleSidecar "github.com/hashicorp/consul-k8s/subcommand/lifecycle-sidecar"
 	cmdServerACLInit "github.com/hashicorp/consul-k8s/subcommand/server-acl-init"
 	cmdServiceAddress "github.com/hashicorp/consul-k8s/subcommand/service-address"
 	cmdSyncCatalog "github.com/hashicorp/consul-k8s/subcommand/sync-catalog"
@@ -35,8 +35,8 @@ func init() {
 			return &cmdInjectConnect.Command{UI: ui}, nil
 		},
 
-		"lifecycle-sidecar": func() (cli.Command, error) {
-			return &cmdLifecycleSidecar.Command{UI: ui}, nil
+		"consul-sidecar": func() (cli.Command, error) {
+			return &cmdConsulSidecar.Command{UI: ui}, nil
 		},
 
 		"server-acl-init": func() (cli.Command, error) {

diff --git a/connect-inject/lifecycle_sidecar.go → connect-inject/consul_sidecar.go b/connect-inject/lifecycle_sidecar.go → connect-inject/consul_sidecar.go
@@ -6,10 +6,10 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-func (h *Handler) lifecycleSidecar(pod *corev1.Pod) corev1.Container {
+func (h *Handler) consulSidecar(pod *corev1.Pod) corev1.Container {
 	command := []string{
 		"consul-k8s",
-		"lifecycle-sidecar",
+		"consul-sidecar",
 		"-service-config", "/consul/connect-inject/service.hcl",
 		"-consul-binary", "/consul/connect-inject/consul",
 	}
@@ -54,7 +54,7 @@ func (h *Handler) lifecycleSidecar(pod *corev1.Pod) corev1.Container {
 	}
 
 	return corev1.Container{
-		Name:  "consul-connect-lifecycle-sidecar",
+		Name:  "consul-sidecar",
 		Image: h.ImageConsulK8S,
 		Env:   envVariables,
 		VolumeMounts: []corev1.VolumeMount{
@@ -64,6 +64,6 @@ func (h *Handler) lifecycleSidecar(pod *corev1.Pod) corev1.Container {
 			},
 		},
 		Command:   command,
-		Resources: h.LifecycleSidecarResources,
+		Resources: h.ConsulSidecarResources,
 	}
 }
diff --git a/connect-inject/lifecycle_sidecar_test.go → connect-inject/consul_sidecar_test.go b/connect-inject/lifecycle_sidecar_test.go → connect-inject/consul_sidecar_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	lifecycleResources = corev1.ResourceRequirements{
+	consulSidecarResources = corev1.ResourceRequirements{
 		Requests: corev1.ResourceList{
 			corev1.ResourceCPU:    resource.MustParse("10m"),
 			corev1.ResourceMemory: resource.MustParse("25Mi"),
@@ -27,14 +27,14 @@ var (
 // would require a lot of boilerplate to get at the underlying patches that would
 // complicate understanding the tests (which are simple).
 
-// Test that the lifecycle sidecar is as expected.
-func TestLifecycleSidecar_Default(t *testing.T) {
+// Test that the Consul sidecar is as expected.
+func TestConsulSidecar_Default(t *testing.T) {
 	handler := Handler{
-		Log:                       hclog.Default().Named("handler"),
-		ImageConsulK8S:            "hashicorp/consul-k8s:9.9.9",
-		LifecycleSidecarResources: lifecycleResources,
+		Log:                    hclog.Default().Named("handler"),
+		ImageConsulK8S:         "hashicorp/consul-k8s:9.9.9",
+		ConsulSidecarResources: consulSidecarResources,
 	}
-	container := handler.lifecycleSidecar(&corev1.Pod{
+	container := handler.consulSidecar(&corev1.Pod{
 		Spec: corev1.PodSpec{
 			Containers: []corev1.Container{
 				{
@@ -44,7 +44,7 @@ func TestLifecycleSidecar_Default(t *testing.T) {
 		},
 	})
 	require.Equal(t, corev1.Container{
-		Name:  "consul-connect-lifecycle-sidecar",
+		Name:  "consul-sidecar",
 		Image: "hashicorp/consul-k8s:9.9.9",
 		Env: []corev1.EnvVar{
 			{
@@ -65,25 +65,25 @@ func TestLifecycleSidecar_Default(t *testing.T) {
 			},
 		},
 		Command: []string{
-			"consul-k8s", "lifecycle-sidecar",
+			"consul-k8s", "consul-sidecar",
 			"-service-config", "/consul/connect-inject/service.hcl",
 			"-consul-binary", "/consul/connect-inject/consul",
 		},
-		Resources: lifecycleResources,
+		Resources: consulSidecarResources,
 	}, container)
 }
 
 // Test that if there's an auth method we set the -token-file flag
 // and if there isn't we don't.
-func TestLifecycleSidecar_AuthMethod(t *testing.T) {
+func TestConsulSidecar_AuthMethod(t *testing.T) {
 	for _, authMethod := range []string{"", "auth-method"} {
 		t.Run("authmethod: "+authMethod, func(t *testing.T) {
 			handler := Handler{
 				Log:            hclog.Default().Named("handler"),
 				AuthMethod:     authMethod,
 				ImageConsulK8S: "hashicorp/consul-k8s:9.9.9",
 			}
-			container := handler.lifecycleSidecar(&corev1.Pod{
+			container := handler.consulSidecar(&corev1.Pod{
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
 						{
@@ -107,12 +107,12 @@ func TestLifecycleSidecar_AuthMethod(t *testing.T) {
 
 // Test that if there's an annotation on the original pod that changes the sync
 // period we use that value.
-func TestLifecycleSidecar_SyncPeriodAnnotation(t *testing.T) {
+func TestConsulSidecar_SyncPeriodAnnotation(t *testing.T) {
 	handler := Handler{
 		Log:            hclog.Default().Named("handler"),
 		ImageConsulK8S: "hashicorp/consul-k8s:9.9.9",
 	}
-	container := handler.lifecycleSidecar(&corev1.Pod{
+	container := handler.consulSidecar(&corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Annotations: map[string]string{
 				"consul.hashicorp.com/connect-sync-period": "55s",
@@ -132,14 +132,14 @@ func TestLifecycleSidecar_SyncPeriodAnnotation(t *testing.T) {
 
 // Test that the Consul address uses HTTPS
 // and that the CA is provided
-func TestLifecycleSidecar_TLS(t *testing.T) {
+func TestConsulSidecar_TLS(t *testing.T) {
 	handler := Handler{
-		Log:                       hclog.Default().Named("handler"),
-		ImageConsulK8S:            "hashicorp/consul-k8s:9.9.9",
-		ConsulCACert:              "consul-ca-cert",
-		LifecycleSidecarResources: lifecycleResources,
+		Log:                    hclog.Default().Named("handler"),
+		ImageConsulK8S:         "hashicorp/consul-k8s:9.9.9",
+		ConsulCACert:           "consul-ca-cert",
+		ConsulSidecarResources: consulSidecarResources,
 	}
-	container := handler.lifecycleSidecar(&corev1.Pod{
+	container := handler.consulSidecar(&corev1.Pod{
 		Spec: corev1.PodSpec{
 			Containers: []corev1.Container{
 				{
@@ -149,7 +149,7 @@ func TestLifecycleSidecar_TLS(t *testing.T) {
 		},
 	})
 	require.Equal(t, corev1.Container{
-		Name:  "consul-connect-lifecycle-sidecar",
+		Name:  "consul-sidecar",
 		Image: "hashicorp/consul-k8s:9.9.9",
 		Env: []corev1.EnvVar{
 			{
@@ -174,10 +174,10 @@ func TestLifecycleSidecar_TLS(t *testing.T) {
 			},
 		},
 		Command: []string{
-			"consul-k8s", "lifecycle-sidecar",
+			"consul-k8s", "consul-sidecar",
 			"-service-config", "/consul/connect-inject/service.hcl",
 			"-consul-binary", "/consul/connect-inject/consul",
 		},
-		Resources: lifecycleResources,
+		Resources: consulSidecarResources,
 	}, container)
 }
diff --git a/connect-inject/container_init.go b/connect-inject/container_init.go
@@ -362,7 +362,7 @@ EOF
   {{- end }}
   {{- end }}
   -meta="pod=${POD_NAMESPACE}/${POD_NAME}"
-{{- /* The acl token file needs to be read by the lifecycle-sidecar which runs
+{{- /* The acl token file needs to be read by the consul-sidecar which runs
        as non-root user consul-k8s. */}}
 chmod 444 /consul/connect-inject/acl-token
 {{- end }}

diff --git a/connect-inject/envoy_sidecar.go b/connect-inject/envoy_sidecar.go
@@ -43,7 +43,7 @@ func (h *Handler) envoySidecar(pod *corev1.Pod, k8sNamespace string) (corev1.Con
 	}
 
 	container := corev1.Container{
-		Name:  "consul-connect-envoy-sidecar",
+		Name:  "envoy-sidecar",
 		Image: h.ImageEnvoy,
 		Env: []corev1.EnvVar{
 			{

diff --git a/connect-inject/handler.go b/connect-inject/handler.go
@@ -72,7 +72,7 @@ const (
 	annotationMeta = "consul.hashicorp.com/service-meta-"
 
 	// annotationSyncPeriod controls the -sync-period flag passed to the
-	// consul-k8s lifecycle-sidecar command. This flag controls how often the
+	// consul-k8s consul-sidecar command. This flag controls how often the
 	// service is synced (i.e. re-registered) with the local agent.
 	annotationSyncPeriod = "consul.hashicorp.com/connect-sync-period"
 
@@ -117,7 +117,7 @@ type Handler struct {
 	ImageEnvoy  string
 
 	// ImageConsulK8S is the container image for consul-k8s to use.
-	// This image is used for the lifecycle-sidecar container.
+	// This image is used for the consul-sidecar container.
 	ImageConsulK8S string
 
 	// Optional: set when you need extra options to be set when running envoy
@@ -187,9 +187,9 @@ type Handler struct {
 	// will be populated by the defaults provided in the initial flags.
 	InitContainerResources corev1.ResourceRequirements
 
-	// Resource settings for lifecycle sidecar. All of these fields
+	// Resource settings for Consul sidecar. All of these fields
 	// will be populated by the defaults provided in the initial flags.
-	LifecycleSidecarResources corev1.ResourceRequirements
+	ConsulSidecarResources corev1.ResourceRequirements
 
 	// Log
 	Log hclog.Logger
@@ -342,7 +342,7 @@ func (h *Handler) Mutate(req *v1beta1.AdmissionRequest) *v1beta1.AdmissionRespon
 		[]corev1.Container{container},
 		"/spec/initContainers")...)
 
-	// Add the Envoy and lifecycle sidecars.
+	// Add the Envoy and Consul sidecars.
 	esContainer, err := h.envoySidecar(&pod, req.Namespace)
 	if err != nil {
 		h.Log.Error("Error configuring injection sidecar container", "err", err, "Request Name", req.Name)
@@ -352,7 +352,7 @@ func (h *Handler) Mutate(req *v1beta1.AdmissionRequest) *v1beta1.AdmissionRespon
 			},
 		}
 	}
-	connectContainer := h.lifecycleSidecar(&pod)
+	connectContainer := h.consulSidecar(&pod)
 	patches = append(patches, addContainer(
 		pod.Spec.Containers,
 		[]corev1.Container{esContainer, connectContainer},

diff --git a/connect-inject/health_check_resource_test.go b/connect-inject/health_check_resource_test.go
@@ -554,7 +554,7 @@ func TestReconcile_IgnoreStatuses(t *testing.T) {
 			},
 			ContainerStatuses: []corev1.ContainerStatus{
 				{
-					Name: "consul-connect-envoy-sidecar",
+					Name: "envoy-sidecar",
 					State: corev1.ContainerState{
 						Terminated: &corev1.ContainerStateTerminated{
 							ExitCode:   0,
@@ -566,7 +566,7 @@ func TestReconcile_IgnoreStatuses(t *testing.T) {
 					Ready: false,
 				},
 				{
-					Name: "consul-connect-lifecycle-sidecar",
+					Name: "consul-sidecar",
 					State: corev1.ContainerState{
 						Terminated: &corev1.ContainerStateTerminated{
 							ExitCode:   2,
@@ -783,7 +783,7 @@ func testServerAgentResourceAndControllerWithConsulNS(t *testing.T, pod *corev1.
 // non-init containers when init containers are still running.
 var unreadyAppContainers = []corev1.ContainerStatus{
 	{
-		Name: "consul-connect-envoy-sidecar",
+		Name: "envoy-sidecar",
 		State: corev1.ContainerState{
 			Waiting: &corev1.ContainerStateWaiting{
 				Reason: "PodInitializing",
@@ -792,7 +792,7 @@ var unreadyAppContainers = []corev1.ContainerStatus{
 		Ready: false,
 	},
 	{
-		Name: "consul-connect-lifecycle-sidecar",
+		Name: "consul-sidecar",
 		State: corev1.ContainerState{
 			Waiting: &corev1.ContainerStateWaiting{
 				Reason: "PodInitializing",

diff --git a/go.sum b/go.sum
@@ -55,8 +55,6 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.4 h1:Xqf+7f2Vhl9tsqDYmXhnXInUdcrtgpRNpIA15/uldSc=
-github.com/armon/go-metrics v0.3.4/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-metrics v0.3.6 h1:x/tmtOF9cDBoXH7XoAGOz2qqm1DknFD1590XmD/DUJ8=
 github.com/armon/go-metrics v0.3.6/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -256,12 +254,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/hashicorp/consul/api v1.4.1-0.20201007080954-aa0f5ff839c5 h1:mHgaDaPdf0z3UG3G2UpCINFMRKhzi1DLNoOp6sIQWnU=
-github.com/hashicorp/consul/api v1.4.1-0.20201007080954-aa0f5ff839c5/go.mod h1:1NSuaUUkFaJzMasbfq/11wKYWSR67Xn6r2DXKhuDNFg=
 github.com/hashicorp/consul/api v1.4.1-0.20210203205937-0d1301c408a3 h1:tpdztuA6xykU8LH3SeAxefJ4nab0K4KbE8Fu/F9C/ZI=
 github.com/hashicorp/consul/api v1.4.1-0.20210203205937-0d1301c408a3/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk=
-github.com/hashicorp/consul/sdk v0.4.1-0.20201006182405-a2a8e9c7839a h1:yclqizoDCodLeiAUg1Siaodz3hvIBxzH8A2GnjY74EU=
-github.com/hashicorp/consul/sdk v0.4.1-0.20201006182405-a2a8e9c7839a/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM=
 github.com/hashicorp/consul/sdk v0.7.0 h1:H6R9d008jDcHPQPAqPNuydAshJ4v5/8URdFnUvK/+sc=
 github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
@@ -278,8 +272,6 @@ github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39
 github.com/hashicorp/go-hclog v0.15.0 h1:qMuK0wxsoW4D0ddCCYwPSTm4KQv1X1ke3WmPWZ0Mvsk=
 github.com/hashicorp/go-hclog v0.15.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.2.0 h1:l6UW37iCXwZkZoAbEYnptSHVE/cQ5bOTPYG5W3vf9+8=
-github.com/hashicorp/go-immutable-radix v1.2.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE=
 github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
@@ -309,8 +301,6 @@ github.com/hashicorp/mdns v1.0.1 h1:XFSOubp8KWB+Jd2PDyaX5xUd5bhSP/+pTDZVDMzZJM8=
 github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
 github.com/hashicorp/memberlist v0.2.2 h1:5+RffWKwqJ71YPu9mWsF7ZOscZmwfasdA8kbdC7AO2g=
 github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/serf v0.9.3 h1:AVF6JDQQens6nMHT9OGERBvK0f8rPrAGILnsKLr6lzM=
-github.com/hashicorp/serf v0.9.3/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/hashicorp/serf v0.9.5 h1:EBWvyu9tcRszt3Bxp3KNssBMP1KuHWyO51lz9+786iM=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
 github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw=
@@ -397,8 +387,6 @@ github.com/mitchellh/go-testing-interface v1.14.0/go.mod h1:gfgS7OtZj6MA4U1UrDRp
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
-github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -634,8 +622,6 @@ golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git a/subcommand/lifecycle-sidecar/command.go → subcommand/consul-sidecar/command.go b/subcommand/lifecycle-sidecar/command.go → subcommand/consul-sidecar/command.go
@@ -187,9 +187,9 @@ func (c *Command) Help() string {
 	return c.help
 }
 
-const synopsis = "Connect lifecycle sidecar."
+const synopsis = "Consul sidecar for Connect."
 const help = `
-Usage: consul-k8s lifecycle-sidecar [options]
+Usage: consul-k8s consul-sidecar [options]
 
   Run as a sidecar to your Connect service. Ensures that your service
   is registered with the local Consul client.

diff --git a/...and/lifecycle-sidecar/command_ent_test.go → ...ommand/consul-sidecar/command_ent_test.go b/...and/lifecycle-sidecar/command_ent_test.go → ...ommand/consul-sidecar/command_ent_test.go
diff --git a/subcommand/lifecycle-sidecar/command_test.go → subcommand/consul-sidecar/command_test.go b/subcommand/lifecycle-sidecar/command_test.go → subcommand/consul-sidecar/command_test.go