diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-01-11 13:34:29 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-11 13:34:29 +0100 |
| commit | 868f6e961d707299d6de8b3abfaa6ed46e25ff72 (patch) | |
| tree | b7febb80589544208b94e60824624fb3fa3880e1 /roles/kubernetes | |
| parent | apt module: allow_downgrade is now available (diff) | |
kubernetes: switch to cri-tools from spreadspace repo
Diffstat (limited to 'roles/kubernetes')
| -rw-r--r-- | roles/kubernetes/base/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/roles/kubernetes/base/defaults/main.yml b/roles/kubernetes/base/defaults/main.yml index d5eccc59..9e97a8fb 100644 --- a/roles/kubernetes/base/defaults/main.yml +++ b/roles/kubernetes/base/defaults/main.yml @@ -1,2 +1,2 @@ --- -kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0~1" +kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0-1" diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index b457dd68..4ff976a1 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -1,4 +1,11 @@ --- +- name: check if prometheus apt component of spreadspace repo is enabled + assert: + msg: "please enable the 'container' component of spreadspace repo using 'spreadspace_apt_repo_components'" + that: + - spreadspace_apt_repo_components is defined + - "'container' in spreadspace_apt_repo_components" + - name: install container runtime include_tasks: "cri_{{ kubernetes_container_runtime }}.yml" @@ -13,10 +20,6 @@ include_role: name: apt-repo/kubernetes -- name: add apt repository for cri-tools - include_role: - name: apt-repo/kubic-project - - name: generate apt pin files for kubelet and cri-tools loop: - name: kubelet |