diff options
| -rw-r--r-- | roles/containerd/tasks/main.yml | 15 | ||||
| -rw-r--r-- | roles/docker/engine/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/kubernetes/base/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/kubernetes/kubeadm/base/tasks/main.yml | 19 | ||||
| -rw-r--r-- | roles/mysql/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/streaming/blackmagic/desktopvideo/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/streaming/blackmagic/mediaexpress/tasks/main.yml | 3 |
7 files changed, 32 insertions, 15 deletions
diff --git a/roles/containerd/tasks/main.yml b/roles/containerd/tasks/main.yml index 10371243..26acea66 100644 --- a/roles/containerd/tasks/main.yml +++ b/roles/containerd/tasks/main.yml @@ -22,6 +22,15 @@ name: "{{ containerd_pkg_name }}{% if containerd_pkg_version is defined %}={{ containerd_pkg_version }}{% endif %}" state: present force: yes + ## TODO: remove force once the following changes are available + ## https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562 + ## https://github.com/ansible/ansible/pull/74852 + +- name: disable automatic upgrades for containerd package + when: containerd_pkg_version is defined + dpkg_selections: + name: "{{ containerd_pkg_name }}" + selection: hold - name: fetch containerd default config check_mode: no @@ -35,12 +44,6 @@ dest: /etc/containerd/config.toml notify: restart containerd -- name: disable automatic upgrades for containerd package - when: containerd_pkg_version is defined - dpkg_selections: - name: "{{ containerd_pkg_name }}" - selection: hold - - name: start and enable containerd service: name: containerd diff --git a/roles/docker/engine/tasks/main.yml b/roles/docker/engine/tasks/main.yml index 55cd5787..b6f5bb12 100644 --- a/roles/docker/engine/tasks/main.yml +++ b/roles/docker/engine/tasks/main.yml @@ -33,6 +33,9 @@ - "{{ python_basename }}-docker" state: present force: yes + ## TODO: remove force once the following changes are available + ## https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562 + ## https://github.com/ansible/ansible/pull/74852 - name: disable automatic upgrades for docker package when: docker_pkg_version is defined diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index e10e4a78..70be0d3a 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -25,6 +25,9 @@ - "kubelet={{ kubernetes_version }}-00" state: present force: yes + ## TODO: remove force once the following changes are available + ## https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562 + ## https://github.com/ansible/ansible/pull/74852 - name: disable automatic upgrades for kubelet and cri-tools loop: diff --git a/roles/kubernetes/kubeadm/base/tasks/main.yml b/roles/kubernetes/kubeadm/base/tasks/main.yml index 7d882f31..0fab7845 100644 --- a/roles/kubernetes/kubeadm/base/tasks/main.yml +++ b/roles/kubernetes/kubeadm/base/tasks/main.yml @@ -2,17 +2,20 @@ - name: install kubeadm packages apt: name: - - haproxy - - haproxyctl - - "kubeadm={{ kubernetes_version }}-00" - - "kubectl={{ kubernetes_version }}-00" + - haproxy + - haproxyctl + - "kubeadm={{ kubernetes_version }}-00" + - "kubectl={{ kubernetes_version }}-00" state: present force: yes + ## TODO: remove force once the following changes are available + ## https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562 + ## https://github.com/ansible/ansible/pull/74852 - name: disable automatic upgrades for kubeadm/kubectl loop: - - kubeadm - - kubectl + - kubeadm + - kubectl dpkg_selections: name: "{{ item }}" selection: hold @@ -27,8 +30,8 @@ - name: add kubeadm config for shells loop: - - zsh - - bash + - zsh + - bash blockinfile: path: "/root/.{{ item }}rc" create: yes diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index 3bb125d4..34a897ba 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -10,7 +10,6 @@ - "{{ mysql_pkg_name }}" - "{{ python_basename }}-pymysql" state: present - force: yes - name: delete anonymous MySQL server user mysql_user: diff --git a/roles/streaming/blackmagic/desktopvideo/tasks/main.yml b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml index 980e10e1..3ef7231e 100644 --- a/roles/streaming/blackmagic/desktopvideo/tasks/main.yml +++ b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml @@ -18,6 +18,9 @@ name: "{{ blackmagic_desktopvideo_packages | product(blackmagic_desktopvideo_version is defined | ternary(['=' + (blackmagic_desktopvideo_version | default(''))], [''])) | map('join') }}" state: present force: yes + ## TODO: remove force once the following changes are available + ## https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562 + ## https://github.com/ansible/ansible/pull/74852 - name: disable automatic upgrades for desktopvideo packages when: blackmagic_desktopvideo_version is defined diff --git a/roles/streaming/blackmagic/mediaexpress/tasks/main.yml b/roles/streaming/blackmagic/mediaexpress/tasks/main.yml index 15e4b4d9..3b99b8d3 100644 --- a/roles/streaming/blackmagic/mediaexpress/tasks/main.yml +++ b/roles/streaming/blackmagic/mediaexpress/tasks/main.yml @@ -8,6 +8,9 @@ name: "mediaexpress{% if blackmagic_mediaexpress_version is defined %}={{ blackmagic_mediaexpress_version }}{% endif %}" state: present force: yes + ## TODO: remove force once the following changes are available + ## https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562 + ## https://github.com/ansible/ansible/pull/74852 - name: disable automatic upgrades for mediaexpress when: blackmagic_mediaexpress_version is defined |