crd: add IPv6 of bastion host to cluster status

When creating a bastion host for an IPv6 cluster, the instance has both
public IPv4 and IPv6. Thus, we need to report them in the cluster status
if any.

This also adds an additional print column to display that bastion IPv6.

Author: tthvo

api/v1beta1/awscluster_conversion.go

@@ -63,6 +63,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Status.Bastion.NetworkInterfaceType = restored.Status.Bastion.NetworkInterfaceType
 		dst.Status.Bastion.CapacityReservationID = restored.Status.Bastion.CapacityReservationID
 		dst.Status.Bastion.MarketType = restored.Status.Bastion.MarketType
+		dst.Status.Bastion.IPv6Address = restored.Status.Bastion.IPv6Address
 	}
 	dst.Spec.Partition = restored.Spec.Partition
 

api/v1beta1/zz_generated.conversion.go

@@ -324,7 +324,8 @@ type S3Bucket struct {
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Cluster infrastructure is ready for EC2 instances"
 // +kubebuilder:printcolumn:name="VPC",type="string",JSONPath=".spec.network.vpc.id",description="AWS VPC the cluster is using"
 // +kubebuilder:printcolumn:name="Endpoint",type="string",JSONPath=".spec.controlPlaneEndpoint",description="API Endpoint",priority=1
-// +kubebuilder:printcolumn:name="Bastion IP",type="string",JSONPath=".status.bastion.publicIp",description="Bastion IP address for breakglass access"
+// +kubebuilder:printcolumn:name="Bastion IP",type="string",JSONPath=".status.bastion.publicIp",description="Bastion IPv4 address for breakglass access"
+// +kubebuilder:printcolumn:name="Bastion IPv6",type="string",JSONPath=".status.bastion.ipv6Address",description="Bastion IPv6 address for breakglass access"
 // +k8s:defaulter-gen=true
 
 // AWSCluster is the schema for Amazon EC2 based Kubernetes Cluster API.

api/v1beta2/awscluster_types.go

@@ -197,6 +197,9 @@ type Instance struct {
 	// The private IPv4 address assigned to the instance.
 	PrivateIP *string `json:"privateIp,omitempty"`
 
+	// The IPv6 address assigned to the instance.
+	IPv6Address *string `json:"ipv6Address,omitempty"`
+
 	// The public IPv4 address assigned to the instance, if applicable.
 	PublicIP *string `json:"publicIp,omitempty"`
 

api/v1beta2/types.go

@@ -1306,6 +1306,9 @@ spec:
                   instanceState:
                     description: The current state of the instance.
                     type: string
+                  ipv6Address:
+                    description: The IPv6 address assigned to the instance.
+                    type: string
                   marketType:
                     description: |-
                       MarketType specifies the type of market for the EC2 instance. Valid values include:
@@ -3497,6 +3500,9 @@ spec:
                   instanceState:
                     description: The current state of the instance.
                     type: string
+                  ipv6Address:
+                    description: The IPv6 address assigned to the instance.
+                    type: string
                   marketType:
                     description: |-
                       MarketType specifies the type of market for the EC2 instance. Valid values include:

api/v1beta2/zz_generated.deepcopy.go

@@ -901,10 +901,14 @@ spec:
       name: Endpoint
       priority: 1
       type: string
-    - description: Bastion IP address for breakglass access
+    - description: Bastion IPv4 address for breakglass access
       jsonPath: .status.bastion.publicIp
       name: Bastion IP
       type: string
+    - description: Bastion IPv6 address for breakglass access
+      jsonPath: .status.bastion.ipv6Address
+      name: Bastion IPv6
+      type: string
     name: v1beta2
     schema:
       openAPIV3Schema:
@@ -2288,6 +2292,9 @@ spec:
                   instanceState:
                     description: The current state of the instance.
                     type: string
+                  ipv6Address:
+                    description: The IPv6 address assigned to the instance.
+                    type: string
                   marketType:
                     description: |-
                       MarketType specifies the type of market for the EC2 instance. Valid values include:

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

@@ -891,6 +891,7 @@ func (s *Service) SDKToInstance(v types.Instance) (*infrav1.Instance, error) {
 		ImageID:      aws.ToString(v.ImageId),
 		SSHKeyName:   v.KeyName,
 		PrivateIP:    v.PrivateIpAddress,
+		IPv6Address:  v.Ipv6Address,
 		PublicIP:     v.PublicIpAddress,
 		ENASupport:   v.EnaSupport,
 		EBSOptimized: v.EbsOptimized,