Browse Source

Fix kubelet-csr-approver deployment failes if kube_network_plugin=cni(generic) (#11704)

* Make Helm's 'atomic' parameter configurable from role variables

* Configure Helm with 'atomic' and 'wait' set to false for generic CNI to prevent kubelet-csr-approver installation failures
pull/11720/head
Javad 10 months ago
committed by GitHub
parent
commit
e8bdd47ecc
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
  1. 6
      roles/helm-apps/meta/argument_specs.yml
  2. 3
      roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml

6
roles/helm-apps/meta/argument_specs.yml

@ -46,6 +46,9 @@ argument_specs:
default: true
wait_timeout:
type: str
atomic:
type: bool
default: true
repositories:
type: list
@ -91,3 +94,6 @@ argument_specs:
wait_timeout:
type: str
default: "5m"
atomic:
type: bool
default: true

3
roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml

@ -13,7 +13,8 @@ dependencies:
namespace: "{{ kubelet_csr_approver_namespace }}"
chart_ref: "{{ kubelet_csr_approver_chart_ref }}"
chart_version: "{{ kubelet_csr_approver_chart_version }}"
wait: true
wait: "{{ kube_network_plugin != 'cni' }}"
atomic: "{{ kube_network_plugin != 'cni' }}"
values: "{{ kubelet_csr_approver_values }}"
repositories:
- name: "{{ kubelet_csr_approver_repository_name }}"

Loading…
Cancel
Save