Merge branch 'master' into release-1.17

3eee8ac3 · Erik Wilson · d48f3b1f · a9af4a27 · 3eee8ac3 · 3eee8ac3
Commit 3eee8ac3 authored Mar 23, 2020 by Erik Wilson
Showing with 4 additions and 3 deletions

coredns.yaml manifests/coredns.yaml +1 -1

traefik.yaml manifests/traefik.yaml +1 -0

zz_generated_bindata.go pkg/deploy/zz_generated_bindata.go +0 -0

image-list.txt scripts/airgap/image-list.txt +2 -2

No files found.
--- a/manifests/coredns.yaml
+++ b/manifests/coredns.yaml
@@ -103,7 +103,7 @@ spec:
        beta.kubernetes.io/os: linux
      containers:
      - name: coredns
-        image: coredns/coredns:1.6.3
+        image: rancher/coredns-coredns:1.6.3
        imagePullPolicy: IfNotPresent
        resources:
          limits:

--- a/manifests/traefik.yaml
+++ b/manifests/traefik.yaml
@@ -10,3 +10,4 @@ spec:
    ssl.enabled: "true"
    metrics.prometheus.enabled: "true"
    kubernetes.ingressEndpoint.useDefaultPublishedService: "true"
+    image: "rancher/library-traefik"
--- a/pkg/deploy/zz_generated_bindata.go
+++ b/pkg/deploy/zz_generated_bindata.go
--- a/scripts/airgap/image-list.txt
+++ b/scripts/airgap/image-list.txt
-docker.io/coredns/coredns:1.6.3
+docker.io/rancher/coredns-coredns:1.6.3
-docker.io/library/traefik:1.7.19
 docker.io/rancher/klipper-helm:v0.2.3
 docker.io/rancher/klipper-lb:v0.1.2
+docker.io/rancher/library-traefik:1.7.19
 docker.io/rancher/local-path-provisioner:v0.0.11
 docker.io/rancher/metrics-server:v0.3.6
 docker.io/rancher/pause:3.1