More code review improvements

hashicorp · Apr 14, 2021 · a523db7 · a523db7
1 parent 18c3637
commit a523db7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/connect-inject/container_init.go b/connect-inject/container_init.go
@@ -245,6 +245,8 @@ consul-k8s connect-init -pod-name=${POD_NAME} -pod-namespace=${POD_NAMESPACE} \
   -bootstrap > /consul/connect-inject/envoy-bootstrap.yaml
 
 {{- if .EnableTransparentProxy }}
+{{- /* The newline below is intentional to allow extra space
+       in the rendered template between this and the previous commands. */}}
 
 # Apply traffic redirection rules.
 /consul/connect-inject/consul connect redirect-traffic \

diff --git a/connect-inject/endpoints_controller.go b/connect-inject/endpoints_controller.go
@@ -31,7 +31,6 @@ const (
 	MetaKeyKubeServiceName     = "k8s-service-name"
 	MetaKeyKubeNS              = "k8s-namespace"
 	kubernetesSuccessReasonMsg = "Kubernetes health checks passing"
-	podPendingReasonMsg        = "Pod is pending"
 	envoyPrometheusBindAddr    = "envoy_prometheus_bind_addr"
 	clusterIPTaggedAddressName = "virtual"
 )

diff --git a/subcommand/inject-connect/command.go b/subcommand/inject-connect/command.go
@@ -153,7 +153,7 @@ func (c *Command) init() {
 	c.flagSet.StringVar(&c.flagCrossNamespaceACLPolicy, "consul-cross-namespace-acl-policy", "",
 		"[Enterprise Only] Name of the ACL policy to attach to all created Consul namespaces to allow service "+
 			"discovery across Consul namespaces. Only necessary if ACLs are enabled.")
-	c.flagSet.BoolVar(&c.flagEnableTransparentProxy, "enable-transparent-proxy", false,
+	c.flagSet.BoolVar(&c.flagEnableTransparentProxy, "enable-transparent-proxy", true,
 		"Enable transparent proxy mode for all Consul service mesh applications.")
 	c.flagSet.StringVar(&c.flagLogLevel, "log-level", "info",
 		"Log verbosity level. Supported values (in order of detail) are \"trace\", "+