Merge current v2.4 into v2.5
This commit is contained in:
commit
4b456f3b76
5 changed files with 50 additions and 14 deletions
|
@ -1,5 +1,5 @@
|
|||
server:
|
||||
image: rancher/k3s:v1.18.15-k3s1
|
||||
image: rancher/k3s:v1.18.20-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
|
||||
environment:
|
||||
- K3S_CLUSTER_SECRET=somethingtotallyrandom
|
||||
|
@ -12,7 +12,7 @@ server:
|
|||
- 6443:6443
|
||||
|
||||
node:
|
||||
image: rancher/k3s:v1.18.15-k3s1
|
||||
image: rancher/k3s:v1.18.20-k3s1
|
||||
privileged: true
|
||||
links:
|
||||
- server
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue