Adding IPv6 App Mesh feature to controllers (#596)

* Update logic to populate IpPreference based on ipFamily of the cluster.

* Updating chart version and controller image repository

* Fixing go.mod

* Updating the aws-sdk-go version

* Fixed failing integration test

* Updating the chart version to 1.5.0

* Remove GOPROXY direct to speed up the build process

Author: sshver

.gitignore

@@ -17,6 +17,7 @@ build
 # Ignore vendored files
 
 vendor
+override_model_dev.sh
 
 # editor and IDE paraphernalia
 .idea

apis/appmesh/v1beta2/mesh_types.go

@@ -81,6 +81,15 @@ type MeshSpec struct {
 	// Required if the account ID is not your own.
 	// +optional
 	MeshOwner *string `json:"meshOwner,omitempty"`
+	// +optional
+	ServiceDiscovery *MeshServiceDiscovery `json:"meshServiceDiscovery,omitempty"`
+}
+
+type MeshServiceDiscovery struct {
+	// The ipPreference for the mesh.
+	// +kubebuilder:validation:Enum=IPv6_ONLY;IPv4_ONLY
+	// +optional
+	IpPreference *string `json:"ipPreference,omitempty"`
 }
 
 // MeshStatus defines the observed state of Mesh

apis/appmesh/v1beta2/types.go

@@ -244,3 +244,8 @@ type SubjectAlternativeNames struct {
 	// Match is a required field
 	Match *SubjectAlternativeNameMatchers `json:"match"`
 }
+
+const (
+	IpPreferenceIPv4 string = "IPv4_ONLY"
+	IpPreferenceIPv6 string = "IPv6_ONLY"
+)

apis/appmesh/v1beta2/zz_generated.deepcopy.go

@@ -66,6 +66,15 @@ spec:
                 description: The AWS IAM account ID of the service mesh owner. Required
                   if the account ID is not your own.
                 type: string
+              meshServiceDiscovery:
+                properties:
+                  ipPreference:
+                    description: The ipPreference for the mesh.
+                    enum:
+                    - IPv6_ONLY
+                    - IPv4_ONLY
+                    type: string
+                type: object
               namespaceSelector:
                 description: "NamespaceSelector selects Namespaces using labels to
                   designate mesh membership. This field follows standard label selector

config/crd/bases/appmesh.k8s.aws_meshes.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: appmesh-controller
 description: App Mesh controller Helm chart for Kubernetes
-version: 1.4.7
-appVersion: 1.4.3
+version: 1.5.0
+appVersion: 1.5.0
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

config/helm/appmesh-controller/Chart.yaml

@@ -71,6 +71,7 @@ spec:
         - --preview={{ .Values.preview }}
         - --enable-sds={{ .Values.sds.enabled }}
         - --sds-uds-path={{ .Values.sds.udsPath }}
+        - --cluster-name={{ .Values.clusterName}}
         {{- if .Values.cloudMapCustomHealthCheck.enabled }}
         - --enable-custom-health-check=true
         {{- end }}

config/helm/appmesh-controller/crds/crds.yaml

@@ -6,10 +6,11 @@ replicaCount: 1
 region: ""
 accountId: ""
 preview: false
+clusterName: ""
 
 image:
-  repository: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
-  tag: v1.4.3
+  repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
+  tag: v1.5.0
   pullPolicy: IfNotPresent
 
 sidecar:

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

@@ -6,10 +6,11 @@ replicaCount: 1
 region: ""
 accountId: ""
 preview: false
+clusterName: ""
 
 image:
-  repository: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
-  tag: v1.4.3
+  repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
+  tag: v1.5.0
   pullPolicy: IfNotPresent
 
 sidecar: