diff --git a/README.md b/README.md index 2bd24d54b6..d2ebaaccdb 100644 --- a/README.md +++ b/README.md @@ -255,9 +255,9 @@ serves as an example of how to run k3s from Docker. To run from `docker-compose To run the agent only in Docker use the following `docker-compose-agent.yml` is in the root of this repo that serves as an example of how to run k3s agent from Docker. Alternatively the Docker run command can also be used; - sudo docker run -d --tmpfs /run --tmpfs /var/run -e K3S_URL=${SERVER_URL} -e K3S_TOKEN=${NODE_TOKEN} --privileged rancher/k3s:v0.5.0 + sudo docker run -d --tmpfs /run --tmpfs /var/run -e K3S_URL=${SERVER_URL} -e K3S_TOKEN=${NODE_TOKEN} --privileged rancher/k3s:v0.6.0 - sudo docker run -d --tmpfs /run --tmpfs /var/run -e K3S_URL=https://k3s.example.com:6443 -e K3S_TOKEN=K13849a67fc385fd3c0fa6133a8649d9e717b0258b3b09c87ffc33dae362c12d8c0::node:2e373dca319a0525745fd8b3d8120d9c --privileged rancher/k3s:v0.5.0 + sudo docker run -d --tmpfs /run --tmpfs /var/run -e K3S_URL=https://k3s.example.com:6443 -e K3S_TOKEN=K13849a67fc385fd3c0fa6133a8649d9e717b0258b3b09c87ffc33dae362c12d8c0::node:2e373dca319a0525745fd8b3d8120d9c --privileged rancher/k3s:v0.6.0 Hyperkube diff --git a/contrib/ansible/group_vars/all.yml b/contrib/ansible/group_vars/all.yml index b629ece4fe..79d41034fa 100644 --- a/contrib/ansible/group_vars/all.yml +++ b/contrib/ansible/group_vars/all.yml @@ -1,4 +1,4 @@ -k3s_version: v0.5.0 +k3s_version: v0.6.0 ansible_user: debian systemd_dir: /etc/systemd/system master_ip: "{{ hostvars[groups['master'][0]]['ansible_host'] | default(groups['master'][0]) }}" diff --git a/docker-compose-agent.yml b/docker-compose-agent.yml index b94f925032..f184048a02 100644 --- a/docker-compose-agent.yml +++ b/docker-compose-agent.yml @@ -1,7 +1,7 @@ version: '3' services: node: - image: rancher/k3s:v0.5.0 + image: rancher/k3s:v0.6.0 tmpfs: - /run - /var/run diff --git a/docker-compose.yml b/docker-compose.yml index b706817b14..c1235e09e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: server: - image: rancher/k3s:v0.5.0 + image: rancher/k3s:v0.6.0 command: server --disable-agent environment: - K3S_CLUSTER_SECRET=somethingtotallyrandom @@ -15,7 +15,7 @@ services: - 6443:6443 node: - image: rancher/k3s:v0.5.0 + image: rancher/k3s:v0.6.0 tmpfs: - /run - /var/run