Merge pull request #9774 from zalando-incubator/dev-to-kube-1.33

dev to kube-1.33

Author: mikkeloscar

.zappr.yaml

@@ -21,6 +21,7 @@ approvals:
           - demonCoder95
           - MustafaSaber
           - vlktna
+          - tcondeixa
 
 # mandatory pull request labels
 pull-request:

cluster/cluster.yaml

@@ -158,6 +158,11 @@ Resources:
     Type: 'AWS::EC2::SecurityGroup'
   EKSCluster:
     Type: AWS::EKS::Cluster
+{{- if eq .Cluster.ConfigItems.eks_control_plane_logging "true" }}
+{{- if eq .Cluster.ConfigItems.eks_control_plane_logging_migration "true" }}
+    DependsOn: ControlPlaneLogGroup
+{{- end }}
+{{- end }}
     Properties:
       Name: "{{.Cluster.Name}}"
       Version: "1.33"
@@ -3023,6 +3028,16 @@ Resources:
                 - BucketArn: !GetAtt AuditTrailBucket.Arn
 {{- end }}
 
+{{- if eq .Cluster.ConfigItems.eks_control_plane_logging "true" }}
+{{- if eq .Cluster.ConfigItems.eks_control_plane_logging_migration "true" }}
+  ControlPlaneLogGroup:
+    Type: AWS::Logs::LogGroup
+    Properties:
+      LogGroupName: "/aws/eks/{{.Cluster.LocalID}}/cluster"
+      RetentionInDays: 545
+{{- end }}
+{{- end }}
+
 {{- if index .Cluster.ConfigItems "session_manager_destination_arn" }}
   SessionManagerLogGroup:
     Type: AWS::Logs::LogGroup

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"
@@ -1282,6 +1283,7 @@ wiz_node_feature_rollout : "false"
 
 # EKS specific configuration
 eks_control_plane_logging: "true"
+eks_control_plane_logging_migration: "false"
 eks_ip_family: "ipv4"
 eks_zalando_iam_aws_proxy_cpu: "100m"
 eks_zalando_iam_aws_proxy_memory: "512Mi"

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 |

cluster/manifests/03-kube-aws-iam-controller/deployment.yaml

@@ -27,7 +27,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-aws-iam-controller
-        image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-82-g83974de
+        image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-84-g8bed7f3
         env:
         - name: AWS_DEFAULT_REGION
           value: "{{.Cluster.Region}}"

cluster/manifests/ingress-controller/deployment.yaml

@@ -1,4 +1,4 @@
-# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.18.7" }}
+# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.18.8" }}
 # {{ $version := index (split $image ":") 1 }}
 
 apiVersion: apps/v1

cluster/manifests/kube-state-metrics/deployment.yaml

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: kube-state-metrics
       containers:
       - name: kube-state-metrics
-        image: container-registry.zalando.net/teapot/kube-state-metrics:v2.15.0-master-29
+        image: container-registry.zalando.net/teapot/kube-state-metrics:v2.16.0-master-30
         args:
         - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments
         - --metric-labels-allowlist=pods=[{{.Cluster.ConfigItems.observability_metrics_pods_labels}}],ingresses=[{{.Cluster.ConfigItems.observability_metrics_ingresses_labels}}],nodes=[topology.kubernetes.io/zone,node.kubernetes.io/instance-type,node.kubernetes.io/node-pool,node.kubernetes.io/role,node.kubernetes.io/profile,dedicated]

cluster/manifests/skipper/deployment.yaml

@@ -1,7 +1,7 @@
 {{/* image-updater-bot detects *image variables so use print to disable it for main image */}}
 
 {{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.22.76-1183" }}
-{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.76-1183" }}
+{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.88-1195" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
 {{ $canary_args := "" }}