diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-01-11 20:17:47 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-11 20:17:47 +0100 |
| commit | c56f15ec34705476f6694906818f21e7e5aad068 (patch) | |
| tree | f7f24419eb82c5b89cabea6946767f45e893475e /roles | |
| parent | apt module: allow_downgrade is now available (diff) | |
| parent | finalize move to cri-tools from spreadspace repo (diff) | |
Merge branch 'topic/no-more-kubic'
Diffstat (limited to 'roles')
| -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 |