Skip to content

Commit b3b7466

Browse files
author
Julien Girardin
committed
Change debian repo to the new one. Remove usage of (deprecated) apt_key
https://kubernetes.io/blog/2023/08/15/pkgs-k8s-io-introduction/
1 parent 9fe2cf8 commit b3b7466

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed

roles/packages/tasks/kube_repo_Debian.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
---
2+
- name: 'Create directory to store keys'
3+
file:
4+
dest: /etc/apt/keyrings
5+
state: directory
6+
27
- name: 'Add kubernetes repo signing key'
3-
apt_key:
8+
ansible.builtin.get_url:
49
url: '{{ kubernetes_repository.gpg_url }}'
5-
state: present
10+
dest: '/etc/apt/keyrings/kubernetes-apt-keyring.asc'
611

712
- name: 'Add the kubernetes repository'
813
apt_repository:
914
repo: '{{ kubernetes_repository.repo_url }}'
1015
state: present
16+
update_cache: false
1117
register: kube_repo_just_added
1218

19+
- name: 'Cleanup old kubernetes repository'
20+
apt_repository:
21+
repo: '{{ kubernetes_old_repository.repo_url }}'
22+
state: absent
23+
when: kubernetes_repository.repo_url != kubernetes_old_repository.repo_url
24+
1325
- name: 'refresh source list'
1426
apt:
1527
update_cache: true

roles/packages/vars/os_Debian.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
---
2-
kubernetes_repository:
2+
_repo_version: '{{ (_target_kubeadm_version|regex_findall("(?:\d+)"))[0:2]|join(".") }}'
3+
kubernetes_repository: >-
4+
{%- if _repo_version is version("1.24", ">=") -%}
5+
{{ kubernetes_new_repository }}
6+
{%- else -%}
7+
{{ kubernetes_old_repository }}
8+
{%- endif -%}
9+
10+
kubernetes_new_repository:
11+
gpg_url: 'https://pkgs.k8s.io/core:/stable:/v{{ _repo_version }}/deb/Release.key'
12+
repo_url: 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.asc] https://pkgs.k8s.io/core:/stable:/v{{ _repo_version }}/deb/ /'
13+
14+
kubernetes_old_repository:
315
gpg_url: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg'
4-
repo_url: 'deb https://apt.kubernetes.io/ kubernetes-xenial main'
16+
repo_url: 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.asc] https://apt.kubernetes.io/ kubernetes-xenial main'
517

618
repository_dependencies:
719
- apt-transport-https

tests/features/upgrade.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ Feature: Upgrade
3131
Examples:
3232
| from_version | to_version |
3333
| 1.21 | 1.22 |
34+
| 1.23 | 1.24 |

0 commit comments

Comments
 (0)