Adding Envoy Variable for using dualstack endpoints and enabling admin access for IPv6 (#579)

Author: sshver

config/helm/appmesh-controller/templates/deployment.yaml

@@ -68,6 +68,8 @@ spec:
         - --readiness-probe-period={{ .Values.sidecar.probes.readinessProbePeriod }}
         - --envoy-admin-access-port={{ .Values.sidecar.envoyAdminAccessPort }}
         - --envoy-admin-access-log-file={{ .Values.sidecar.envoyAdminAccessLogFile }}
+        - --envoy-admin-access-enable-ipv6={{ .Values.sidecar.envoyAdminAccessEnableIPv6 }}
+        - --dual-stack-endpoint={{ .Values.sidecar.useDualStackEndpoint }}
         - --preview={{ .Values.preview }}
         - --enable-sds={{ .Values.sds.enabled }}
         - --sds-uds-path={{ .Values.sds.udsPath }}

config/helm/appmesh-controller/test.yaml

@@ -21,6 +21,8 @@ sidecar:
   logLevel: info
   envoyAdminAccessPort: 9901
   envoyAdminAccessLogFile: /tmp/envoy_admin_access.log
+  envoyAdminAccessEnableIPv6: false
+  useDualStackEndpoint: false
   resources:
     # sidecar.resources.requests: Envoy CPU and memory requests
     requests:

config/helm/appmesh-controller/values.yaml

@@ -21,6 +21,8 @@ sidecar:
   logLevel: info
   envoyAdminAccessPort: 9901
   envoyAdminAccessLogFile: /tmp/envoy_admin_access.log
+  envoyAdminAccessEnableIPv6: false
+  useDualStackEndpoint: false
   resources:
     # sidecar.resources.requests: Envoy CPU and memory requests
     requests:

pkg/inject/config.go

@@ -24,6 +24,8 @@ const (
 	flagReadinessProbePeriod       = "readiness-probe-period"
 	flagEnvoyAdminAccessPort       = "envoy-admin-access-port"
 	flagEnvoyAdminAccessLogFile    = "envoy-admin-access-log-file"
+	flagEnvoyAdminAccessEnableIpv6 = "envoy-admin-access-enable-ipv6"
+	flagDualStackEndpoint          = "dual-stack-endpoint"
 
 	flagInitImage  = "init-image"
 	flagIgnoredIPs = "ignored-ips"
@@ -73,6 +75,8 @@ type Config struct {
 	ReadinessProbePeriod       int32
 	EnvoyAdminAcessPort        int32
 	EnvoyAdminAccessLogFile    string
+	DualStackEndpoint          bool
+	EnvoyAdminAccessEnableIPv6 bool
 
 	// Init container settings
 	InitImage  string
@@ -181,6 +185,8 @@ func (cfg *Config) BindFlags(fs *pflag.FlagSet) {
 		"DogStatsD Agent tracing port")
 	fs.StringVar(&cfg.StatsDSocketPath, flagStatsDSocketPath, "",
 		"DogStatsD Agent unix domain socket")
+	fs.BoolVar(&cfg.DualStackEndpoint, flagDualStackEndpoint, false, "Use DualStack Endpoint")
+	fs.BoolVar(&cfg.DualStackEndpoint, flagEnvoyAdminAccessEnableIpv6, false, "Enable Admin access when using IPv6")
 	fs.StringVar(&cfg.ClusterName, flagClusterName, "", "ClusterName in context")
 }
 

pkg/inject/envoy.go

@@ -46,6 +46,8 @@ type envoyMutatorConfig struct {
 	statsDSocketPath           string
 	controllerVersion          string
 	k8sVersion                 string
+	useDualStackEndpoint       bool
+	enableAdminAccessIPv6      bool
 }
 
 func newEnvoyMutator(mutatorConfig envoyMutatorConfig, ms *appmesh.Mesh, vn *appmesh.VirtualNode) *envoyMutator {
@@ -113,6 +115,7 @@ func (m *envoyMutator) buildTemplateVariables(pod *corev1.Pod) EnvoyTemplateVari
 	meshName := m.getAugmentedMeshName()
 	virtualNodeName := aws.StringValue(m.vn.Spec.AWSName)
 	preview := m.getPreview(pod)
+	useDualStackEndpoint := m.getUseDualStackEndpoint(m.mutatorConfig.useDualStackEndpoint)
 	sdsEnabled := m.mutatorConfig.enableSDS
 	if m.mutatorConfig.enableSDS && isSDSDisabled(pod) {
 		sdsEnabled = false
@@ -146,6 +149,8 @@ func (m *envoyMutator) buildTemplateVariables(pod *corev1.Pod) EnvoyTemplateVari
 		StatsDSocketPath:         m.mutatorConfig.statsDSocketPath,
 		ControllerVersion:        m.mutatorConfig.controllerVersion,
 		K8sVersion:               m.mutatorConfig.k8sVersion,
+		UseDualStackEndpoint:     useDualStackEndpoint,
+		EnableAdminAccessForIpv6: m.mutatorConfig.enableAdminAccessIPv6,
 	}
 }
 
@@ -246,3 +251,11 @@ func (m *envoyMutator) getVolumeMounts(pod *corev1.Pod) (map[string]string, erro
 	}
 	return volumeMounts, nil
 }
+
+func (m *envoyMutator) getUseDualStackEndpoint(useDualStackEndpoint bool) string {
+	if useDualStackEndpoint {
+		return "1"
+	} else {
+		return "0"
+	}
+}