helm: Set --enable-hubble/--hubble-socket-path flags

Fixes: #10740, #10826, #10827 Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
cilium · Apr 3, 2020 · 6e7c657 · 6e7c657
1 parent 806df58
commit 6e7c657
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/install/kubernetes/cilium/charts/agent/templates/daemonset.yaml b/install/kubernetes/cilium/charts/agent/templates/daemonset.yaml
@@ -117,13 +117,13 @@ spec:
               key: custom-cni-conf
               name: cilium-config
               optional: true
-{{- if gt (len .Values.global.hubble.listenAddresses) 0 }}
+{{- if .Values.global.hubble.enabled }}
         # Hubble uses this group for its unix domain sockets.
         - name: HUBBLE_GROUP_NAME
           value: "cilium"
         # Default Hubble gRPC endpoint for observe/status commands.
         - name: HUBBLE_DEFAULT_SOCKET_PATH
-          value: {{ .Values.global.hubble.listenAddresses | first | quote }}
+          value: unix://{{ .Values.global.hubble.socketPath }}
 {{- end }}
 {{- if .Values.global.k8sServiceHost }}
         - name: KUBERNETES_SERVICE_HOST

diff --git a/install/kubernetes/cilium/charts/config/templates/configmap.yaml b/install/kubernetes/cilium/charts/config/templates/configmap.yaml
@@ -361,10 +361,11 @@ data:
 {{- else }}
   operator-api-serve-addr: '[::1]:9234'
 {{- end }}
-{{ if gt (len .Values.global.hubble.listenAddresses) 0 }}
-  # A space separated list of addresses for Hubble server to listen to. Currently only unix
-  # domain sockets are supported. Hubble gRPC endpoint will be disabled if this field is not
-  # set.
+{{ if .Values.global.hubble.enabled }}
+  enable-hubble: "true"
+  # UNIX domain socket for Hubble server to listen to.
+  hubble-socket-path:  {{ .Values.global.hubble.socketPath | quote }}
+  # A space separated list of additional addresses for Hubble server to listen to.
   hubble-listen-addresses: {{ .Values.global.hubble.listenAddresses | join " " | quote }}
 {{ if .Values.global.hubble.eventQueueSize }}
   # Buffer size of the channel for Hubble to receive monitor events. If this field is not set,
@@ -384,8 +385,8 @@ data:
   #
   # https://github.com/cilium/hubble/blob/master/Documentation/metrics.md
   hubble-metrics: {{ .Values.global.hubble.metrics | join " " | quote }}
-  {{- end }}
+{{- end }}
+{{- end }}
 
   # A space separated list of iptables chains to disable when installing feeder rules.
   disable-iptables-feeder-rules: {{ .Values.global.disableIptablesFeederRules | join " " | quote }}
-{{- end }}
diff --git a/install/kubernetes/cilium/values.yaml b/install/kubernetes/cilium/values.yaml
@@ -388,16 +388,18 @@ global:
 
   # hubble configures Hubble.
   hubble:
-    # List of unix domain socket paths to listen to, for example:
+    enabled: false
+    # Default unix domain socket path to listen to when Hubble is enabled. Default to "/var/run/cilium/hubble.sock".
+    socketPath: /var/run/cilium/hubble.sock
+    # List of additional addresses to listen to, for example:
     #
     #   listenAddresses:
-    #   - "unix:///var/run/cilium/hubble.sock"
+    #   - ":50051"
+    #   - ":50052"
     #
     # You can specify the list of metrics from the helm CLI:
     #
-    #   --set global.hubble.listenAddresses={unix:///var/run/cilium}
-    #
-    # Hubble is disabled if the list is empty.
+    #   --set global.hubble.listenAddresses={:50051,:50052}
     listenAddresses: []
     # Buffer size of the channel Hubble uses to receive monitor events. If this value is not set,
     # the queue size is set to the default monitor queue size.