Merge pull request #9271 from zalando-incubator/dev-to-kube-1.32

dev to kube-1.32

Author: mikkeloscar

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-74-g62d552b
+        image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-76-g1a28806
         env:
         - name: AWS_DEFAULT_REGION
           value: "{{.Cluster.Region}}"

cluster/manifests/deployment-service/status-service-deployment.yaml

@@ -1,4 +1,4 @@
-# {{ $image   := "container-registry.zalando.net/teapot/deployment-status-service:master-239" }}
+# {{ $image   := "container-registry.zalando.net/teapot/deployment-status-service:master-240" }}
 # {{ $version := index (split $image ":") 1 }}
 
 apiVersion: apps/v1

cluster/manifests/fabric-gateway/deployment.yaml

@@ -1,4 +1,4 @@
-# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-319" }}
+# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-320" }}
 # {{ $version := index (split $image ":") 1 }}
 apiVersion: apps/v1
 kind: Deployment

cluster/manifests/nvidia/nvidia-gpu-device-plugin.yaml

@@ -60,7 +60,7 @@ spec:
 {{- end}}
       containers:
       - name: nvidia-gpu-device-plugin
-        image: container-registry.zalando.net/teapot/nvidia-gpu-device-plugin:v0.17.1-master-17
+        image: container-registry.zalando.net/teapot/nvidia-gpu-device-plugin:v0.17.1-master-18
         args:
         - --pass-device-specs
         resources:

test/e2e/cluster_config.sh

@@ -52,6 +52,8 @@ clusters:
     skipper_open_policy_agent_observability_url: "${SKIPPER_OPA_OBSERVABILITY_URL}"
     skipper_open_policy_agent_bundles_url: "${SKIPPER_OPA_BUNDLES_URL}"
     eks_ip_family: "ipv6"
+    consolidation_policy: "WhenEmpty"
+    consolidate_after: "5m"
   criticality_level: 1
   environment: e2e
   id: ${CLUSTER_ID}
@@ -113,7 +115,6 @@ EOFF
     - default-for-karpenter
     config_items:
       scaling_priority: "100"
-      consolidate_after: "5m"
   - name: karpenter-arm
     profile: worker-karpenter
     discount_strategy: none
@@ -123,7 +124,6 @@ EOFF
     - not-specified
     config_items:
       requirements: "- key: kubernetes.io/arch\n  operator: In\n  values:\n  - arm64\n"
-      consolidate_after: "5m"
       taints: kubernetes.io/arch=arm64:NoSchedule
   - discount_strategy: spot
     instance_types:
@@ -151,7 +151,6 @@ EOFF
     config_items:
       labels: dedicated=node-tests
       taints: dedicated=node-tests:NoSchedule
-      consolidate_after: "5m"
   - discount_strategy: spot
     instance_types:
     - "g4dn.xlarge"
@@ -172,7 +171,6 @@ EOFF
     config_items:
       labels: zalando.org/nvidia-gpu=tesla
       taints: nvidia.com/gpu=present:NoSchedule
-      consolidate_after: "5m"
   - discount_strategy: none
     instance_types:
     - "default-for-karpenter"
@@ -183,7 +181,6 @@ EOFF
     config_items:
       labels: dedicated=node-reboot-tests
       taints: dedicated=node-reboot-tests:NoSchedule
-      consolidate_after: "5m"
   provider: ${CLUSTER_PROVIDER}
   region: ${REGION}
   owner: '${OWNER}'