Merge pull request #1376 from barbacbd/enable_dual_stack

k8s-ci-robot · web-flow · commit f24b413d547b · 2024-12-16T11:54:51.000+01:00
Enable dual stack
diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go
@@ -240,6 +240,22 @@ type SubnetSpec struct {
 	// +kubebuilder:default=PRIVATE_RFC_1918
 	// +optional
 	Purpose *string `json:"purpose,omitempty"`
+
+	// StackType: The stack type for the subnet. If set to IPV4_ONLY, new VMs in
+	// the subnet are assigned IPv4 addresses only. If set to IPV4_IPV6, new VMs in
+	// the subnet can be assigned both IPv4 and IPv6 addresses. If not specified,
+	// IPV4_ONLY is used. This field can be both set at resource creation time and
+	// updated using patch.
+	//
+	// Possible values:
+	//   "IPV4_IPV6" - New VMs in this subnet can have both IPv4 and IPv6
+	// addresses.
+	//   "IPV4_ONLY" - New VMs in this subnet will only be assigned IPv4 addresses.
+	//   "IPV6_ONLY" - New VMs in this subnet will only be assigned IPv6 addresses.
+	// +kubebuilder:validation:Enum=IPV4_ONLY;IPV4_IPV6;IPV6_ONLY
+	// +kubebuilder:default=IPV4_ONLY
+	// +optional
+	StackType string `json:"stackType,omitempty"`
 }
 
 // String returns a string representation of the subnet.
diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -263,6 +263,7 @@ func (s *ClusterScope) SubnetSpecs() []*compute.Subnetwork {
 			Network:               s.NetworkLink(),
 			Purpose:               ptr.Deref(subnetwork.Purpose, "PRIVATE_RFC_1918"),
 			Role:                  "ACTIVE",
+			StackType:             subnetwork.StackType,
 		})
 	}
 
diff --git a/cloud/scope/managedcluster.go b/cloud/scope/managedcluster.go
@@ -247,6 +247,7 @@ func (s *ManagedClusterScope) SubnetSpecs() []*compute.Subnetwork {
 			Network:               s.NetworkLink(),
 			Purpose:               ptr.Deref(subnetwork.Purpose, "PRIVATE_RFC_1918"),
 			Role:                  "ACTIVE",
+			StackType:             subnetwork.StackType,
 		})
 	}
 
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclusters.yaml
@@ -248,6 +248,25 @@ spec:
                             SecondaryCidrBlocks defines secondary CIDR ranges,
                             from which secondary IP ranges of a VM may be allocated
                           type: object
+                        stackType:
+                          default: IPV4_ONLY
+                          description: |-
+                            StackType: The stack type for the subnet. If set to IPV4_ONLY, new VMs in
+                            the subnet are assigned IPv4 addresses only. If set to IPV4_IPV6, new VMs in
+                            the subnet can be assigned both IPv4 and IPv6 addresses. If not specified,
+                            IPV4_ONLY is used. This field can be both set at resource creation time and
+                            updated using patch.
+
+                            Possible values:
+                              "IPV4_IPV6" - New VMs in this subnet can have both IPv4 and IPv6
+                            addresses.
+                              "IPV4_ONLY" - New VMs in this subnet will only be assigned IPv4 addresses.
+                              "IPV6_ONLY" - New VMs in this subnet will only be assigned IPv6 addresses.
+                          enum:
+                          - IPV4_ONLY
+                          - IPV4_IPV6
+                          - IPV6_ONLY
+                          type: string
                       type: object
                     type: array
                 type: object
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpclustertemplates.yaml
@@ -265,6 +265,25 @@ spec:
                                     SecondaryCidrBlocks defines secondary CIDR ranges,
                                     from which secondary IP ranges of a VM may be allocated
                                   type: object
+                                stackType:
+                                  default: IPV4_ONLY
+                                  description: |-
+                                    StackType: The stack type for the subnet. If set to IPV4_ONLY, new VMs in
+                                    the subnet are assigned IPv4 addresses only. If set to IPV4_IPV6, new VMs in
+                                    the subnet can be assigned both IPv4 and IPv6 addresses. If not specified,
+                                    IPV4_ONLY is used. This field can be both set at resource creation time and
+                                    updated using patch.
+
+                                    Possible values:
+                                      "IPV4_IPV6" - New VMs in this subnet can have both IPv4 and IPv6
+                                    addresses.
+                                      "IPV4_ONLY" - New VMs in this subnet will only be assigned IPv4 addresses.
+                                      "IPV6_ONLY" - New VMs in this subnet will only be assigned IPv6 addresses.
+                                  enum:
+                                  - IPV4_ONLY
+                                  - IPV4_IPV6
+                                  - IPV6_ONLY
+                                  type: string
                               type: object
                             type: array
                         type: object
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedclusters.yaml
@@ -244,6 +244,25 @@ spec:
                             SecondaryCidrBlocks defines secondary CIDR ranges,
                             from which secondary IP ranges of a VM may be allocated
                           type: object
+                        stackType:
+                          default: IPV4_ONLY
+                          description: |-
+                            StackType: The stack type for the subnet. If set to IPV4_ONLY, new VMs in
+                            the subnet are assigned IPv4 addresses only. If set to IPV4_IPV6, new VMs in
+                            the subnet can be assigned both IPv4 and IPv6 addresses. If not specified,
+                            IPV4_ONLY is used. This field can be both set at resource creation time and
+                            updated using patch.
+
+                            Possible values:
+                              "IPV4_IPV6" - New VMs in this subnet can have both IPv4 and IPv6
+                            addresses.
+                              "IPV4_ONLY" - New VMs in this subnet will only be assigned IPv4 addresses.
+                              "IPV6_ONLY" - New VMs in this subnet will only be assigned IPv6 addresses.
+                          enum:
+                          - IPV4_ONLY
+                          - IPV4_IPV6
+                          - IPV6_ONLY
+                          type: string
                       type: object
                     type: array
                 type: object

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,7 @@ func (s ClusterScope) SubnetSpecs() []compute.Subnetwork {`
`263`	`263`	`Network: s.NetworkLink(),`
`264`	`264`	`Purpose: ptr.Deref(subnetwork.Purpose, "PRIVATE_RFC_1918"),`
`265`	`265`	`Role: "ACTIVE",`
	`266`	`+ StackType: subnetwork.StackType,`
`266`	`267`	`})`
`267`	`268`	`}`
`268`	`269`
Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,7 @@ func (s ManagedClusterScope) SubnetSpecs() []compute.Subnetwork {`
`247`	`247`	`Network: s.NetworkLink(),`
`248`	`248`	`Purpose: ptr.Deref(subnetwork.Purpose, "PRIVATE_RFC_1918"),`
`249`	`249`	`Role: "ACTIVE",`
	`250`	`+ StackType: subnetwork.StackType,`
`250`	`251`	`})`
`251`	`252`	`}`
`252`	`253`