Merge pull request #8804 from zalando-incubator/dev-to-eks

dev to eks

.zappr.yaml

@@ -19,8 +19,8 @@ approvals:
           - zaklawrencea
           - myaser
           - demonCoder95
-          - RomanZavodskikh
           - MustafaSaber
+          - vlktna
 
 # mandatory pull request labels
 pull-request:

cluster/manifests/fabric-gateway/deployment.yaml

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

cluster/manifests/fabric-gateway/fabricgateway_crd.yaml

@@ -456,6 +456,7 @@ spec:
                     description: |-
                       The name of the StackSet resource in the same namespace which
                       should be handling requests coming through FabricGateway
+                    maxLength: 63
                     type: string
                   stackVersion:
                     description: |-
@@ -629,6 +630,9 @@ spec:
         required:
         - spec
         type: object
+        x-kubernetes-validations:
+          - message: metadata.name may not be longer than 63, see https://fabric.docs.zalando.net/fabric-gateway-troubleshooting/#gateway-troubleshooting
+            rule: size(self.metadata.name) < 64
     served: true
     storage: true
     subresources:

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

@@ -27,7 +27,7 @@ spec:
       serviceAccountName: custom-metrics-apiserver
       containers:
       - name: kube-metrics-adapter
-        image: container-registry.zalando.net/teapot/kube-metrics-adapter:kube-metrics-adapter-0.2.3-45-g5800062
+        image: container-registry.zalando.net/teapot/kube-metrics-adapter:kube-metrics-adapter-0.2.3-46-ge580c5b
         env:
         - name: AWS_REGION
           value: {{ .Cluster.Region }}

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.21.247-1070" }}
-{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.247-1070" }}
+{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.257-1079" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
 {{ $canary_args := "" }}

test/e2e/cluster_config.sh

@@ -149,8 +149,6 @@ EOFF
       taints: dedicated=node-tests:NoSchedule
   - discount_strategy: spot
     instance_types:
-    - "g3s.xlarge"
-    - "g3.4xlarge"
     - "g4dn.xlarge"
     - "g4dn.2xlarge"
     - "g4dn.4xlarge"