Skip to content

Commit 481cbc0

Browse files
committed
testing
1 parent d7d5f82 commit 481cbc0

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

infrastructure/server-setup/k8s.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
- kubernetes-installation
6262
tags:
6363
- kubernetes-installation
64-
- name: Initialize Kubernetes Master
64+
65+
- name: Kubernetes Master
6566
hosts: master
6667
tags: k8s
67-
gather_facts: yes
6868
tasks:
6969
- name: Include master initialization
7070
include_tasks: tasks/k8s/init-master.yml
@@ -73,7 +73,7 @@
7373
- name: Upgrade cluster
7474
include_tasks: tasks/k8s/upgrade-k8s-master.yml
7575

76-
- name: Join Worker Nodes
76+
- name: Kubernetes Worker Nodes
7777
hosts: workers
7878
tags:
7979
- join-workers

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

Lines changed: 12 additions & 7 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

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
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
125
when: upgrade_needed

0 commit comments

Comments
 (0)