From dcd3461bce2fa8c02873f9618840ddf5163923ae Mon Sep 17 00:00:00 2001
From: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
Date: Wed, 23 Apr 2025 14:16:28 +0800
Subject: [PATCH] Cilium values use image variables

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
---
 .../cilium/templates/values.yaml.j2           | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/roles/network_plugin/cilium/templates/values.yaml.j2 b/roles/network_plugin/cilium/templates/values.yaml.j2
index 636dd06ff..9972da343 100644
--- a/roles/network_plugin/cilium/templates/values.yaml.j2
+++ b/roles/network_plugin/cilium/templates/values.yaml.j2
@@ -1,6 +1,11 @@
 MTU: {{ cilium_mtu }}
 debug:
   enabled: {{ cilium_debug }}
+
+image:
+  repository: {{ cilium_image_repo }}
+  tag: {{ cilium_image_tag }}
+
 ipv4:
   enabled: {{ cilium_enable_ipv4 }}
 ipv6:
@@ -71,8 +76,21 @@ ipMasqAgent:
 
 hubble:
   enabled: {{ cilium_enable_hubble }}
+  relay:
+    enabled: {{ cilium_enable_hubble }}
+    image:
+      repository: {{ cilium_hubble_relay_image_repo }}
+      tag: {{ cilium_hubble_relay_image_tag }}
   ui:
     enabled: {{ cilium_enable_hubble_ui }}
+    backend:
+      image:
+        repository: {{ cilium_hubble_ui_backend_image_repo }}
+        tag: {{ cilium_hubble_ui_backend_image_tag }}
+    frontend:
+      image:
+        repository: {{ cilium_hubble_ui_image_repo }}
+        tag: {{ cilium_hubble_ui_image_tag }}
   metrics:
     enabled: {{ cilium_hubble_metrics }}
 
@@ -93,6 +111,9 @@ cgroup:
   hostRoot: {{ cilium_cgroup_host_root }}
 
 operator:
+  image:
+    repository: {{ cilium_operator_image_repo }}
+    tag: {{ cilium_operator_image_tag }}
   replicas: {{ cilium_operator_replicas }}
   extraArgs:
     {{ cilium_operator_extra_args | to_nice_yaml(indent=2) | indent(4) }}
@@ -110,3 +131,13 @@ enableIPv6Masquerade: {{ cilium_enable_ipv6_masquerade }}
 
 hostFirewall:
   enabled: {{ cilium_enable_host_firewall }}
+
+certgen:
+  image:
+    repositry: {{ cilium_hubble_certgen_image_repo }}
+    tag: {{ cilium_hubble_certgen_image_tag }}
+
+envoy:
+  image:
+    repositry: {{ cilium_hubble_envoy_image_repo }}
+    tag: {{ cilium_hubble_envoy_image_tag }}