Merge dev to dev-to-alpha

Author: k8s-on-aws-manager-app[bot]

cluster/config-defaults.yaml

@@ -765,7 +765,8 @@ etcd_instance_type: "t3.medium"
 
 etcd_scalyr_key: ""
 
-etcd_ami: {{ amiID "zalando-ubuntu-etcd-production-v3.5.18-amd64-main-35" "861068367966"}}
+etcd_ami_amd64: {{ amiID "zalando-ubuntu-etcd-production-v3.5.22-amd64-main-38" "861068367966"}}
+etcd_ami_arm64: {{ amiID "zalando-ubuntu-etcd-production-v3.5.22-arm64-main-38" "861068367966"}}
 
 cluster_dns: "coredns"
 coredns_log_svc_names: "true"

cluster/etcd/stack.yaml

@@ -6,6 +6,11 @@ Metadata:
     "kubernetes:component": "etcd-cluster"
     application: "kubernetes"
     component: "etcd-cluster"
+Mappings:
+  Images:
+      {{.Cluster.Region}}:
+        # Use the etcd instance architecture to construct the config item name that we're using to get the AMI name.
+        MachineImage: '{{ index .Cluster.ConfigItems (print "etcd_ami_" .Values.etcd_instance_type_info.Architecture) }}'
 Outputs:
   EtcdClusterSecurityGroupId:
     Description: "Security Group ID of the etcd cluster"
@@ -53,7 +58,10 @@ Resources:
         IamInstanceProfile:
           Name: !Ref AppServerInstanceProfile
         InstanceInitiatedShutdownBehavior: terminate
-        ImageId: {{.Cluster.ConfigItems.etcd_ami}}
+        ImageId: !FindInMap
+          - Images
+          - !Ref 'AWS::Region'
+          - MachineImage
         InstanceType: {{.Cluster.ConfigItems.etcd_instance_type}}
         UserData:
           Fn::Base64: !Sub |