Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into joakimr-axis_markdown

Browse Source
This commit is contained in:
Joakim Roubert 2020-03-24 09:30:17 +01:00 committed by GitHub
commit 4ea818c668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/coredns.yaml
View File

@ -103,7 +103,7 @@ spec:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: coredns/coredns:1.6.3 image: rancher/coredns-coredns:1.6.3
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:

1
manifests/traefik.yaml
View File

@ -10,3 +10,4 @@ spec:
ssl.enabled: "true" ssl.enabled: "true"
metrics.prometheus.enabled: "true" metrics.prometheus.enabled: "true"
kubernetes.ingressEndpoint.useDefaultPublishedService: "true" kubernetes.ingressEndpoint.useDefaultPublishedService: "true"
image: "rancher/library-traefik"

4
pkg/deploy/zz_generated_bindata.go
View File

File diff suppressed because one or more lines are too long

4
scripts/airgap/image-list.txt
View File

@ -1,7 +1,7 @@
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-helm:v0.2.3
docker.io/rancher/klipper-lb:v0.1.2 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/local-path-provisioner:v0.0.11
docker.io/rancher/metrics-server:v0.3.6 docker.io/rancher/metrics-server:v0.3.6
docker.io/rancher/pause:3.1 docker.io/rancher/pause:3.1