From 31708feca7ab7c788caa5656bd0b2cad6ccaa193 Mon Sep 17 00:00:00 2001 From: DearJay Date: Thu, 12 Dec 2024 07:57:19 +0900 Subject: [PATCH 1/5] fix download.yml --- roles/kubespray-defaults/defaults/main/download.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 104b9f205ea..b22902269e2 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -1031,6 +1031,14 @@ downloads: groups: - kube_node + ingress_nginx_kube_webhook_certgen: + repo: "{{ ingress_nginx_kube_webhook_certgen_image_repo }}" + tag: "{{ ingress_nginx_kube_webhook_certgen_image_tag }}" + sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum | default(None) }}" + groups: + - kube_node + when: ingress_nginx_webhook_enabled + cert_manager_controller: enabled: "{{ cert_manager_enabled }}" container: true From d47e05147a3a542325d7b3e9ceaaca083a20ed10 Mon Sep 17 00:00:00 2001 From: DearJay Date: Thu, 19 Dec 2024 08:35:39 +0900 Subject: [PATCH 2/5] fix comments --- roles/kubespray-defaults/defaults/main/download.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index b22902269e2..959bad54f99 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -1032,12 +1032,12 @@ downloads: - kube_node ingress_nginx_kube_webhook_certgen: + enabled: "{{ ingress_nginx_webhook_enabled }}" repo: "{{ ingress_nginx_kube_webhook_certgen_image_repo }}" tag: "{{ ingress_nginx_kube_webhook_certgen_image_tag }}" - sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum | default(None) }}" + sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum | default }}" groups: - - kube_node - when: ingress_nginx_webhook_enabled + - "{{ ingress_nginx_nodeselector }}" cert_manager_controller: enabled: "{{ cert_manager_enabled }}" From 58df6a3cf1af8b3442031b9fa64a3ee110ab237e Mon Sep 17 00:00:00 2001 From: DearJay Date: Mon, 23 Dec 2024 14:19:18 +0900 Subject: [PATCH 3/5] fix ingress_nginx_kube_webhook_certgen sha256 --- roles/kubespray-defaults/defaults/main/download.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 959bad54f99..60fcf1401d2 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -1035,7 +1035,7 @@ downloads: enabled: "{{ ingress_nginx_webhook_enabled }}" repo: "{{ ingress_nginx_kube_webhook_certgen_image_repo }}" tag: "{{ ingress_nginx_kube_webhook_certgen_image_tag }}" - sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum | default }}" + sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum }}" groups: - "{{ ingress_nginx_nodeselector }}" From af5dd459eb14f1716ae7f769710d944ed916f887 Mon Sep 17 00:00:00 2001 From: DearJay Date: Thu, 26 Dec 2024 08:15:59 +0900 Subject: [PATCH 4/5] fix groups --- roles/kubespray-defaults/defaults/main/download.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 67c61087ff4..6b70a18464a 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -1037,7 +1037,8 @@ downloads: tag: "{{ ingress_nginx_kube_webhook_certgen_image_tag }}" sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum }}" groups: - - "{{ ingress_nginx_nodeselector }}" + - kube_control_plane + - infra cert_manager_controller: enabled: "{{ cert_manager_enabled }}" From cbfabd9e7eb6551846be73ce329186065c51f142 Mon Sep 17 00:00:00 2001 From: DearJay Date: Thu, 26 Dec 2024 08:39:03 +0900 Subject: [PATCH 5/5] fix sha256 --- roles/kubespray-defaults/defaults/main/download.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 6b70a18464a..463d6ce661a 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -1035,7 +1035,7 @@ downloads: enabled: "{{ ingress_nginx_webhook_enabled }}" repo: "{{ ingress_nginx_kube_webhook_certgen_image_repo }}" tag: "{{ ingress_nginx_kube_webhook_certgen_image_tag }}" - sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum }}" + sha256: "{{ ingress_nginx_kube_webhook_certgen_digest_checksum | default(None) }}" groups: - kube_control_plane - infra