Fix region/account for manifests generated from helm (aws#1592)

* Yamls generated from helm was missing region/account override

* fix domains

charts/aws-vpc-cni/templates/daemonset.yaml

@@ -40,7 +40,7 @@ spec:
       hostNetwork: true
       initContainers:
       - name: aws-vpc-cni-init
-        image: "{{- if .Values.init.image.override }}{{- .Values.init.image.override }}{{- else }}602401143452.dkr.ecr.{{- .Values.init.image.region }}.amazonaws.com/amazon-k8s-cni-init:{{- .Values.init.image.tag }}{{- end}}"
+        image: "{{- if .Values.init.image.override }}{{- .Values.init.image.override }}{{- else }}{{- .Values.init.image.account }}.dkr.ecr.{{- .Values.init.image.region }}.{{- .Values.init.image.domain }}/amazon-k8s-cni-init:{{- .Values.init.image.tag }}{{- end}}"
         env:
 {{- range $key, $value := .Values.init.env }}
           - name: {{ $key }}
@@ -62,7 +62,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: aws-node
-          image: "{{- if .Values.image.override }}{{- .Values.image.override }}{{- else }}602401143452.dkr.ecr.{{- .Values.image.region }}.amazonaws.com/amazon-k8s-cni:{{- .Values.image.tag }}{{- end}}"
+          image: "{{- if .Values.image.override }}{{- .Values.image.override }}{{- else }}{{- .Values.image.account }}.dkr.ecr.{{- .Values.image.region }}.{{- .Values.image.domain }}/amazon-k8s-cni:{{- .Values.image.tag }}{{- end}}"
           ports:
             - containerPort: 61678
               name: metrics

charts/aws-vpc-cni/values.yaml

@@ -10,7 +10,9 @@ init:
   image:
     tag: v1.9.0
     region: us-west-2
+    account: "602401143452"   
     pullPolicy: Always
+    domain: "amazonaws.com"  
     # Set to use custom image
     # override: "repo/org/image:tag"
   env:
@@ -21,6 +23,8 @@ init:
 image:
   region: us-west-2
   tag: v1.9.0
+  account: "602401143452"   
+  domain: "amazonaws.com"  
   pullPolicy: Always
   # Set to use custom image
   # override: "repo/org/image:tag"

charts/cni-metrics-helper/templates/deployment.yaml

@@ -21,5 +21,5 @@ spec:
           value: {{ $value | quote }}
 {{- end }}
         name: cni-metrics-helper
-        image: "{{- if .Values.image.override }}{{- .Values.image.override }}{{- else }}602401143452.dkr.ecr.{{- .Values.image.region }}.amazonaws.com/cni-metrics-helper:{{- .Values.image.tag }}{{- end}}"
-      serviceAccountName: {{ template "cni-metrics-helper.serviceAccountName" . }} 
+        image: "{{- if .Values.image.override }}{{- .Values.image.override }}{{- else }}{{- .Values.image.account }}.dkr.ecr.{{- .Values.image.region }}.{{- .Values.image.domain }}/cni-metrics-helper:{{- .Values.image.tag }}{{- end}}"
+      serviceAccountName: {{ template "cni-metrics-helper.serviceAccountName" . }} 

charts/cni-metrics-helper/values.yaml

@@ -4,7 +4,9 @@ nameOverride: cni-metrics-helper
 
 image:
   region: us-west-2
-  tag: v1.8.0
+  tag: v1.9.0
+  account: "602401143452"
+  domain: "amazonaws.com"   
   # Set to use custom image
   # override: "repo/org/image:tag"
 
@@ -20,4 +22,4 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name:
   annotations: {}
-    # eks.amazonaws.com/role-arn: arn:aws:iam::AWS_ACCOUNT_ID:role/IAM_ROLE_NAME  
+    # eks.amazonaws.com/role-arn: arn:aws:iam::AWS_ACCOUNT_ID:role/IAM_ROLE_NAME  

scripts/generate-cni-yaml.sh

@@ -16,7 +16,7 @@ INDV_RESOURCES_DIR=$BUILD_DIR/individual-resources
 CNI_TAR_RESOURCES_FILE=$BUILD_DIR/cni_individual-resources.tar
 METRICS_TAR_RESOURCES_FILE=$BUILD_DIR/cni_metrics_individual-resources.tar
 CALICO_TAR_RESOURCES_FILE=$BUILD_DIR/calico_individual-resources.tar
-CNI_RESOURCES_YAML=$BUILD_DIR/aws-vpc-cni
+CNI_RESOURCES_YAML=$BUILD_DIR/aws-k8s-cni
 METRICS_RESOURCES_YAML=$BUILD_DIR/cni-metrics-helper
 CALICO_OPERATOR_RESOURCES_YAML=$BUILD_DIR/calico-operator.yaml
 CALICO_CRS_RESOURCES_YAML=$BUILD_DIR/calico-crs.yaml
@@ -59,7 +59,6 @@ jq -c '.[]' $REGIONS_FILE | while read i; do
     ecrRegion=`echo $i | jq '.ecrRegion' -r`
     ecrAccount=`echo $i | jq '.ecrAccount' -r`
     ecrDomain=`echo $i | jq '.ecrDomain' -r`
-
     if [ "$ecrRegion" = "us-west-2" ]; then
         NEW_CNI_RESOURCES_YAML="${CNI_RESOURCES_YAML}.yaml"
         NEW_METRICS_RESOURCES_YAML="${METRICS_RESOURCES_YAML}.yaml"
@@ -73,27 +72,22 @@ jq -c '.[]' $REGIONS_FILE | while read i; do
 
     $BUILD_DIR/helm template charts/aws-vpc-cni \
       --set originalMatchLabels=true,\
-      initContainers.image.region=$ecrRegion,\
-      initContainers.image.account=$ecrAccount,\
-      initContainers.image.domain=$ecrDomain,\
-      image.region=$ecrRegion,\
-      image.account=$ecrAccount,\
-      image.domain=$ecrDomain \
+      --set init.image.region=$ecrRegion,\
+      --set init.image.account=$ecrAccount,\
+      --set init.image.domain=$ecrDomain,\
+      --set image.region=$ecrRegion,\
+      --set image.account=$ecrAccount,\
+      --set image.domain=$ecrDomain \
       --namespace $NAMESPACE \
-      --name-template aws-vpc-cni \
       $SCRIPTPATH/../charts/aws-vpc-cni > $NEW_CNI_RESOURCES_YAML
     cat $NEW_CNI_RESOURCES_YAML | grep -v 'helm.sh\|app.kubernetes.io/managed-by: Helm' > $BUILD_DIR/helm_annotations_removed.yaml
     mv $BUILD_DIR/helm_annotations_removed.yaml $NEW_CNI_RESOURCES_YAML
 
     $BUILD_DIR/helm template charts/cni-metrics-helper \
-      --set initContainers.image.region=$ecrRegion,\
-      initContainers.image.account=$ecrAccount,\
-      initContainers.image.domain=$ecrDomain,\
-      image.region=$ecrRegion,\
-      image.account=$ecrAccount,\
-      image.domain=$ecrDomain \
+      --set image.region=$ecrRegion,\
+      --set image.account=$ecrAccount,\
+      --set image.domain=$ecrDomain \
       --namespace $NAMESPACE \
-      --name-template cni-metrics-helper \
       $SCRIPTPATH/../charts/cni-metrics-helper > $NEW_METRICS_RESOURCES_YAML
     cat $NEW_METRICS_RESOURCES_YAML | grep -v 'helm.sh\|app.kubernetes.io/managed-by: Helm' > $BUILD_DIR/helm_annotations_removed.yaml
     mv $BUILD_DIR/helm_annotations_removed.yaml $NEW_METRICS_RESOURCES_YAML