From b16f142c211a4bbb4a9fcb244aab5e6f8379dcfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Wed, 23 Sep 2020 09:43:31 -0400 Subject: [PATCH 1/6] Override facts when commit hash is specified --- tasks/build/download-k3s.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tasks/build/download-k3s.yml b/tasks/build/download-k3s.yml index e897d49..c8b48c8 100644 --- a/tasks/build/download-k3s.yml +++ b/tasks/build/download-k3s.yml @@ -12,6 +12,14 @@ k3s_hash_url: "{{ k3s_github_download_url }}/{{ k3s_release_version }}/sha256sum-{{ k3s_arch }}.txt" check_mode: false +- name: Override k3s_binary_url and k3s_hash_url facts for testing specific commit + set_fact: + k3s_binary_url: "https://storage.googleapis.com/k3s-ci-builds/k3s{{ k3s_arch_suffix }}-{{ k3s_release_version }}" + k3s_hash_url: "https://storage.googleapis.com/k3s-ci-builds/k3s{{ k3s_arch_suffix }}-{{ k3s_release_version }}.sha256sum" + when: + - k3s_release_version | regex_search("^[a-z0-9]{40}$") + check_mode: false + - name: Ensure the k3s hashsum is downloaded uri: url: "{{ k3s_hash_url }}" From ddfc73586cab765c137abf91f4a181c203aeb114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Wed, 23 Sep 2020 09:45:51 -0400 Subject: [PATCH 2/6] add commit example to k3s_release_version --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7b7d1b0..ede9865 100644 --- a/README.md +++ b/README.md @@ -119,11 +119,12 @@ It is also possible to install specific K3s "Channels", below are some examples for `k3s_release_version`: ```yaml -k3s_release_version: false # defaults to 'stable' channel -k3s_release_version: stable # latest 'stable' release -k3s_release_version: testing # latest 'testing' release -k3s_release_version: v1.18 # latest v1.18 release -k3s_release_version: v1.17-testing # latest v1.17 testing release +k3s_release_version: false # defaults to 'stable' channel +k3s_release_version: stable # latest 'stable' release +k3s_release_version: testing # latest 'testing' release +k3s_release_version: v1.18 # latest v1.18 release +k3s_release_version: v1.17-testing # latest v1.17 testing release +k3s_release_version: 48ed47c4a3e420fa71c18b2ec97f13dc0659778b # specific commit - must be 40 characters ``` #### Important node about `k3s_install_hard_links` From 7dd8a3f8fff65d5ec2aacd0cc7d446e13b3c73b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Wed, 23 Sep 2020 09:55:44 -0400 Subject: [PATCH 3/6] add example for specific version --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ede9865..b27a1a6 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,7 @@ k3s_release_version: stable # latest 'stable' k3s_release_version: testing # latest 'testing' release k3s_release_version: v1.18 # latest v1.18 release k3s_release_version: v1.17-testing # latest v1.17 testing release +k3s_release_version: v1.19.2-k3s1 # specific version k3s_release_version: 48ed47c4a3e420fa71c18b2ec97f13dc0659778b # specific commit - must be 40 characters ``` From 647d6026e47a9fdbdb03bcf79aace4ef554e91a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Wed, 23 Sep 2020 09:59:42 -0400 Subject: [PATCH 4/6] move commit example a few newlines down --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b27a1a6..e03b74b 100644 --- a/README.md +++ b/README.md @@ -119,13 +119,16 @@ It is also possible to install specific K3s "Channels", below are some examples for `k3s_release_version`: ```yaml -k3s_release_version: false # defaults to 'stable' channel -k3s_release_version: stable # latest 'stable' release -k3s_release_version: testing # latest 'testing' release -k3s_release_version: v1.18 # latest v1.18 release -k3s_release_version: v1.17-testing # latest v1.17 testing release -k3s_release_version: v1.19.2-k3s1 # specific version -k3s_release_version: 48ed47c4a3e420fa71c18b2ec97f13dc0659778b # specific commit - must be 40 characters +k3s_release_version: false # defaults to 'stable' channel +k3s_release_version: stable # latest 'stable' release +k3s_release_version: testing # latest 'testing' release +k3s_release_version: v1.18 # latest v1.18 release +k3s_release_version: v1.17-testing # latest v1.17 testing release +k3s_release_version: v1.19.2-k3s1 # specific release + +# specific commit +# only be used for tesing - must be 40 characters +k3s_release_version: 48ed47c4a3e420fa71c18b2ec97f13dc0659778b ``` #### Important node about `k3s_install_hard_links` From b06d1635f1215ca02709596021e696e55e23dd36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Wed, 23 Sep 2020 10:03:09 -0400 Subject: [PATCH 5/6] fix english --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e03b74b..ccd5615 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ k3s_release_version: v1.17-testing # latest v1.17 testing release k3s_release_version: v1.19.2-k3s1 # specific release # specific commit -# only be used for tesing - must be 40 characters +# caution - only used for tesing - must be 40 characters k3s_release_version: 48ed47c4a3e420fa71c18b2ec97f13dc0659778b ``` From d4c38f59cccbd46504a33e155d4cebad1f69e720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Wed, 23 Sep 2020 10:48:20 -0400 Subject: [PATCH 6/6] fix extra spaces --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ccd5615..f50da85 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ consistency. | `k3s_etcd_snapshot_schedule_cron` | Etcd snapshot cron schedule. | "`* */12 * * *`" | | `k3s_etcd_snapshot_retention` | Etcd snapshot retention. | 5 | | `k3s_etcd_snapshot_directory` | Etcd snapshot directory. | `/var/lib/rancher/k3s/server/db/snapshots` | -| `k3s_secrets_encryption` | Use secrets encryption at rest. (EXPERIMENTAL) | `f alse` | +| `k3s_secrets_encryption` | Use secrets encryption at rest. (EXPERIMENTAL) | `false` | | `k3s_debug` | Enable debug logging on the k3s service | `false` | | `k3s_enable_selinux` | Enable SELinux in containerd. (EXPERIMENTAL) | `false` |