Skip to content

Commit

Permalink
Kubelet csr approver fixes (kubernetes-sigs#10165)
Browse files Browse the repository at this point in the history
* Fix upgrade-path for kubelet-csr-approver

Fixes an error when you enable kubelet-csr-approver when upgrading.
It hangs waiting for the certificate to be approved since the
kubelet-csr-approver is not installed yet.

* Add missing package when using helm role
  • Loading branch information
j4m3s-s authored and palmeXx committed Jun 7, 2023
1 parent 652aff7 commit 72601af
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 1 deletion.
2 changes: 1 addition & 1 deletion playbooks/upgrade_cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
roles:
- { role: kubespray-defaults }
- { role: upgrade/pre-upgrade, tags: pre-upgrade }
- { role: kubernetes-apps/kubelet-csr-approver, tags: kubelet-csr-approver }
- { role: container-engine, tags: "container-engine", when: deploy_container_engine }
- { role: kubernetes/node, tags: node }
- { role: kubernetes/control-plane, tags: master, upgrade_cluster_setup: true }
Expand All @@ -104,7 +105,6 @@
- { role: kubernetes-apps/external_cloud_controller, tags: external-cloud-controller }
- { role: network_plugin, tags: network }
- { role: kubernetes-apps/network_plugin, tags: network }
- { role: kubernetes-apps/kubelet-csr-approver, tags: kubelet-csr-approver }
- { role: kubernetes-apps/policy_controller, tags: policy-controller }

- name: Finally handle worker upgrades, based on given batch size
Expand Down
19 changes: 19 additions & 0 deletions roles/kubernetes-apps/helm/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
---
- name: Helm | Gather os specific variables
include_vars: "{{ item }}"
with_first_found:
- files:
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_version|lower|replace('/', '_') }}.yml"
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml"
- "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml"
- "{{ ansible_distribution|lower }}.yml"
- "{{ ansible_os_family|lower }}.yml"
- defaults.yml
paths:
- ../vars
skip: true

- name: Helm | Install PyYaml
package:
name: "{{ pyyaml_package }}"
state: present

- name: Helm | Download helm
include_tasks: "../../../download/tasks/download_file.yml"
vars:
Expand Down
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/amazon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: PyYAML
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/centos-9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: python3-pyyaml
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/centos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: PyYAML
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: python3-yaml
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/fedora.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: python3-pyyaml
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/redhat-9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: python3-pyyaml
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/redhat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: PyYAML
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/suse.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: PyYAML
2 changes: 2 additions & 0 deletions roles/kubernetes-apps/helm/vars/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
pyyaml_package: python3-yaml

0 comments on commit 72601af

Please sign in to comment.