Merge branch 'master' into joakimr-axis_backticks

5 years ago · 3857733b5c
parent c2eebc703e a9af4a27ff
commit 3857733b5c
4 changed files with 6 additions and 5 deletions
--- 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
@ -1,7 +1,7 @@
-docker.io/coredns/coredns:1.6.3
-docker.io/library/traefik:1.7.19
+docker.io/rancher/coredns-coredns:1.6.3
 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