github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #744 from erikwilson/v0.8.0-to-v0.8.1 

Update k3s v0.8.0 to v0.8.1
pull/752/head
Erik Wilson 2019-08-20 17:33:26 -07:00 committed by GitHub
parent d116e74a88 9c99578bd6
commit ffe0288b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ansible/group_vars/all.yml
View File

@ -1,4 +1,4 @@
k3s_version: v0.8.0 k3s_version: v0.8.1
ansible_user: debian ansible_user: debian
systemd_dir: /etc/systemd/system systemd_dir: /etc/systemd/system
master_ip: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}" master_ip: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}"

6
docker-compose-ha.yml
View File

@ -9,7 +9,7 @@ services:
- 2379:2379 - 2379:2379
server: server:
image: rancher/k3s:v0.8.0 image: rancher/k3s:v0.8.1
command: server --disable-agent --bootstrap write command: server --disable-agent --bootstrap write
environment: environment:
- K3S_STORAGE_BACKEND=etcd3 - K3S_STORAGE_BACKEND=etcd3
@ -25,7 +25,7 @@ services:
- 6443:6443 - 6443:6443
server2: server2:
image: rancher/k3s:v0.8.0 image: rancher/k3s:v0.8.1
command: server --disable-agent --bootstrap read command: server --disable-agent --bootstrap read
# restart to wait for the bootstrap data prepared by the primary server # restart to wait for the bootstrap data prepared by the primary server
restart: always restart: always
@ -38,7 +38,7 @@ services:
- 16443:6443 - 16443:6443
node: node:
image: rancher/k3s:v0.8.0 image: rancher/k3s:v0.8.1
tmpfs: tmpfs:
- /run - /run
- /var/run - /var/run

4
docker-compose.yml
View File

@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
server: server:
image: rancher/k3s:v0.8.0 image: rancher/k3s:v0.8.1
command: server --disable-agent command: server --disable-agent
environment: environment:
- K3S_CLUSTER_SECRET=somethingtotallyrandom - K3S_CLUSTER_SECRET=somethingtotallyrandom
@ -15,7 +15,7 @@ services:
- 6443:6443 - 6443:6443
node: node:
image: rancher/k3s:v0.8.0 image: rancher/k3s:v0.8.1
tmpfs: tmpfs:
- /run - /run
- /var/run - /var/run