Merge pull request #9967 from olemarkus/cilium-hubble-pointer

Cilium hubble pointer
kubernetes · Sep 30, 2020 · 13cbd84 · 13cbd84
2 parents b992151 + b9111c7
commit 13cbd84
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 17 deletions.
diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -441,7 +441,7 @@ type CiliumNetworkingSpec struct {
 	// Default: false
 	EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
 	// Hubble configures the Hubble service on the Cilium agent.
-	Hubble HubbleSpec `json:"hubble,omitempty"`
+	Hubble *HubbleSpec `json:"hubble,omitempty"`
 
 	// RemoveCbrBridge is not implemented and may be removed in the future.
 	// Setting this has no effect.

diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -439,7 +439,7 @@ type CiliumNetworkingSpec struct {
 	// Default: false
 	EnableRemoteNodeIdentity *bool `json:"enableRemoteNodeIdentity,omitempty"`
 	// Hubble configures the Hubble service on the Cilium agent.
-	Hubble HubbleSpec `json:"hubble,omitempty"`
+	Hubble *HubbleSpec `json:"hubble,omitempty"`
 
 	// RemoveCbrBridge is not implemented and may be removed in the future.
 	// Setting this has no effect.

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go
@@ -709,7 +709,7 @@ func validateNetworkingCilium(cluster *kops.Cluster, v *kops.CiliumNetworkingSpe
 			allErrs = append(allErrs, field.Forbidden(versionFld, "Version 1.8 requires kubernetesVersion 1.12 or newer"))
 		}
 
-		if fi.BoolValue(v.Hubble.Enabled) {
+		if v.Hubble != nil && fi.BoolValue(v.Hubble.Enabled) {
 			if version.Minor < 8 {
 				allErrs = append(allErrs, field.Forbidden(fldPath.Root().Child("hubble", "enabled"), "Hubble requires Cilium 1.8 or newer"))
 			}

diff --git a/pkg/apis/kops/validation/validation_test.go b/pkg/apis/kops/validation/validation_test.go
@@ -630,7 +630,7 @@ func Test_Validate_Cilium(t *testing.T) {
 		{
 			Cilium: kops.CiliumNetworkingSpec{
 				Version: "v1.7.0",
-				Hubble: kops.HubbleSpec{
+				Hubble: &kops.HubbleSpec{
 					Enabled: fi.Bool(true),
 				},
 			},
@@ -639,7 +639,7 @@ func Test_Validate_Cilium(t *testing.T) {
 		{
 			Cilium: kops.CiliumNetworkingSpec{
 				Version: "v1.8.0",
-				Hubble: kops.HubbleSpec{
+				Hubble: &kops.HubbleSpec{
 					Enabled: fi.Bool(true),
 				},
 			},

diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/pkg/model/components/cilium.go b/pkg/model/components/cilium.go
@@ -96,6 +96,17 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
 		c.EnableRemoteNodeIdentity = fi.Bool(true)
 	}
 
+	hubble := c.Hubble
+	if hubble != nil {
+		if hubble.Enabled == nil {
+			hubble.Enabled = fi.Bool(true)
+		}
+	} else {
+		c.Hubble = &kops.HubbleSpec{
+			Enabled: fi.Bool(false),
+		}
+	}
+
 	return nil
 
 }
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template
@@ -166,7 +166,7 @@ data:
   {{ end }}
   {{ end }}
 
-  {{ if .Hubble.Enabled }}
+  {{ if WithDefaultBool .Hubble.Enabled false }}
   # Enable Hubble gRPC service.
   enable-hubble: "true"
   # UNIX domain socket for Hubble server to listen to.
@@ -835,7 +835,7 @@ spec:
       {{ end }}
 {{ end }}
 
-{{ if .Networking.Cilium.Hubble.Enabled }}
+{{ if WithDefaultBool .Networking.Cilium.Hubble.Enabled false }}
 ---
 # Source: cilium/charts/hubble-relay/templates/service.yaml
 kind: Service

diff --git a/upup/pkg/fi/cloudup/new_cluster_test.go b/upup/pkg/fi/cloudup/new_cluster_test.go
@@ -276,7 +276,6 @@ func TestSetupNetworking(t *testing.T) {
 					Networking: &api.NetworkingSpec{
 						Cilium: &api.CiliumNetworkingSpec{
 							EnableNodePort: true,
-							Hubble:         api.HubbleSpec{},
 						},
 					},
 				},
@@ -295,7 +294,6 @@ func TestSetupNetworking(t *testing.T) {
 						Cilium: &api.CiliumNetworkingSpec{
 							EnableNodePort: true,
 							EtcdManaged:    true,
-							Hubble:         api.HubbleSpec{},
 						},
 					},
 				},