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 pull request #569 from curx/curx-20190624

Browse Source 
Update to v0.6.1
This commit is contained in:
Erik Wilson 2019-06-24 10:22:15 -07:00 committed by GitHub
commit 110d30126f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -333,9 +333,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 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; 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.6.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.1
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 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.1
Hyperkube Hyperkube

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

@ -1,4 +1,4 @@
k3s_version: v0.6.0 k3s_version: v0.6.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]) }}"

2
docker-compose-agent.yml
View File

@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
node: node:
image: rancher/k3s:v0.6.0 image: rancher/k3s:v0.6.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.6.0 image: rancher/k3s:v0.6.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.6.0 image: rancher/k3s:v0.6.1
tmpfs: tmpfs:
- /run - /run
- /var/run - /var/run