From 5be4b0a9fe5211ed4d68f69178046a6029dfb5b2 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Wed, 9 Sep 2026 13:36:34 +0000 Subject: [PATCH] CI: add helm for kubelet-csr-approver/custom-cni-helm tests (#13457) Currently this only works because helm_enabled is not actually checked for some helm installation cases. --- tests/files/debian12-custom-cni-helm.yml | 2 ++ tests/files/debian13-kubelet-csr-approver.yml | 2 ++ tests/files/ubuntu24-calico-all-in-one-hardening.yml | 1 + 3 files changed, 5 insertions(+) diff --git a/tests/files/debian12-custom-cni-helm.yml b/tests/files/debian12-custom-cni-helm.yml index 8549524cc..2d739caba 100644 --- a/tests/files/debian12-custom-cni-helm.yml +++ b/tests/files/debian12-custom-cni-helm.yml @@ -20,3 +20,5 @@ custom_cni_chart_values: operator: clusterPoolIPv4PodCIDRList: - "{{ kube_pods_subnet }}" + +helm_enabled: true diff --git a/tests/files/debian13-kubelet-csr-approver.yml b/tests/files/debian13-kubelet-csr-approver.yml index 79a21e29f..a4058bafd 100644 --- a/tests/files/debian13-kubelet-csr-approver.yml +++ b/tests/files/debian13-kubelet-csr-approver.yml @@ -8,3 +8,5 @@ kubelet_csr_approver_enabled: true kubelet_csr_approver_values: # Do not check DNS resolution in testing (not recommended in production) bypassDnsResolution: true + +helm_enabled: true diff --git a/tests/files/ubuntu24-calico-all-in-one-hardening.yml b/tests/files/ubuntu24-calico-all-in-one-hardening.yml index 7a6a63f50..379b47878 100644 --- a/tests/files/ubuntu24-calico-all-in-one-hardening.yml +++ b/tests/files/ubuntu24-calico-all-in-one-hardening.yml @@ -75,6 +75,7 @@ etcd_deployment_type: kubeadm kubelet_authentication_token_webhook: true kube_read_only_port: 0 kubelet_rotate_server_certificates: true +helm_enabled: true kubelet_csr_approver_enabled: true # For hydrophone kubelet_csr_approver_values: # Do not check DNS resolution in testing (not recommended in production)