From 3d45d9f72700aff20e2fbe3bafc6363fc1b951f9 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Tue, 20 Feb 2024 11:08:39 +0100 Subject: [PATCH 1/5] skipper: update canary to v0.20.14 https://github.com/zalando/skipper/compare/v0.20.5...v0.20.14 Signed-off-by: Alexander Yastrebov --- 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 1566a8adaf..7dbbc98032 100644 --- a/cluster/manifests/skipper/deployment.yaml +++ b/cluster/manifests/skipper/deployment.yaml @@ -1,5 +1,5 @@ {{ $internal_version := "v0.20.5-813" }} -{{ $canary_internal_version := "v0.20.5-813" }} +{{ $canary_internal_version := "v0.20.14-823" }} {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}} {{ $canary_args := "" }} From a145aa96541cae9b9ea02e7cb161573f78677b00 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Tue, 20 Feb 2024 12:09:18 +0100 Subject: [PATCH 2/5] fabric: update version to master-240 * Bump github.com/szuecs/routegroup-client from 0.24.0 to 0.25.0 * controller: ignore failures caused by terminating namespace * build: support go1.22 Signed-off-by: Alexander Yastrebov --- cluster/config-defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml index b04f298466..0975974bb4 100644 --- a/cluster/config-defaults.yaml +++ b/cluster/config-defaults.yaml @@ -317,7 +317,7 @@ skipper_open_policy_agent_styra_token: "" # - production: runs the controller # fabric_gateway_controller_mode: "disabled" -fabric_gateway_controller_version: "master-237" +fabric_gateway_controller_version: "master-240" fabric_gateway_controller_cpu: "50m" fabric_gateway_controller_memory: "150Mi" fabric_gateway_crd_v1_enabled: "false" From b9216ca2a4e0ec11d4506b86c8cb7d0cd499bd31 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Tue, 20 Feb 2024 12:36:35 +0100 Subject: [PATCH 3/5] Configure dependabot for skipper Dependabot supports Helm charts which use similar template language as CLM. This is an experiment to test whether dependabot can update images in skipper templates. Signed-off-by: Alexander Yastrebov --- .github/dependabot.yml | 9 +++++++++ .../skipper/hostname-credentials-controller.yaml | 3 +-- cluster/manifests/skipper/secret-combiner.yaml | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..455a96573f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# See https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file +version: 2 +updates: + - package-ecosystem: docker + directory: /cluster/manifests/skipper + schedule: + interval: daily diff --git a/cluster/manifests/skipper/hostname-credentials-controller.yaml b/cluster/manifests/skipper/hostname-credentials-controller.yaml index 058881be8b..1dc624aadd 100644 --- a/cluster/manifests/skipper/hostname-credentials-controller.yaml +++ b/cluster/manifests/skipper/hostname-credentials-controller.yaml @@ -1,5 +1,4 @@ # {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }} -# {{ $version := "main-11" }} apiVersion: v1 kind: ServiceAccount metadata: @@ -86,7 +85,7 @@ spec: restartPolicy: Never containers: - name: controller - image: "container-registry.zalando.net/gwproxy/hostname-credentials-controller:{{ $version }}" + image: "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-11" terminationMessagePolicy: FallbackToLogsOnError args: - -ingress-selector=application diff --git a/cluster/manifests/skipper/secret-combiner.yaml b/cluster/manifests/skipper/secret-combiner.yaml index b020b512b6..b939e7a5b2 100644 --- a/cluster/manifests/skipper/secret-combiner.yaml +++ b/cluster/manifests/skipper/secret-combiner.yaml @@ -1,5 +1,4 @@ # {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }} -# {{ $version := "main-5" }} apiVersion: v1 kind: ServiceAccount metadata: @@ -73,7 +72,7 @@ spec: restartPolicy: Never containers: - name: combiner - image: "container-registry.zalando.net/gwproxy/secret-combiner:{{ $version }}" + image: "container-registry.zalando.net/gwproxy/secret-combiner:main-5" terminationMessagePolicy: FallbackToLogsOnError env: - name: NAMESPACE From ffab540cd7cbc8e1516fa55a3c57f4b3d2998497 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Tue, 20 Feb 2024 18:49:44 +0100 Subject: [PATCH 4/5] skipper: update version to v0.20.15 https://github.com/zalando/skipper/compare/v0.20.14...v0.20.15 Signed-off-by: Alexander Yastrebov --- 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 7dbbc98032..590ccf6fe9 100644 --- a/cluster/manifests/skipper/deployment.yaml +++ b/cluster/manifests/skipper/deployment.yaml @@ -1,5 +1,5 @@ {{ $internal_version := "v0.20.5-813" }} -{{ $canary_internal_version := "v0.20.14-823" }} +{{ $canary_internal_version := "v0.20.15-824" }} {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}} {{ $canary_args := "" }} From 7cb93925eb56add9b7812f176f68fb0c9ee10886 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Tue, 20 Feb 2024 19:18:10 +0100 Subject: [PATCH 5/5] skipper: revert "Configure dependabot for skipper" This reverts commit b9216ca2a4e0ec11d4506b86c8cb7d0cd499bd31. (#7022) Signed-off-by: Alexander Yastrebov --- .github/dependabot.yml | 9 --------- .../skipper/hostname-credentials-controller.yaml | 3 ++- cluster/manifests/skipper/secret-combiner.yaml | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 455a96573f..0000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,9 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# See https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file -version: 2 -updates: - - package-ecosystem: docker - directory: /cluster/manifests/skipper - schedule: - interval: daily diff --git a/cluster/manifests/skipper/hostname-credentials-controller.yaml b/cluster/manifests/skipper/hostname-credentials-controller.yaml index 1dc624aadd..058881be8b 100644 --- a/cluster/manifests/skipper/hostname-credentials-controller.yaml +++ b/cluster/manifests/skipper/hostname-credentials-controller.yaml @@ -1,4 +1,5 @@ # {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }} +# {{ $version := "main-11" }} apiVersion: v1 kind: ServiceAccount metadata: @@ -85,7 +86,7 @@ spec: restartPolicy: Never containers: - name: controller - image: "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-11" + image: "container-registry.zalando.net/gwproxy/hostname-credentials-controller:{{ $version }}" terminationMessagePolicy: FallbackToLogsOnError args: - -ingress-selector=application diff --git a/cluster/manifests/skipper/secret-combiner.yaml b/cluster/manifests/skipper/secret-combiner.yaml index b939e7a5b2..b020b512b6 100644 --- a/cluster/manifests/skipper/secret-combiner.yaml +++ b/cluster/manifests/skipper/secret-combiner.yaml @@ -1,4 +1,5 @@ # {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }} +# {{ $version := "main-5" }} apiVersion: v1 kind: ServiceAccount metadata: @@ -72,7 +73,7 @@ spec: restartPolicy: Never containers: - name: combiner - image: "container-registry.zalando.net/gwproxy/secret-combiner:main-5" + image: "container-registry.zalando.net/gwproxy/secret-combiner:{{ $version }}" terminationMessagePolicy: FallbackToLogsOnError env: - name: NAMESPACE