mirror of https://github.com/k3s-io/k3s
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/9939/head
parent
12c6d6a5cf
commit
a302dae4b5
|
@ -120,7 +120,7 @@ spec:
|
||||||
k8s-app: kube-dns
|
k8s-app: kube-dns
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- 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
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
|
|
@ -67,7 +67,7 @@ spec:
|
||||||
effect: "NoSchedule"
|
effect: "NoSchedule"
|
||||||
containers:
|
containers:
|
||||||
- name: local-path-provisioner
|
- 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
|
imagePullPolicy: IfNotPresent
|
||||||
command:
|
command:
|
||||||
- local-path-provisioner
|
- local-path-provisioner
|
||||||
|
@ -92,6 +92,7 @@ kind: StorageClass
|
||||||
metadata:
|
metadata:
|
||||||
name: local-path
|
name: local-path
|
||||||
annotations:
|
annotations:
|
||||||
|
defaultVolumeType: "local"
|
||||||
storageclass.kubernetes.io/is-default-class: "true"
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
provisioner: rancher.io/local-path
|
provisioner: rancher.io/local-path
|
||||||
volumeBindingMode: WaitForFirstConsumer
|
volumeBindingMode: WaitForFirstConsumer
|
||||||
|
@ -155,5 +156,5 @@ data:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: helper-pod
|
- 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
|
imagePullPolicy: IfNotPresent
|
||||||
|
|
|
@ -44,7 +44,7 @@ spec:
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
containers:
|
containers:
|
||||||
- name: metrics-server
|
- 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:
|
args:
|
||||||
- --cert-dir=/tmp
|
- --cert-dir=/tmp
|
||||||
- --secure-port=10250
|
- --secure-port=10250
|
||||||
|
|
|
@ -5,7 +5,7 @@ metadata:
|
||||||
name: traefik-crd
|
name: traefik-crd
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
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
|
apiVersion: helm.cattle.io/v1
|
||||||
kind: HelmChart
|
kind: HelmChart
|
||||||
|
@ -13,13 +13,14 @@ metadata:
|
||||||
name: traefik
|
name: traefik
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
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:
|
set:
|
||||||
global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
|
global.systemDefaultRegistry: "%{SYSTEM_DEFAULT_REGISTRY_RAW}%"
|
||||||
valuesContent: |-
|
valuesContent: |-
|
||||||
podAnnotations:
|
deployment:
|
||||||
prometheus.io/port: "8082"
|
podAnnotations:
|
||||||
prometheus.io/scrape: "true"
|
prometheus.io/port: "8082"
|
||||||
|
prometheus.io/scrape: "true"
|
||||||
providers:
|
providers:
|
||||||
kubernetesIngress:
|
kubernetesIngress:
|
||||||
publishedService:
|
publishedService:
|
||||||
|
@ -27,7 +28,7 @@ spec:
|
||||||
priorityClassName: "system-cluster-critical"
|
priorityClassName: "system-cluster-critical"
|
||||||
image:
|
image:
|
||||||
repository: "rancher/mirrored-library-traefik"
|
repository: "rancher/mirrored-library-traefik"
|
||||||
tag: "2.10.5"
|
tag: "2.10.7"
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: "CriticalAddonsOnly"
|
- key: "CriticalAddonsOnly"
|
||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -3,6 +3,6 @@ docker.io/rancher/klipper-lb:v0.4.7
|
||||||
docker.io/rancher/local-path-provisioner:v0.0.26
|
docker.io/rancher/local-path-provisioner:v0.0.26
|
||||||
docker.io/rancher/mirrored-coredns-coredns:1.10.1
|
docker.io/rancher/mirrored-coredns-coredns:1.10.1
|
||||||
docker.io/rancher/mirrored-library-busybox:1.36.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-metrics-server:v0.7.0
|
||||||
docker.io/rancher/mirrored-pause:3.6
|
docker.io/rancher/mirrored-pause:3.6
|
||||||
|
|
Loading…
Reference in New Issue