passthrough hubble networkConfig to helm global values (#741)

* passthrough networkConfig hubble settings to global chart values

Signed-off-by: Lukas Hoehl <lukas.hoehl@stackit.cloud>

* test

Signed-off-by: Lukas Hoehl <lukas.hoehl@stackit.cloud>

---------

Signed-off-by: Lukas Hoehl <lukas.hoehl@stackit.cloud>

Author: hown3d

pkg/charts/config.go

@@ -56,6 +56,7 @@ type globalConfig struct {
 	ConfigMapLabelPrefixHash            string                                  `json:"configMapLabelPrefixHash"`
 	PolicyAuditMode                     bool                                    `json:"policyAuditMode"`
 	Encryption                          encryption                              `json:"encryption"`
+	Hubble                              hubbleConfig                            `json:"hubble"`
 }
 
 // etcd related configuration for cilium
@@ -209,3 +210,7 @@ type encryptionWireguardStrictMode struct {
 	Enabled                   bool `json:"enabled"`
 	AllowRemoteNodeIdentities bool `json:"allowRemoteNodeIdentities"`
 }
+
+type hubbleConfig struct {
+	Enabled bool `json:"enabled"`
+}

pkg/charts/utils.go

@@ -125,6 +125,9 @@ var defaultGlobalConfig = globalConfig{
 		NodeEncryption: false,
 		Enabled:        false,
 	},
+	Hubble: hubbleConfig{
+		Enabled: false,
+	},
 }
 
 func newGlobalConfig() globalConfig {
@@ -214,9 +217,9 @@ func generateChartValues(config *ciliumv1alpha1.NetworkConfig, network *extensio
 		return requirementsConfig, globalConfig, nil
 	}
 
-	// If Hubble enabled
-	if config.Hubble != nil && config.Hubble.Enabled {
+	if config.Hubble != nil {
 		requirementsConfig.Hubble.Enabled = config.Hubble.Enabled
+		globalConfig.Hubble.Enabled = config.Hubble.Enabled
 	}
 
 	// If ETCD enabled

pkg/charts/utils_test.go

@@ -1,6 +1,9 @@
 package charts
 
 import (
+	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
+	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
+	"github.com/gardener/gardener/pkg/extensions"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -45,3 +48,26 @@ var _ = Describe("#applyEncryptionConfig", func() {
 		})
 	})
 })
+
+var _ = Describe("#generateChartValues", func() {
+	Describe("hubble", func() {
+		var config *ciliumv1alpha1.NetworkConfig
+		cluster := &extensions.Cluster{
+			Shoot: &gardencorev1beta1.Shoot{},
+		}
+		BeforeEach(func() {
+			config = &ciliumv1alpha1.NetworkConfig{}
+		})
+		Describe("reflect hubble of NetworkConfig in both requirementsConfig and globalConfig", func() {
+			It("should be disabled in requirementsConfig and globalConfig", func() {
+				config.Hubble = &ciliumv1alpha1.Hubble{
+					Enabled: false,
+				}
+				requirementCfg, globalCfg, err := generateChartValues(config, &extensionsv1alpha1.Network{}, cluster, "", "", "")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(requirementCfg.Hubble.Enabled).To(Equal(config.Hubble.Enabled), "requirementsConfig mismatch")
+				Expect(globalCfg.Hubble.Enabled).To(Equal(config.Hubble.Enabled), "globalConfig mismatch")
+			})
+		})
+	})
+})