From 683efbb737a3106a57f65e652a7584f5d8a256f5 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 14 Jan 2022 02:50:47 -0800 Subject: [PATCH] Update packaged components Update images and manifests/charts for coredns, local-path-provisioner, traefik, and pause Signed-off-by: Brad Davidson --- manifests/coredns.yaml | 2 +- manifests/local-storage.yaml | 4 ++-- manifests/traefik.yaml | 6 +++--- pkg/cli/cmds/agent.go | 2 +- scripts/airgap/image-list.txt | 11 +++++------ scripts/airgap/volume-test.yaml | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/manifests/coredns.yaml b/manifests/coredns.yaml index 849060d127..43b6c7f006 100644 --- a/manifests/coredns.yaml +++ b/manifests/coredns.yaml @@ -111,7 +111,7 @@ spec: beta.kubernetes.io/os: linux containers: - name: coredns - image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/coredns-coredns:1.8.3 + image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-coredns-coredns:1.8.6 imagePullPolicy: IfNotPresent resources: limits: diff --git a/manifests/local-storage.yaml b/manifests/local-storage.yaml index 6d3218cf9a..cb9289b3ec 100644 --- a/manifests/local-storage.yaml +++ b/manifests/local-storage.yaml @@ -63,7 +63,7 @@ spec: effect: "NoSchedule" containers: - name: local-path-provisioner - image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/local-path-provisioner:v0.0.19 + image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/local-path-provisioner:v0.0.21 imagePullPolicy: IfNotPresent command: - local-path-provisioner @@ -151,4 +151,4 @@ data: spec: containers: - name: helper-pod - image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/library-busybox:1.32.1 + image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-library-busybox:1.34.1 diff --git a/manifests/traefik.yaml b/manifests/traefik.yaml index f43889c3eb..ac7d58eb5f 100644 --- a/manifests/traefik.yaml +++ b/manifests/traefik.yaml @@ -4,7 +4,7 @@ metadata: name: traefik-crd namespace: kube-system spec: - chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-9.18.201.tgz + chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-10.9.100.tgz --- apiVersion: helm.cattle.io/v1 kind: HelmChart @@ -12,7 +12,7 @@ metadata: name: traefik namespace: kube-system spec: - chart: https://%{KUBERNETES_API}%/static/charts/traefik-9.18.201.tgz + chart: https://%{KUBERNETES_API}%/static/charts/traefik-10.9.100.tgz set: global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%" valuesContent: |- @@ -31,7 +31,7 @@ spec: enabled: true priorityClassName: "system-cluster-critical" image: - name: "rancher/library-traefik" + name: "rancher/mirrored-library-traefik" tolerations: - key: "CriticalAddonsOnly" operator: "Exists" diff --git a/pkg/cli/cmds/agent.go b/pkg/cli/cmds/agent.go index b12f816ff9..dcba611acd 100644 --- a/pkg/cli/cmds/agent.go +++ b/pkg/cli/cmds/agent.go @@ -111,7 +111,7 @@ var ( Name: "pause-image", Usage: "(agent/runtime) Customized pause image for containerd or docker sandbox", Destination: &AgentConfig.PauseImage, - Value: "rancher/pause:3.1", + Value: "rancher/mirrored-pause:3.5", } SnapshotterFlag = cli.StringFlag{ Name: "snapshotter", diff --git a/scripts/airgap/image-list.txt b/scripts/airgap/image-list.txt index a112e81842..951c7ef24a 100644 --- a/scripts/airgap/image-list.txt +++ b/scripts/airgap/image-list.txt @@ -1,9 +1,8 @@ -docker.io/rancher/coredns-coredns:1.8.3 docker.io/rancher/klipper-helm:v0.6.6-build20211022 docker.io/rancher/klipper-lb:v0.3.4 -docker.io/rancher/library-busybox:1.32.1 -docker.io/rancher/library-traefik:2.4.8 -docker.io/rancher/local-path-provisioner:v0.0.19 +docker.io/rancher/local-path-provisioner:v0.0.21 +docker.io/rancher/mirrored-coredns-coredns:1.8.6 +docker.io/rancher/mirrored-library-busybox:1.34.1 +docker.io/rancher/mirrored-library-traefik:2.5.6 docker.io/rancher/mirrored-metrics-server:v0.5.2 -docker.io/rancher/pause:3.1 - +docker.io/rancher/mirrored-pause:3.5 diff --git a/scripts/airgap/volume-test.yaml b/scripts/airgap/volume-test.yaml index f6c2318afd..c675ff90f0 100644 --- a/scripts/airgap/volume-test.yaml +++ b/scripts/airgap/volume-test.yaml @@ -19,7 +19,7 @@ metadata: spec: containers: - name: volume-test - image: rancher/pause:3.1 + image: rancher/mirrored-pause:3.5 imagePullPolicy: IfNotPresent volumeMounts: - name: volv