From 648e55a3799946baa95740b42daac3913202af95 Mon Sep 17 00:00:00 2001 From: Ali Afsharzadeh Date: Tue, 14 Jul 2026 18:03:17 +0330 Subject: [PATCH] Rename cilium certgen and envoy image variables (#13260) Signed-off-by: Ali Afsharzadeh --- .../defaults/main/download.yml | 28 +++++++++---------- .../cilium/templates/values.yaml.j2 | 8 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/roles/kubespray_defaults/defaults/main/download.yml b/roles/kubespray_defaults/defaults/main/download.yml index e20818fd7..dbee5588f 100644 --- a/roles/kubespray_defaults/defaults/main/download.yml +++ b/roles/kubespray_defaults/defaults/main/download.yml @@ -238,14 +238,14 @@ cilium_operator_image_repo: "{{ quay_image_repo }}/cilium/operator" cilium_operator_image_tag: "v{{ cilium_version }}" cilium_hubble_relay_image_repo: "{{ quay_image_repo }}/cilium/hubble-relay" cilium_hubble_relay_image_tag: "v{{ cilium_version }}" -cilium_hubble_certgen_image_repo: "{{ quay_image_repo }}/cilium/certgen" -cilium_hubble_certgen_image_tag: "v0.4.5" +cilium_certgen_image_repo: "{{ quay_image_repo }}/cilium/certgen" +cilium_certgen_image_tag: "v0.4.5" cilium_hubble_ui_image_repo: "{{ quay_image_repo }}/cilium/hubble-ui" cilium_hubble_ui_image_tag: "v0.13.5" cilium_hubble_ui_backend_image_repo: "{{ quay_image_repo }}/cilium/hubble-ui-backend" cilium_hubble_ui_backend_image_tag: "v0.13.5" -cilium_hubble_envoy_image_repo: "{{ quay_image_repo }}/cilium/cilium-envoy" -cilium_hubble_envoy_image_tag: "v1.37.2-1778236003-7c2f6580d32e50f1a6866c12122662856f54eec2" +cilium_envoy_image_repo: "{{ quay_image_repo }}/cilium/cilium-envoy" +cilium_envoy_image_tag: "v1.37.2-1778236003-7c2f6580d32e50f1a6866c12122662856f54eec2" kube_ovn_container_image_repo: "{{ docker_image_repo }}/kubeovn/kube-ovn" kube_ovn_container_image_tag: "v{{ kube_ovn_version }}" kube_ovn_vpc_container_image_repo: "{{ docker_image_repo }}/kubeovn/vpc-nat-gateway" @@ -611,12 +611,12 @@ downloads: groups: - k8s_cluster - cilium_hubble_certgen: - enabled: "{{ cilium_enable_hubble }}" + cilium_certgen: + enabled: "{{ kube_network_plugin == 'cilium' }}" container: true - repo: "{{ cilium_hubble_certgen_image_repo }}" - tag: "{{ cilium_hubble_certgen_image_tag }}" - checksum: "{{ cilium_hubble_certgen_digest_checksum | default(None) }}" + repo: "{{ cilium_certgen_image_repo }}" + tag: "{{ cilium_certgen_image_tag }}" + checksum: "{{ cilium_certgen_digest_checksum | default(None) }}" groups: - k8s_cluster @@ -638,12 +638,12 @@ downloads: groups: - k8s_cluster - cilium_hubble_envoy: - enabled: "{{ cilium_enable_hubble }}" + cilium_envoy: + enabled: "{{ kube_network_plugin == 'cilium' }}" container: true - repo: "{{ cilium_hubble_envoy_image_repo }}" - tag: "{{ cilium_hubble_envoy_image_tag }}" - checksum: "{{ cilium_hubble_envoy_digest_checksum | default(None) }}" + repo: "{{ cilium_envoy_image_repo }}" + tag: "{{ cilium_envoy_image_tag }}" + checksum: "{{ cilium_envoy_digest_checksum | default(None) }}" groups: - k8s_cluster diff --git a/roles/network_plugin/cilium/templates/values.yaml.j2 b/roles/network_plugin/cilium/templates/values.yaml.j2 index f0ac7e88d..f503aadda 100644 --- a/roles/network_plugin/cilium/templates/values.yaml.j2 +++ b/roles/network_plugin/cilium/templates/values.yaml.j2 @@ -182,13 +182,13 @@ prometheus: certgen: image: - repository: {{ cilium_hubble_certgen_image_repo }} - tag: {{ cilium_hubble_certgen_image_tag }} + repository: {{ cilium_certgen_image_repo }} + tag: {{ cilium_certgen_image_tag }} envoy: image: - repository: {{ cilium_hubble_envoy_image_repo }} - tag: {{ cilium_hubble_envoy_image_tag }} + repository: {{ cilium_envoy_image_repo }} + tag: {{ cilium_envoy_image_tag }} extraConfig: {{ cilium_config_extra_vars | to_yaml | indent(2) }}