Merge branch v2.9 into master
This commit is contained in:
commit
61325d7b91
1 changed files with 2 additions and 2 deletions
|
@ -1,7 +1,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: rancher/k3s:v1.18.20-k3s1
|
image: rancher/k3s:v1.20.15-k3s1
|
||||||
command: server --disable-agent --no-deploy coredns --no-deploy servicelb --no-deploy traefik --no-deploy local-storage --no-deploy metrics-server --log /output/k3s.log --bind-address=server --tls-san=server
|
command: server --disable-agent --no-deploy coredns --no-deploy servicelb --no-deploy traefik --no-deploy local-storage --no-deploy metrics-server --log /output/k3s.log --bind-address=server --tls-san=server
|
||||||
environment:
|
environment:
|
||||||
K3S_CLUSTER_SECRET: somethingtotallyrandom
|
K3S_CLUSTER_SECRET: somethingtotallyrandom
|
||||||
|
@ -12,7 +12,7 @@ services:
|
||||||
- ./fixtures/k8s:/var/lib/rancher/k3s/server/manifests
|
- ./fixtures/k8s:/var/lib/rancher/k3s/server/manifests
|
||||||
|
|
||||||
node:
|
node:
|
||||||
image: rancher/k3s:v1.18.20-k3s1
|
image: rancher/k3s:v1.20.15-k3s1
|
||||||
privileged: true
|
privileged: true
|
||||||
environment:
|
environment:
|
||||||
K3S_URL: https://server:6443
|
K3S_URL: https://server:6443
|
||||||
|
|
Loading…
Reference in a new issue