Skip to content

Commit b792558

Browse files
tthvotthvo
committed
crd: clarify isIpv6 field on subnet spec
The field isIpv6 is set to true if and only if the subnet has an associated IPv6 CIDR. This means the VPC is also associated with an IPv6 CIDR.
1 parent 4bf9d24 commit b792558

7 files changed

+1363
-248
lines changed

‎api/v1beta1/network_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ type SubnetSpec struct {
259259
// +optional
260260
IsPublic bool `json:"isPublic"`
261261

262-
// IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
262+
// IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with an IPv6 CIDR.
263263
// +optional
264264
IsIPv6 bool `json:"isIpv6,omitempty"`
265265

‎api/v1beta2/network_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ type SubnetSpec struct {
596596
// +optional
597597
IsPublic bool `json:"isPublic"`
598598

599-
// IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
599+
// IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with an IPv6 CIDR.
600600
// +optional
601601
IsIPv6 bool `json:"isIpv6,omitempty"`
602602

‎config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,7 @@ spec:
603603
type: string
604604
isIpv6:
605605
description: IsIPv6 defines the subnet as an IPv6 subnet.
606-
A subnet is IPv6 when it is associated with a VPC that
607-
has IPv6 enabled.
606+
A subnet is IPv6 when it is associated with an IPv6 CIDR.
608607
type: boolean
609608
isPublic:
610609
description: IsPublic defines the subnet as a public subnet.
@@ -2840,8 +2839,7 @@ spec:
28402839
type: string
28412840
isIpv6:
28422841
description: IsIPv6 defines the subnet as an IPv6 subnet.
2843-
A subnet is IPv6 when it is associated with a VPC that
2844-
has IPv6 enabled.
2842+
A subnet is IPv6 when it is associated with an IPv6 CIDR.
28452843
type: boolean
28462844
isPublic:
28472845
description: IsPublic defines the subnet as a public subnet.

‎config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanetemplates.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ spec:
137137
description: |-
138138
AllowedCIDRBlocks is a list of CIDR blocks allowed to access the bastion host.
139139
They are set as ingress rules for the Bastion host's Security Group (defaults to 0.0.0.0/0).
140+
If the cluster has IPv6 enabled, defaults to ::/0 and 0.0.0.0/0.
140141
items:
141142
type: string
142143
type: array
@@ -620,12 +621,11 @@ spec:
620621
description: |-
621622
IPv6CidrBlock is the IPv6 CIDR block to be used when the provider creates a managed VPC.
622623
A subnet can have an IPv4 and an IPv6 address.
623-
IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
624624
type: string
625625
isIpv6:
626-
description: |-
627-
IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
628-
IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
626+
description: IsIPv6 defines the subnet as an IPv6
627+
subnet. A subnet is IPv6 when it is associated
628+
with an IPv6 CIDR.
629629
type: boolean
630630
isPublic:
631631
description: IsPublic defines the subnet as a public
@@ -807,9 +807,8 @@ spec:
807807
type: integer
808808
type: object
809809
ipv6:
810-
description: |-
811-
IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters.
812-
This field cannot be set on AWSCluster object.
810+
description: IPv6 contains ipv6 specific settings
811+
for the network.
813812
properties:
814813
cidrBlock:
815814
description: |-

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,7 @@ spec:
287287
type: string
288288
isIpv6:
289289
description: IsIPv6 defines the subnet as an IPv6 subnet.
290-
A subnet is IPv6 when it is associated with a VPC that
291-
has IPv6 enabled.
290+
A subnet is IPv6 when it is associated with an IPv6 CIDR.
292291
type: boolean
293292
isPublic:
294293
description: IsPublic defines the subnet as a public subnet.
@@ -1553,8 +1552,7 @@ spec:
15531552
type: string
15541553
isIpv6:
15551554
description: IsIPv6 defines the subnet as an IPv6 subnet.
1556-
A subnet is IPv6 when it is associated with a VPC that
1557-
has IPv6 enabled.
1555+
A subnet is IPv6 when it is associated with an IPv6 CIDR.
15581556
type: boolean
15591557
isPublic:
15601558
description: IsPublic defines the subnet as a public subnet.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ spec:
307307
isIpv6:
308308
description: IsIPv6 defines the subnet as an IPv6
309309
subnet. A subnet is IPv6 when it is associated
310-
with a VPC that has IPv6 enabled.
310+
with an IPv6 CIDR.
311311
type: boolean
312312
isPublic:
313313
description: IsPublic defines the subnet as a public
@@ -1137,7 +1137,7 @@ spec:
11371137
isIpv6:
11381138
description: IsIPv6 defines the subnet as an IPv6
11391139
subnet. A subnet is IPv6 when it is associated
1140-
with a VPC that has IPv6 enabled.
1140+
with an IPv6 CIDR.
11411141
type: boolean
11421142
isPublic:
11431143
description: IsPublic defines the subnet as a public

0 commit comments

Comments
 (0)