hubble: add helm-based installation to hubble mode

By storing helm-based config values into Cilium's ConfigMap we are able to generate hubble deployment files by reading those values. Once the manifests are generated, the new helm flags used to enable hubble and/or hubble-ui and/or hubble-relay will also be store in Cilium's ConfigMap. Similarly to 'hubble enable', 'hubble disable' command also stores the helm-based config values into Cilium's ConfigMap. Signed-off-by: André Martins <[email protected]>
cilium · Apr 7, 2022 · 2c565e4 · 2c565e4
1 parent c2133c5
commit 2c565e4
Show file tree

Hide file tree

Showing 9 changed files with 772 additions and 666 deletions.
diff --git a/defaults/defaults.go b/defaults/defaults.go
@@ -33,24 +33,18 @@ const (
 	HubbleSocketPath       = "/var/run/cilium/hubble.sock"
 	HubbleServerSecretName = "hubble-server-certs"
 
-	RelayContainerName        = "hubble-relay"
-	RelayDeploymentName       = "hubble-relay"
-	RelayClusterRoleName      = "hubble-relay"
-	RelayServiceAccountName   = "hubble-relay"
-	RelayServiceName          = "hubble-relay"
-	RelayConfigMapName        = "hubble-relay-config"
-	RelayImage                = "quay.io/cilium/hubble-relay"
-	RelayListenHost           = ""
-	RelayPort                 = 4245
-	RelayServicePlaintextPort = 80
-	RelayServiceTLSPort       = 443
-	RelayServerSecretName     = "hubble-relay-server-certs"
-	RelayClientSecretName     = "hubble-relay-client-certs"
-
-	HubbleUIServiceName        = "hubble-ui"
+	RelayContainerName       = "hubble-relay"
+	RelayDeploymentName      = "hubble-relay"
+	RelayClusterRoleName     = "hubble-relay"
+	RelayServiceAccountName  = "hubble-relay"
+	RelayConfigMapName       = "hubble-relay-config"
+	RelayImage               = "quay.io/cilium/hubble-relay"
+	RelayServerSecretName    = "hubble-relay-server-certs"
+	RelayClientSecretName    = "hubble-relay-client-certs"
+	HubbleUIClientSecretName = "hubble-ui-client-certs"
+
 	HubbleUIClusterRoleName    = "hubble-ui"
 	HubbleUIServiceAccountName = "hubble-ui"
-	HubbleUIConfigMapName      = "hubble-ui-envoy"
 	HubbleUIDeploymentName     = "hubble-ui"
 	HubbleUIImage              = "quay.io/cilium/hubble-ui"
 	HubbleUIBackendImage       = "quay.io/cilium/hubble-ui-backend"
@@ -72,9 +66,8 @@ const (
 	ConnectivityPerformanceImage     = "quay.io/cilium/network-perf:bf58fb8bc57c4933dfa6e2a9581d3925c0a0571e@sha256:9bef508b2dcaeb3e288a496b8d3f065e8636a4937ba3aebcb1732afffaccea34"
 	ConnectivityCheckJSONMockImage   = "quay.io/cilium/json-mock:v1.3.0@sha256:2729064827fa9dbfface8d3df424feb6c792a0ba07117b844349635c93c06d2b"
 
-	ConfigMapName   = "cilium-config"
-	Version         = "v1.11.3"
-	HubbleUIVersion = "v0.8.5"
+	ConfigMapName = "cilium-config"
+	Version       = "v1.11.3"
 
 	TunnelType = "vxlan"
 
@@ -98,16 +91,6 @@ const (
 )
 
 var (
-	// RelayDeploymentLabels are the labels set on the Hubble Relay Deployment by default.
-	RelayDeploymentLabels = map[string]string{
-		"k8s-app": "hubble-relay",
-	}
-
-	// HubbleUIDeploymentLabels are the labels set on the Hubble UI Deployment by default.
-	HubbleUIDeploymentLabels = map[string]string{
-		"k8s-app": "hubble-ui",
-	}
-
 	// ClusterMeshDeploymentLabels are the labels set on the clustermesh API server by default.
 	ClusterMeshDeploymentLabels = map[string]string{
 		"k8s-app": "clustermesh-apiserver",