Merge pull request #351 from madeddie/capa_update_fix

Update capa to v2.10.2

Author: Peefy

cluster-api-provider-aws/kcl.mod

@@ -1,7 +1,7 @@
 [package]
 name = "cluster-api-provider-aws"
 edition = "*"
-version = "v2.10.1"
+version = "v2.10.2"
 description = "KCL package for https://github.com/kubernetes-sigs/cluster-api-provider-aws CRDs"
 
 [dependencies]

cluster-api-provider-aws/v1beta1/controlplane_clusterx_k8s_io_v1beta1_a_w_s_managed_control_plane.k

@@ -242,6 +242,7 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneSpecBastion:
     allowedCIDRBlocks : [str], default is Undefined, optional
         AllowedCIDRBlocks is a list of CIDR blocks allowed to access the bastion host.
         They are set as ingress rules for the Bastion host's Security Group (defaults to 0.0.0.0/0).
+        If the cluster has IPv6 enabled, defaults to ::/0 and 0.0.0.0/0.
     ami : str, default is Undefined, optional
         AMI will use the specified AMI to boot the bastion. If not specified,
         the AMI will default to one picked out in public space.
@@ -672,10 +673,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneSpecNetworkSubnetsI
     ipv6CidrBlock : str, default is Undefined, optional
         IPv6CidrBlock is the IPv6 CIDR block to be used when the provider creates a managed VPC.
         A subnet can have an IPv4 and an IPv6 address.
-        IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
     isIpv6 : bool, default is Undefined, optional
-        IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
-        IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
+        IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with an IPv6 CIDR.
     isPublic : bool, default is Undefined, optional
         IsPublic defines the subnet as a public subnet. A subnet is public when it is associated with a route table that has a route to an internet gateway.
     natGatewayId : str, default is Undefined, optional
@@ -875,8 +874,7 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneSpecNetworkVpcElast
 
 schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneSpecNetworkVpcIPV6:
     r"""
-    IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters.
-    This field cannot be set on AWSCluster object.
+    IPv6 contains ipv6 specific settings for the network.
 
     Attributes
     ----------
@@ -918,6 +916,7 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneSpecNetworkVpcIPV6I
         The netmask length of the IPv4 CIDR you want to allocate to VPC from
         an Amazon VPC IP Address Manager (IPAM) pool.
         Defaults to /16 for IPv4 if not specified.
+        Defaults to /56 for IPv6 if not specified.
     """
 
 
@@ -943,6 +942,7 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneSpecNetworkVpcIpamP
         The netmask length of the IPv4 CIDR you want to allocate to VPC from
         an Amazon VPC IP Address Manager (IPAM) pool.
         Defaults to /16 for IPv4 if not specified.
+        Defaults to /56 for IPv6 if not specified.
     """
 
 
@@ -1066,9 +1066,9 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneSpecVpcCniEnvItems0
         Variable references $(VAR_NAME) are expanded
         using the previously defined environment variables in the container and
         any service environment variables. If a variable cannot be resolved,
-        the reference in the input string will be unchanged. Double $ are reduced
+        the reference in the input string will be unchanged. Double $$ are reduced
         to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
-        "$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+        "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
         Escaped references will never be expanded, regardless of whether the variable
         exists or not.
         Defaults to "".
@@ -1338,6 +1338,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastion:
     ----------
     addresses : [ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastionAddressesItems0], default is Undefined, optional
         Addresses contains the AWS instance associated addresses.
+    assignPrimaryIPv6 : str, default is Undefined, optional
+        AssignPrimaryIPv6 specifies whether to enable assigning a primary IPv6 address to the primary network Interface.
     availabilityZone : str, default is Undefined, optional
         Availability zone of instance
     capacityReservationId : str, default is Undefined, optional
@@ -1375,6 +1377,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastion:
         instance metadata options
     instanceState : str, default is Undefined, optional
         The current state of the instance.
+    ipv6Address : str, default is Undefined, optional
+        The IPv6 address assigned to the instance.
     marketType : str, default is Undefined, optional
         MarketType specifies the type of market for the EC2 instance. Valid values include:
         "OnDemand" (default): The instance runs as a standard OnDemand instance.
@@ -1428,6 +1432,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastion:
 
     addresses?: [ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastionAddressesItems0]
 
+    assignPrimaryIPv6?: str
+
     availabilityZone?: str
 
     capacityReservationId?: str
@@ -1456,6 +1462,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastion:
 
     instanceState?: str
 
+    ipv6Address?: str
+
     marketType?: "OnDemand" | "Spot" | "CapacityBlock"
 
     networkInterfaceType?: str
@@ -1578,6 +1586,11 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastionInstan
         If you specify a value of disabled, you cannot access your instance metadata.
 
         Default: enabled
+    httpProtocolIpv6 : str, default is "disabled", optional
+        Enables or disables the IPv6 endpoint for the instance metadata service.
+        This applies only if you enabled the HTTP metadata endpoint.
+
+        Default: disabled
     httpPutResponseHopLimit : int, default is 1, optional
         The desired HTTP PUT response hop limit for instance metadata requests. The
         larger the number, the further instance metadata requests can travel.
@@ -1610,6 +1623,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusBastionInstan
 
     httpEndpoint?: "enabled" | "disabled" = "enabled"
 
+    httpProtocolIpv6?: "enabled" | "disabled" = "disabled"
+
     httpPutResponseHopLimit?: int = 1
 
     httpTokens?: "optional" | "required" = "optional"
@@ -1888,6 +1903,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
         health checks
     listeners : [ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatusAPIServerElbListenersItems0], default is Undefined, optional
         ClassicELBListeners is an array of classic elb listeners associated with the load balancer. There must be at least one.
+    loadBalancerIPAddressType : str, default is Undefined, optional
+        LoadBalancerIPAddressType specifies the IP address type for the load balancer.
     loadBalancerType : str, default is Undefined, optional
         LoadBalancerType sets the type for a load balancer. The default type is classic.
     name : str, default is Undefined, optional
@@ -1920,6 +1937,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
 
     listeners?: [ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatusAPIServerElbListenersItems0]
 
+    loadBalancerIPAddressType?: "ipv4" | "dualstack" | "dualstack-without-public-ipv4"
+
     loadBalancerType?: "classic" | "elb" | "alb" | "nlb"
 
     name?: str
@@ -1981,6 +2000,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
 
     Attributes
     ----------
+    ipType : str, default is Undefined, optional
+        IPType is the IP address type for the target group.
     name : str, default is Undefined, required
         Name of the TargetGroup. Must be unique over the same group of listeners.
     port : int, default is Undefined, required
@@ -1994,6 +2015,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
     """
 
 
