Browse Source

Update packaged manifests

* Update traefik chart to bump image tag and fix quoting
* Fix image quoting in flat manifests
* Update local-path-provisioner config to stop using deprecated hostpath volume type

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/9835/head
Brad Davidson 7 months ago committed by Brad Davidson
parent
commit
3f906bee79
  1. 2
      manifests/coredns.yaml
  2. 5
      manifests/local-storage.yaml
  3. 2
      manifests/metrics-server/metrics-server-deployment.yaml
  4. 13
      manifests/traefik.yaml
  5. 8
      pkg/deploy/zz_generated_bindata.go
  6. 40
      pkg/static/zz_generated_bindata.go
  7. 2
      scripts/airgap/image-list.txt

2
manifests/coredns.yaml

@ -120,7 +120,7 @@ spec:
k8s-app: kube-dns
containers:
- name: coredns
image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-coredns-coredns:1.10.1
image: "%{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-coredns-coredns:1.10.1"
imagePullPolicy: IfNotPresent
resources:
limits:

5
manifests/local-storage.yaml

@ -67,7 +67,7 @@ spec:
effect: "NoSchedule"
containers:
- name: local-path-provisioner
image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/local-path-provisioner:v0.0.26
image: "%{SYSTEM_DEFAULT_REGISTRY}%rancher/local-path-provisioner:v0.0.26"
imagePullPolicy: IfNotPresent
command:
- local-path-provisioner
@ -92,6 +92,7 @@ kind: StorageClass
metadata:
name: local-path
annotations:
defaultVolumeType: "local"
storageclass.kubernetes.io/is-default-class: "true"
provisioner: rancher.io/local-path
volumeBindingMode: WaitForFirstConsumer
@ -155,5 +156,5 @@ data:
spec:
containers:
- name: helper-pod
image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-library-busybox:1.36.1
image: "%{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-library-busybox:1.36.1"
imagePullPolicy: IfNotPresent

2
manifests/metrics-server/metrics-server-deployment.yaml

@ -44,7 +44,7 @@ spec:
emptyDir: {}
containers:
- name: metrics-server
image: %{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-metrics-server:v0.7.0
image: "%{SYSTEM_DEFAULT_REGISTRY}%rancher/mirrored-metrics-server:v0.7.0"
args:
- --cert-dir=/tmp
- --secure-port=10250

13
manifests/traefik.yaml

@ -5,7 +5,7 @@ metadata:
name: traefik-crd
namespace: kube-system
spec:
chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-25.0.2+up25.0.0.tgz
chart: https://%{KUBERNETES_API}%/static/charts/traefik-crd-25.0.3+up25.0.0.tgz
---
apiVersion: helm.cattle.io/v1
kind: HelmChart
@ -13,13 +13,14 @@ metadata:
name: traefik
namespace: kube-system
spec:
chart: https://%{KUBERNETES_API}%/static/charts/traefik-25.0.2+up25.0.0.tgz
chart: https://%{KUBERNETES_API}%/static/charts/traefik-25.0.3+up25.0.0.tgz
set:
global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
valuesContent: |-
podAnnotations:
prometheus.io/port: "8082"
prometheus.io/scrape: "true"
deployment:
podAnnotations:
prometheus.io/port: "8082"
prometheus.io/scrape: "true"
providers:
kubernetesIngress:
publishedService:
@ -27,7 +28,7 @@ spec:
priorityClassName: "system-cluster-critical"
image:
repository: "rancher/mirrored-library-traefik"
tag: "2.10.5"
tag: "2.10.7"
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"

8
pkg/deploy/zz_generated_bindata.go

File diff suppressed because one or more lines are too long

40
pkg/static/zz_generated_bindata.go

File diff suppressed because one or more lines are too long

2
scripts/airgap/image-list.txt

@ -3,6 +3,6 @@ docker.io/rancher/klipper-lb:v0.4.7
docker.io/rancher/local-path-provisioner:v0.0.26
docker.io/rancher/mirrored-coredns-coredns:1.10.1
docker.io/rancher/mirrored-library-busybox:1.36.1
docker.io/rancher/mirrored-library-traefik:2.10.5
docker.io/rancher/mirrored-library-traefik:2.10.7
docker.io/rancher/mirrored-metrics-server:v0.7.0
docker.io/rancher/mirrored-pause:3.6

Loading…
Cancel
Save