diff --git a/README.md b/README.md index 7b7d1b0..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` | @@ -119,11 +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: 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 +# caution - only used for tesing - must be 40 characters +k3s_release_version: 48ed47c4a3e420fa71c18b2ec97f13dc0659778b ``` #### Important node about `k3s_install_hard_links` 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 }}"