Skip to content

K
k3s
Unverified Commit 3857733b authored by Joakim Roubert's avatar Joakim Roubert Committed by GitHub
Browse files
Options

Merge branch 'master' into joakimr-axis_backticks

parents c2eebc70 a9af4a27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
manifests/coredns.yaml
View file @ 3857733b
......@@ -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:
......
manifests/traefik.yaml
View file @ 3857733b
......@@ -10,3 +10,4 @@ spec:
ssl.enabled: "true"
metrics.prometheus.enabled: "true"
kubernetes.ingressEndpoint.useDefaultPublishedService: "true"
image: "rancher/library-traefik"
scripts/airgap/image-list.txt
View file @ 3857733b
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment