Skip to content

Commit 27c2d40

Browse files
committed
fix: Always upgrade to latest patch version
1 parent 9182d64 commit 27c2d40

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

infrastructure/server-setup/tasks/k8s/install-kubernetes.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
- name: Create keyrings directory
2-
shell: mkdir -p /etc/apt/keyrings
2+
ansible.builtin.file:
3+
path: /etc/apt/keyrings
4+
state: directory
5+
mode: '0755'
36

47
- name: Download Kubernetes APT key
58
get_url:
69
url: "https://pkgs.k8s.io/core:/stable:/{{ kubernetes_version }}/deb/Release.key"
710
dest: /tmp/kubernetes.key
811
mode: '0644'
912

10-
- name: Remove Kubernetes APT key if it exists
11-
shell: rm -f /etc/apt/keyrings/kubernetes-apt-keyring.gpg
12-
13-
- name: Add Kubernetes APT key
14-
shell: gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg /tmp/kubernetes.key
13+
- name: Convert and install Kubernetes APT key
14+
ansible.builtin.shell: gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg /tmp/kubernetes.key
15+
args:
16+
creates: /etc/apt/keyrings/kubernetes-apt-keyring.gpg
1517

1618
- name: Add Kubernetes APT repository
17-
shell: echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/{{ kubernetes_version }}/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list
19+
ansible.builtin.apt_repository:
20+
repo: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/{{ kubernetes_version }}/deb/ /"
21+
filename: kubernetes
22+
state: present
1823

1924
- name: Install specific Kubernetes version
2025
become: yes
@@ -24,7 +29,7 @@
2429
- kubelet
2530
- kubeadm
2631
- kubectl
27-
state: present
32+
state: latest
2833

2934
- name: Enable kubelet service
3035
become: yes

infrastructure/server-setup/tasks/k8s/upgrade-k8s-workers.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
2-
- name: Display upgrade status
3-
ansible.builtin.debug:
4-
msg: |
5-
Kubelet version: {{ kubelet_version }}
6-
Server version: {{ current_k8s_version }}
7-
Target version: {{ kubernetes_version }}
8-
Upgrade needed: {{ upgrade_needed }}
9-
1+
# NOTE: Nodes are not cordoned and workloads keep running while kubelet restart
2+
# Application may become not available if upgrade fails.
103
- name: Restart kubelet
114
become: yes
12-
when: upgrade_needed
135
ansible.builtin.systemd:
146
name: kubelet
157
state: restarted

0 commit comments

Comments
 (0)