+    ipType?: str
+
     name: str
 
     port: int
@@ -2130,6 +2153,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
         health checks
     listeners : [ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatusSecondaryAPIServerELBListenersItems0], default is Undefined, optional
         ClassicELBListeners is an array of classic elb listeners associated with the load balancer. There must be at least one.
+    loadBalancerIPAddressType : str, default is Undefined, optional
+        LoadBalancerIPAddressType specifies the IP address type for the load balancer.
     loadBalancerType : str, default is Undefined, optional
         LoadBalancerType sets the type for a load balancer. The default type is classic.
     name : str, default is Undefined, optional
@@ -2162,6 +2187,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
 
     listeners?: [ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatusSecondaryAPIServerELBListenersItems0]
 
+    loadBalancerIPAddressType?: "ipv4" | "dualstack" | "dualstack-without-public-ipv4"
+
     loadBalancerType?: "classic" | "elb" | "alb" | "nlb"
 
     name?: str
@@ -2223,6 +2250,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
 
     Attributes
     ----------
+    ipType : str, default is Undefined, optional
+        IPType is the IP address type for the target group.
     name : str, default is Undefined, required
         Name of the TargetGroup. Must be unique over the same group of listeners.
     port : int, default is Undefined, required
@@ -2236,6 +2265,8 @@ schema ControlplaneClusterxK8sIoV1beta1AWSManagedControlPlaneStatusNetworkStatus
     """
 
 
+    ipType?: str
+
     name: str
 
     port: int

cluster-api-provider-aws/v1beta1/infrastructure_clusterx_k8s_io_v1beta1_a_w_s_cluster.k

@@ -327,10 +327,8 @@ schema InfrastructureClusterxK8sIoV1beta1AWSClusterSpecNetworkSubnetsItems0:
     ipv6CidrBlock : str, default is Undefined, optional
         IPv6CidrBlock is the IPv6 CIDR block to be used when the provider creates a managed VPC.
         A subnet can have an IPv4 and an IPv6 address.
-        IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
     isIpv6 : bool, default is Undefined, optional
-        IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
-        IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
+        IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with an IPv6 CIDR.
     isPublic : bool, default is Undefined, optional
         IsPublic defines the subnet as a public subnet. A subnet is public when it is associated with a route table that has a route to an internet gateway.
     natGatewayId : str, default is Undefined, optional
@@ -414,8 +412,7 @@ schema InfrastructureClusterxK8sIoV1beta1AWSClusterSpecNetworkVpc:
 
 schema InfrastructureClusterxK8sIoV1beta1AWSClusterSpecNetworkVpcIPV6:
     r"""
-    IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters.
-    This field cannot be set on AWSCluster object.
+    IPv6 contains ipv6 specific settings for the network.
 
     Attributes
     ----------

cluster-api-provider-aws/v1beta1/infrastructure_clusterx_k8s_io_v1beta1_a_w_s_cluster_template.k

@@ -380,10 +380,8 @@ schema InfrastructureClusterxK8sIoV1beta1AWSClusterTemplateSpecTemplateSpecNetwo
     ipv6CidrBlock : str, default is Undefined, optional
         IPv6CidrBlock is the IPv6 CIDR block to be used when the provider creates a managed VPC.
         A subnet can have an IPv4 and an IPv6 address.
-        IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
     isIpv6 : bool, default is Undefined, optional
-        IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
-        IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
+        IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with an IPv6 CIDR.
     isPublic : bool, default is Undefined, optional
         IsPublic defines the subnet as a public subnet. A subnet is public when it is associated with a route table that has a route to an internet gateway.
     natGatewayId : str, default is Undefined, optional
@@ -467,8 +465,7 @@ schema InfrastructureClusterxK8sIoV1beta1AWSClusterTemplateSpecTemplateSpecNetwo
 
 schema InfrastructureClusterxK8sIoV1beta1AWSClusterTemplateSpecTemplateSpecNetworkVpcIPV6:
     r"""
-    IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters.
-    This field cannot be set on AWSCluster object.
+    IPv6 contains ipv6 specific settings for the network.
 
     Attributes
     ----------

cluster-api-provider-aws/v1beta2/bootstrap_clusterx_k8s_io_v1beta2_e_k_s_config.k

@@ -9,6 +9,10 @@ schema EKSConfig:
     r"""
     EKSConfig is the schema for the Amazon EKS Machine Bootstrap Configuration API.
 
+    Deprecated: EKSConfig is deprecated and will be removed in a future release.
+    Amazon Linux 2 (AL2) reaches end-of-life in June 2026 see: https://aws.amazon.com/amazon-linux-2/faqs/
+    Please use NodeadmConfig with Amazon Linux 2023 (AL2023) instead.
+
     Attributes
     ----------
     apiVersion : str, default is "bootstrap.cluster.x-k8s.io/v1beta2", required