From 6bb1e2f290d6649ea49ae2b544b5b4f9da309a88 Mon Sep 17 00:00:00 2001 From: Justin Lamp <32171364+modzilla99@users.noreply.github.com> Date: Sun, 10 May 2026 05:19:45 +0200 Subject: [PATCH] Set http proxy environments for helm app installations (#13234) * Set http proxy environments for helm app installations Signed-off-by: Justin Lamp * Change http_proxy env variables from legacy static entries to new proxy_env variable Signed-off-by: Justin Lamp --------- Signed-off-by: Justin Lamp --- roles/helm-apps/tasks/main.yml | 3 +++ roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml | 4 +--- roles/network_plugin/custom_cni/meta/main.yml | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/roles/helm-apps/tasks/main.yml b/roles/helm-apps/tasks/main.yml index 9515f167c..0f5080156 100644 --- a/roles/helm-apps/tasks/main.yml +++ b/roles/helm-apps/tasks/main.yml @@ -1,9 +1,11 @@ --- - name: Add Helm repositories + environment: "{{ proxy_env }}" kubernetes.core.helm_repository: "{{ helm_repository_defaults | combine(item) }}" # noqa args[module] loop: "{{ repositories }}" - name: Update Helm repositories + environment: "{{ proxy_env }}" kubernetes.core.helm: state: absent binary_path: "{{ bin_dir }}/helm" @@ -15,5 +17,6 @@ - helm_update - name: Install Helm Applications + environment: "{{ proxy_env }}" kubernetes.core.helm: "{{ helm_defaults | combine(release_common_opts, item) }}" # noqa args[module] loop: "{{ releases }}" diff --git a/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml b/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml index 56f7e7157..a42089f35 100644 --- a/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml +++ b/roles/kubernetes-apps/kubelet-csr-approver/meta/main.yml @@ -4,9 +4,7 @@ dependencies: when: - inventory_hostname == groups['kube_control_plane'][0] - kubelet_csr_approver_enabled - environment: - http_proxy: "{{ http_proxy | default('') }}" - https_proxy: "{{ https_proxy | default('') }}" + environment: "{{ proxy_env }}" release_common_opts: {} releases: - name: kubelet-csr-approver diff --git a/roles/network_plugin/custom_cni/meta/main.yml b/roles/network_plugin/custom_cni/meta/main.yml index d6838d4ab..4e48c34ad 100644 --- a/roles/network_plugin/custom_cni/meta/main.yml +++ b/roles/network_plugin/custom_cni/meta/main.yml @@ -4,9 +4,7 @@ dependencies: when: - inventory_hostname == groups['kube_control_plane'][0] - custom_cni_chart_release_name | length > 0 - environment: - http_proxy: "{{ http_proxy | default('') }}" - https_proxy: "{{ https_proxy | default('') }}" + environment: "{{ proxy_env }}" release_common_opts: {} releases: - name: "{{ custom_cni_chart_release_name }}"