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

dev to eks
zalando-incubator · Jul 26, 2024 · 8fd83e2 · 8fd83e2
2 parents fd8a5db + cf7b74e
commit 8fd83e2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -381,6 +381,9 @@ kube_proxy_verbose_level: "2"
 flannel_cpu: "25m"
 flannel_memory: "100Mi"
 
+flannel_awaiter_cpu: "25m"
+flannel_awaiter_memory: "50Mi"
+
 # nvidia device plugin
 nvidia_device_plugin_cpu: "10m"
 nvidia_device_plugin_memory: "50Mi"

diff --git a/cluster/manifests/deployment-service/controller-statefulset.yaml b/cluster/manifests/deployment-service/controller-statefulset.yaml
@@ -29,7 +29,7 @@ spec:
       terminationGracePeriodSeconds: 300
       containers:
         - name: "deployment-service-controller"
-          image: "container-registry.zalando.net/teapot/deployment-controller:master-222"
+          image: "container-registry.zalando.net/teapot/deployment-controller:master-223"
           args:
             - "--config-namespace=kube-system"
             - "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"

diff --git a/cluster/manifests/flannel/daemonset.yaml b/cluster/manifests/flannel/daemonset.yaml
@@ -45,12 +45,12 @@ spec:
         stdin: true
         resources:
           requests:
-            cpu: 25m
-            memory: 50Mi
+            cpu: "{{ .Cluster.ConfigItems.flannel_awaiter_cpu }}"
+            memory: "{{ .Cluster.ConfigItems.flannel_awaiter_memory }}"
             ephemeral-storage: 256Mi
           limits:
-            cpu: 25m
-            memory: 50Mi
+            cpu: "{{ .Cluster.ConfigItems.flannel_awaiter_cpu }}"
+            memory: "{{ .Cluster.ConfigItems.flannel_awaiter_memory }}"
         startupProbe:
           exec:
             command:

diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
@@ -1,5 +1,5 @@
 {{ $internal_version := "v0.21.150-974" }}
-{{ $canary_internal_version := "v0.21.150-974" }}
+{{ $canary_internal_version := "v0.21.161-981" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
 {{ $canary_args := "" }}