From 3392791a13959fd9e633439cd6c70be4ca7e480d Mon Sep 17 00:00:00 2001
From: Mustafa Abdelrahman <mustafa.abdelrahman@zalando.de>
Date: Mon, 9 Dec 2024 09:08:47 +0100
Subject: [PATCH] skipper-internal: Update main fleet to version v0.21.224-1047

* https://github.com/zalando/skipper/pull/3271
* https://github.com/zalando/skipper/pull/3283
* https://github.com/zalando/skipper/pull/3284
* https://github.com/zalando/skipper/pull/3285
* https://github.com/zalando/skipper/pull/3281
* https://github.com/zalando/skipper/pull/3282
* https://github.com/zalando/skipper/pull/3294
* https://github.com/zalando/skipper/pull/3293
* https://github.com/zalando/skipper/pull/3292
* https://github.com/zalando/skipper/pull/3291
* https://github.com/zalando/skipper/pull/3288
* https://github.com/zalando/skipper/pull/3300
* https://github.com/zalando/skipper/pull/3301
* https://github.com/zalando/skipper/pull/3290
* https://github.com/zalando/skipper/pull/3328
* https://github.com/zalando/skipper/pull/3319
* https://github.com/zalando/skipper/pull/3325
* https://github.com/zalando/skipper/pull/3310
* https://github.com/zalando/skipper/pull/3307
* https://github.com/zalando/skipper/pull/3322
* https://github.com/zalando/skipper/pull/3326
* https://github.com/zalando/skipper/pull/3289

https://github.com/zalando/skipper/compare/v0.21.220...v0.21.224

follow up on https://github.com/zalando-incubator/kubernetes-on-aws/pull/8574

Signed-off-by: Mustafa Abdelrahman <mustafa.abdelrahman@zalando.de>
---
 cluster/config-defaults.yaml              | 2 ++
 cluster/manifests/skipper/deployment.yaml | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
index 58fd3fa856..bb63e40b80 100644
--- a/cluster/config-defaults.yaml
+++ b/cluster/config-defaults.yaml
@@ -127,6 +127,8 @@ skipper_edit_route_placeholders: ""
 skipper_ingress_inline_routes: ""
 skipper_ingress_refuse_payload: ""
 skipper_endpointslices_enabled: "true"
+skipper_kubernetes_annotation_predicates: ''
+skipper_kubernetes_east_west_range_annotation_predicates: ''
 
 skipper_compress_encodings: "gzip,deflate,br"
 
diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
index 38889bd22b..908da67caf 100644
--- a/cluster/manifests/skipper/deployment.yaml
+++ b/cluster/manifests/skipper/deployment.yaml
@@ -1,6 +1,6 @@
 {{/* 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.220-1043" }}
+{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.224-1047" }}
 {{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.224-1047" }}
 
 
@@ -166,6 +166,8 @@ spec:
           - "-kubernetes-default-lb-algorithm={{ .Cluster.ConfigItems.skipper_ingress_default_lb_algorithm }}"
           - "-kubernetes-disable-catchall-routes={{ .Cluster.ConfigItems.skipper_ingress_disable_catchall_routes }}"
           - "-enable-kubernetes-endpointslices={{ .Cluster.ConfigItems.skipper_endpointslices_enabled }}"
+          - '-kubernetes-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_annotation_predicates }}'
+          - '-kubernetes-east-west-range-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_predicates }}'
 {{ end }}
           - "-address=:9999"
           - "-wait-first-route-load"
@@ -536,6 +538,8 @@ spec:
           - "-kubernetes-default-lb-algorithm={{ .Cluster.ConfigItems.skipper_ingress_default_lb_algorithm }}"
           - "-kubernetes-disable-catchall-routes={{ .Cluster.ConfigItems.skipper_ingress_disable_catchall_routes }}"
           - "-enable-kubernetes-endpointslices={{ .Cluster.ConfigItems.skipper_endpointslices_enabled }}"
+          - '-kubernetes-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_annotation_predicates }}'
+          - '-kubernetes-east-west-range-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_predicates }}'
           - "-address=:9990"
           - "-wait-for-healthcheck-interval={{ .Cluster.ConfigItems.skipper_wait_for_healthcheck_interval }}"
           - "-kubernetes-east-west-range-domains=ingress.cluster.local"