From 61535005e856be4886fbd4ea041122948dbeff8d Mon Sep 17 00:00:00 2001
From: Alexander Yastrebov <alexander.yastrebov@zalando.de>
Date: Thu, 25 Jul 2024 14:52:13 +0200
Subject: [PATCH 1/3] skipper: update canary to v0.21.161

* https://github.com/zalando/skipper/pull/3167
* https://github.com/zalando/skipper/pull/3166
* https://github.com/zalando/skipper/pull/3165
* https://github.com/zalando/skipper/pull/3164
* https://github.com/zalando/skipper/pull/3162
* https://github.com/zalando/skipper/pull/3161
* https://github.com/zalando/skipper/pull/3159
* https://github.com/zalando/skipper/pull/3158
* https://github.com/zalando/skipper/pull/3070
* https://github.com/zalando/skipper/pull/3140
* https://github.com/zalando/skipper/pull/3155

[Changes](https://github.com/zalando/skipper/compare/v0.21.150...v0.21.161)

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
---
 cluster/manifests/skipper/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
index 5f5e9431b7..400e826767 100644
--- 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 := "" }}

From ffaa3c2fe8ab2211c0d7ea3472504fffd6f9714b Mon Sep 17 00:00:00 2001
From: gargravarr <rodrigo.gargravarr@gmail.com>
Date: Thu, 25 Jul 2024 16:34:01 +0200
Subject: [PATCH 2/3] Configure flannel-awaiter requests.

Signed-off-by: gargravarr <rodrigo.gargravarr@gmail.com>
---
 cluster/config-defaults.yaml             | 3 +++
 cluster/manifests/flannel/daemonset.yaml | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
index 445d26a192..5b2e1e814e 100644
--- 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/flannel/daemonset.yaml b/cluster/manifests/flannel/daemonset.yaml
index 3f4ea7cf7a..6cb0b9b319 100644
--- a/cluster/manifests/flannel/daemonset.yaml
+++ b/cluster/manifests/flannel/daemonset.yaml
@@ -43,12 +43,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:

From 5576dbece0a60f5010f38f772a10f57d7e02a152 Mon Sep 17 00:00:00 2001
From: 418 I'm a teapot <team-teapot@zalando.de>
Date: Thu, 25 Jul 2024 17:01:37 +0200
Subject: [PATCH 3/3] deployment-controller: Update to version master-223

Update container-registry.zalando.net/teapot/deployment-controller to version master-223
---
 .../manifests/deployment-service/controller-statefulset.yaml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/manifests/deployment-service/controller-statefulset.yaml b/cluster/manifests/deployment-service/controller-statefulset.yaml
index 2377a2f8ae..59809af38d 100644
--- 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"