Merge pull request #150 from rdxmb/master

update apt sources, add apt keyring gpg

defaults/main.yml

@@ -51,10 +51,9 @@ kubernetes_apiserver_advertise_address: ''
 kubernetes_version_kubeadm: 'stable-{{ kubernetes_version }}'
 kubernetes_ignore_preflight_errors: 'all'
 
-kubernetes_apt_release_channel: main
+kubernetes_apt_release_channel: "stable"
-# Note that xenial repo is used for all Debian derivatives at this time.
+kubernetes_apt_keyring_file: "/etc/apt/keyrings/kubernetes-apt-keyring.asc"
-kubernetes_apt_repository: "deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_apt_release_channel }}"
+kubernetes_apt_repository: "deb [signed-by={{ kubernetes_apt_keyring_file }}] https://pkgs.k8s.io/core:/{{ kubernetes_apt_release_channel }}:/v{{ kubernetes_version }}/deb/ /"
-kubernetes_apt_ignore_key_error: false
 
 kubernetes_yum_arch: '$basearch'
 kubernetes_yum_base_url: "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ kubernetes_yum_arch }}"

tasks/setup-Debian.yml

@@ -6,16 +6,28 @@
       - ca-certificates
     state: present
 
-- name: Add Kubernetes apt key.
+- name: Prepare apt keyring directory.
-  apt_key:
+  ansible.builtin.file:
-    url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
+    path: "{{ kubernetes_apt_keyring_file | dirname }}"
-    state: present
+    state: directory
-  register: add_repository_key
+    mode: 0755
-  ignore_errors: "{{ kubernetes_apt_ignore_key_error }}"
+
+- name: Get Kubernetes apt key.
+  ansible.builtin.get_url:
+    url: "https://pkgs.k8s.io/core:/{{ kubernetes_apt_release_channel }}:/v{{ kubernetes_version }}/deb/Release.key"
+    dest: "{{ kubernetes_apt_keyring_file }}"
+    mode: '0644'
+    force: true
+
+- name: Be sure deprecated Kubernetes repository is absent.
+  file:
+    path: "/etc/apt/sources.list.d/apt_kubernetes_io.list"
+    state: absent
 
 - name: Add Kubernetes repository.
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: "{{ kubernetes_apt_repository }}"
+    filename: pkgs_k8s_io
     state: present
     update_cache: true