Add Cilium bool field to GCPNetworkingSpec

Also makes it so IP alias is always used when GCP is set

Author: Camila-B

cmd/kops/create_cluster.go

@@ -325,7 +325,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().StringVar(&options.EtcdStorageType, "etcd-storage-type", options.EtcdStorageType, "The default storage type for etcd members")
 	cmd.RegisterFlagCompletionFunc("etcd-storage-type", completeStorageType)
 
-	cmd.Flags().StringVar(&options.Networking, "networking", options.Networking, "Networking mode.  kubenet, external, flannel-vxlan (or flannel), flannel-udp, calico, kube-router, amazonvpc, cilium, cilium-etcd, kindnet, cni.")
+	cmd.Flags().StringVar(&options.Networking, "networking", options.Networking, "Networking mode.  kubenet, external, flannel-vxlan (or flannel), flannel-udp, calico, kube-router, amazonvpc, cilium, gcp-with-cilium, cilium-etcd, kindnet, cni.")
 	cmd.RegisterFlagCompletionFunc("networking", completeNetworking(options))
 
 	cmd.Flags().StringVar(&options.DNSZone, "dns-zone", options.DNSZone, "DNS hosted zone (defaults to longest matching zone)")
@@ -1016,7 +1016,7 @@ func completeNetworking(options *CreateClusterOptions) func(cmd *cobra.Command,
 			}
 
 			if options.CloudProvider == "gce" || options.CloudProvider == "" {
-				completions = append(completions, "gcp")
+				completions = append(completions, "gcp", "gcp-with-cilium")
 			}
 		}
 

cmd/kops/create_cluster_integration_test.go

@@ -81,6 +81,11 @@ func TestCreateClusterCilium(t *testing.T) {
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/cilium-eni", "v1alpha2")
 }
 
+// TestCreateClusterCiliumGCE runs kops with the cilium networking flags
+func TestCreateClusterCiliumGCE(t *testing.T) {
+	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/cilium-gce", "v1alpha2")
+}
+
 // TestCreateClusterOverride tests the override flag
 func TestCreateClusterOverride(t *testing.T) {
 	runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/overrides", "v1alpha2")

cmd/kops/integration_test.go

@@ -541,6 +541,15 @@ func TestMinimalIPv6Cilium(t *testing.T) {
 		runTestTerraformAWS(t)
 }
 
+func TestCiliumGCE(t *testing.T) {
+	newIntegrationTest("cilium-gce.example.com", "cilium-gce").
+		withAddons(
+			ciliumAddon,
+			dnsControllerAddon,
+			gcpCCMAddon).
+		runTestTerraformGCE(t)
+}
+
 // TestMinimalIPv6NoSubnetPrefix runs the test with "/64#N" subnet notation
 func TestMinimalIPv6NoSubnetPrefix(t *testing.T) {
 	newIntegrationTest("minimal-ipv6.example.com", "minimal-ipv6-no-subnet-prefix").

k8s/crds/kops.k8s.io_clusters.yaml

@@ -5948,6 +5948,10 @@ spec:
                   gce:
                     description: GCPNetworkingSpec is the specification of GCP's native
                       networking mode, using IP aliases.
+                    properties:
+                      cilium:
+                        description: Cilium enables Cilium on GCP.
+                        type: boolean
                     type: object
                   kindnet:
                     description: KindnetNetworkingSpec configures Kindnet settings.

pkg/apis/kops/cluster.go

@@ -955,7 +955,8 @@ func (c *Cluster) UsesNoneDNS() bool {
 func (c *Cluster) InstallCNIAssets() bool {
 	return c.Spec.Networking.AmazonVPC == nil &&
 		c.Spec.Networking.Calico == nil &&
-		c.Spec.Networking.Cilium == nil
+		c.Spec.Networking.Cilium == nil &&
+		!c.Spec.Networking.NetworkingIsGCPCilium()
 }
 
 func (c *Cluster) HasImageVolumesSupport() bool {

pkg/apis/kops/model/features.go

@@ -54,7 +54,7 @@ func UseKopsControllerForNodeConfig(cluster *kops.Cluster) bool {
 
 // UseCiliumEtcd is true if we are using the Cilium etcd cluster.
 func UseCiliumEtcd(cluster *kops.Cluster) bool {
-	if cluster.Spec.Networking.Cilium == nil {
+	if cluster.Spec.Networking.Cilium == nil && !cluster.Spec.Networking.NetworkingIsGCPCilium() {
 		return false
 	}
 

pkg/apis/kops/networking.go

@@ -103,10 +103,7 @@ func (n *NetworkingSpec) UsesKubenet() bool {
 	}
 	if n.Kubenet != nil {
 		return true
-	} else if n.GCP != nil {
-		// GCP IP Alias networking is based on kubenet
-		return true
-	} else if n.External != nil {
+	} else if n.External != nil { //TODO: Change behaviour with GCP
 		// external is based on kubenet
 		return true
 	} else if n.Kopeio != nil {
@@ -584,7 +581,10 @@ type LyftVPCNetworkingSpec struct {
 }
 
 // GCPNetworkingSpec is the specification of GCP's native networking mode, using IP aliases.
-type GCPNetworkingSpec struct{}
+type GCPNetworkingSpec struct {
+	// Cilium enables Cilium on GCP.
+	Cilium *bool `json:"cilium,omitempty"`
+}
 
 // KindnetNetworkingSpec configures Kindnet settings.
 type KindnetNetworkingSpec struct {
@@ -611,3 +611,16 @@ type KindnetMasqueradeSpec struct {
 	Enabled            *bool    `json:"enabled,omitempty"`
 	NonMasqueradeCIDRs []string `json:"nonMasqueradeCIDRs,omitempty"`
 }
+
+
+func (n *NetworkingSpec) NetworkingIsGCPCilium() bool {
+	return n.GCP != nil && ValueOf(n.GCP.Cilium)
+}
+
+// ValueOf returns the value of a pointer or its zero value
+func ValueOf[T any](v *T) T {
+	if v == nil {
+		return *new(T)
+	}
+	return *v
+}

pkg/apis/kops/v1alpha2/networking.go

@@ -701,7 +701,10 @@ type LyftVPCNetworkingSpec struct {
 }
 
 // GCPNetworkingSpec is the specification of GCP's native networking mode, using IP aliases.
-type GCPNetworkingSpec struct{}
+type GCPNetworkingSpec struct {
+	// Cilium enables Cilium on GCP.
+	Cilium *bool `json:"cilium,omitempty"`
+}
 
 // KindnetNetworkingSpec configures Kindnet settings.
 type KindnetNetworkingSpec struct {