From f0cc3ad97534fffa23c83c3ec064c9fe2c05b6e1 Mon Sep 17 00:00:00 2001 From: Chirayu Kapoor Date: Wed, 4 Dec 2024 12:01:56 +0530 Subject: [PATCH 1/2] Bump ingress-backend to 1.5-rancher2 --- pkg/rke/k8s_rke_system_images.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go index 9b67a448c..17c5670d7 100644 --- a/pkg/rke/k8s_rke_system_images.go +++ b/pkg/rke/k8s_rke_system_images.go @@ -11016,7 +11016,7 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { AciControllerContainer: "noiro/aci-containers-controller:6.1.1.1.81c2369", PodInfraContainer: "rancher/mirrored-pause:3.7", Ingress: "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1", - IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", IngressWebhook: "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231226-1a7112e06", MetricsServer: "rancher/mirrored-metrics-server:v0.7.0", CoreDNS: "rancher/mirrored-coredns-coredns:1.11.1", @@ -11256,7 +11256,7 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages { AciControllerContainer: "noiro/aci-containers-controller:6.1.1.1.81c2369", PodInfraContainer: "rancher/mirrored-pause:3.7", Ingress: "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1", - IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", IngressWebhook: "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.1", MetricsServer: "rancher/mirrored-metrics-server:v0.7.1", CoreDNS: "rancher/mirrored-coredns-coredns:1.11.1", From 70c767be8d71977886a49dc2340688c4c2c3867b Mon Sep 17 00:00:00 2001 From: Chirayu Kapoor Date: Wed, 4 Dec 2024 12:03:06 +0530 Subject: [PATCH 2/2] go generate --- data/data.json | 4 ++-- regsync.yaml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/data.json b/data/data.json index 64ede6e0d..0e0b42a6c 100644 --- a/data/data.json +++ b/data/data.json @@ -13933,7 +13933,7 @@ "weaveCni": "weaveworks/weave-npc:2.8.1", "podInfraContainer": "rancher/mirrored-pause:3.7", "ingress": "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1", - "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231226-1a7112e06", "metricsServer": "rancher/mirrored-metrics-server:v0.7.0", "windowsPodInfraContainer": "rancher/mirrored-pause:3.7", @@ -14331,7 +14331,7 @@ "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1", "podInfraContainer": "rancher/mirrored-pause:3.7", "ingress": "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1", - "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1", + "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2", "ingressWebhook": "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.1", "metricsServer": "rancher/mirrored-metrics-server:v0.7.1", "windowsPodInfraContainer": "rancher/mirrored-pause:3.7", diff --git a/regsync.yaml b/regsync.yaml index d130978bb..62941eb4a 100644 --- a/regsync.yaml +++ b/regsync.yaml @@ -1142,6 +1142,7 @@ sync: tags: allow: - 1.5-rancher1 + - 1.5-rancher2 - source: docker.io/rancher/mirrored-pause target: '{{ env "REGISTRY_ENDPOINT" }}/rancher/mirrored-pause' type: repository