add cilium hubble-ui enable flag (#10939)

kubernetes-sigs · Oct 1, 2024 · 6b49918 · 6b49918
1 parent 1ccf0df
commit 6b49918
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 0 deletions.
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-cilium.yml
@@ -152,6 +152,9 @@ cilium_l2announcements: false
 # Hubble
 ### Enable Hubble without install
 # cilium_enable_hubble: false
+### Enable Hubble-ui
+### Installed by default when hubble is enabled. To disable set to false
+# cilium_enable_hubble_ui: "{{ cilium_enable_hubble }}
 ### Enable Hubble Metrics
 # cilium_enable_hubble_metrics: false
 ### if cilium_enable_hubble_metrics: true

diff --git a/roles/network_plugin/cilium/defaults/main.yml b/roles/network_plugin/cilium/defaults/main.yml
@@ -144,6 +144,8 @@ cilium_ip_masq_resync_interval: 60s
 # Hubble
 ### Enable Hubble without install
 cilium_enable_hubble: false
+### Enable Hubble-ui
+cilium_enable_hubble_ui: "{{ cilium_enable_hubble }}"
 ### Enable Hubble Metrics
 cilium_enable_hubble_metrics: false
 ### if cilium_enable_hubble_metrics: true

diff --git a/roles/network_plugin/cilium/templates/hubble/cr.yml.j2 b/roles/network_plugin/cilium/templates/hubble/cr.yml.j2
@@ -60,6 +60,7 @@ rules:
       - get
       - list
       - watch
+{% if cilium_enable_hubble_ui %}
 ---
 # Source: cilium/templates/hubble-ui-clusterrole.yaml
 kind: ClusterRole
@@ -104,3 +105,4 @@ rules:
       - get
       - list
       - watch
+{% endif %}
diff --git a/roles/network_plugin/cilium/templates/hubble/crb.yml.j2 b/roles/network_plugin/cilium/templates/hubble/crb.yml.j2
@@ -28,6 +28,7 @@ subjects:
 - kind: ServiceAccount
   namespace: kube-system
   name: hubble-relay
+{% if cilium_enable_hubble_ui %}
 ---
 # Source: cilium/templates/hubble-ui-clusterrolebinding.yaml
 kind: ClusterRoleBinding
@@ -42,3 +43,4 @@ subjects:
 - kind: ServiceAccount
   namespace: kube-system
   name: hubble-ui
+{% endif %}
diff --git a/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2 b/roles/network_plugin/cilium/templates/hubble/deploy.yml.j2
@@ -104,6 +104,7 @@ spec:
         name: tls
       {%- endif %}
 
+{% if cilium_enable_hubble_ui %}
 ---
 # Source: cilium/templates/hubble-ui/deployment.yaml
 kind: Deployment
@@ -195,3 +196,4 @@ spec:
           name: tls
         - emptyDir: {}
           name: tmp-dir
+{% endif %}
diff --git a/roles/network_plugin/cilium/templates/hubble/sa.yml.j2 b/roles/network_plugin/cilium/templates/hubble/sa.yml.j2
@@ -14,10 +14,12 @@ kind: ServiceAccount
 metadata:
   name: hubble-relay
   namespace: kube-system
+{% if cilium_enable_hubble_ui %}
 ---
 # Source: cilium/templates/hubble-ui-serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: hubble-ui
   namespace: kube-system
+{% endif %}
diff --git a/roles/network_plugin/cilium/templates/hubble/service.yml.j2 b/roles/network_plugin/cilium/templates/hubble/service.yml.j2
@@ -68,6 +68,7 @@ spec:
     {% endif -%}
     targetPort: 4245
 ---
+{% if cilium_enable_hubble_ui %}
 # Source: cilium/templates/hubble-ui-service.yaml
 kind: Service
 apiVersion: v1
@@ -85,6 +86,7 @@ spec:
       targetPort: 8081
   type: ClusterIP
 ---
+{% endif %}
 # Source: cilium/templates/hubble/peer-service.yaml
 apiVersion: v1
 kind: Service