Merge pull request #126 from eromanova/capa-bump

Bump CAPA to 2.6.1 version
k0rdent · Aug 6, 2024 · 28457d0 · 28457d0
2 parents 7cc8f2f + 9a1b369
commit 28457d0
Show file tree

Hide file tree

Showing 19 changed files with 389 additions and 21 deletions.
diff --git a/templates/cluster-api-provider-aws/Chart.yaml b/templates/cluster-api-provider-aws/Chart.yaml
@@ -18,7 +18,7 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.0"
+appVersion: "2.6.1"
 annotations:
   hmc.mirantis.com/type: provider
   hmc.mirantis.com/infrastructure-providers: aws
diff --git a/templates/cluster-api-provider-aws/templates/crds/awscluster.yaml b/templates/cluster-api-provider-aws/templates/crds/awscluster.yaml
@@ -1182,6 +1182,10 @@ spec:
                           items:
                             type: string
                           type: array
+                        natGatewaysIPsSource:
+                          description: NatGatewaysIPsSource use the NAT gateways IPs
+                            as the source for the ingress rule.
+                          type: boolean
                         protocol:
                           description: Protocol is the protocol for the ingress rule.
                             Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp",
@@ -1347,6 +1351,10 @@ spec:
                           items:
                             type: string
                           type: array
+                        natGatewaysIPsSource:
+                          description: NatGatewaysIPsSource use the NAT gateways IPs
+                            as the source for the ingress rule.
+                          type: boolean
                         protocol:
                           description: Protocol is the protocol for the ingress rule.
                             Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp",
@@ -1581,6 +1589,39 @@ spec:
                           Defaults to 10.0.0.0/16.
                           Mutually exclusive with IPAMPool.
                         type: string
+                      elasticIpPool:
+                        description: |-
+                          ElasticIPPool contains specific configuration to allocate Public IPv4 address (Elastic IP) from user-defined pool
+                          brought to AWS for core infrastructure resources, like NAT Gateways and Public Network Load Balancers for
+                          the API Server.
+                        properties:
+                          publicIpv4Pool:
+                            description: |-
+                              PublicIpv4Pool sets a custom Public IPv4 Pool used to create Elastic IP address for resources
+                              created in public IPv4 subnets. Every IPv4 address, Elastic IP, will be allocated from the custom
+                              Public IPv4 pool that you brought to AWS, instead of Amazon-provided pool. The public IPv4 pool
+                              resource ID starts with 'ipv4pool-ec2'.
+                            maxLength: 30
+                            type: string
+                          publicIpv4PoolFallbackOrder:
+                            description: |-
+                              PublicIpv4PoolFallBackOrder defines the fallback action when the Public IPv4 Pool has been exhausted,
+                              no more IPv4 address available in the pool.
+  
+
+                              When set to 'amazon-pool', the controller check if the pool has available IPv4 address, when pool has reached the
+                              IPv4 limit, the address will be claimed from Amazon-pool (default).
+
+
+                              When set to 'none', the controller will fail the Elastic IP allocation when the publicIpv4Pool is exhausted.
+                            enum:
+                            - amazon-pool
+                            - none
+                            type: string
+                            x-kubernetes-validations:
+                            - message: allowed values are 'none' and 'amazon-pool'
+                              rule: self in ['none','amazon-pool']
+                        type: object
                       emptyRoutesDefaultVPCSecurityGroup:
                         description: |-
                           EmptyRoutesDefaultVPCSecurityGroup specifies whether the default VPC security group ingress
@@ -1675,6 +1716,18 @@ spec:
                         - ip-name
                         - resource-name
                         type: string
+                      subnetSchema:
+                        default: PreferPrivate
+                        description: |-
+                          SubnetSchema specifies how CidrBlock should be divided on subnets in the VPC depending on the number of AZs.
+                          PreferPrivate - one private subnet for each AZ plus one other subnet that will be further sub-divided for the public subnets.
+                          PreferPublic - have the reverse logic of PreferPrivate, one public subnet for each AZ plus one other subnet
+                          that will be further sub-divided for the private subnets.
+                          Defaults to PreferPrivate
+                        enum:
+                        - PreferPrivate
+                        - PreferPublic
+                        type: string
                       tags:
                         additionalProperties:
                           type: string
@@ -1927,6 +1980,10 @@ spec:
                           items:
                             type: string
                           type: array
+                        natGatewaysIPsSource:
+                          description: NatGatewaysIPsSource use the NAT gateways IPs
+                            as the source for the ingress rule.
+                          type: boolean
                         protocol:
                           description: Protocol is the protocol for the ingress rule.
                             Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp",
@@ -2047,6 +2104,10 @@ spec:
                   availabilityZone:
                     description: Availability zone of instance
                     type: string
+                  capacityReservationId:
+                    description: CapacityReservationID specifies the target Capacity
+                      Reservation into which the instance should be launched.
+                    type: string
                   ebsOptimized:
                     description: Indicates whether the instance is optimized for Amazon
                       EBS I/O.
@@ -2848,6 +2909,10 @@ spec:
                                 items:
                                   type: string
                                 type: array
+                              natGatewaysIPsSource:
+                                description: NatGatewaysIPsSource use the NAT gateways
+                                  IPs as the source for the ingress rule.
+                                type: boolean
                               protocol:
                                 description: Protocol is the protocol for the ingress
                                   rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp",
@@ -2927,4 +2992,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsclustercontrolleridentity.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclustercontrolleridentity.yaml
@@ -232,4 +232,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsclusterroleidentity.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclusterroleidentity.yaml
@@ -350,4 +350,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsclusterstaticidentity.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclusterstaticidentity.yaml
@@ -238,4 +238,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsclustertemplate.yaml b/templates/cluster-api-provider-aws/templates/crds/awsclustertemplate.yaml
@@ -776,6 +776,10 @@ spec:
                                   items:
                                     type: string
                                   type: array
+                                natGatewaysIPsSource:
+                                  description: NatGatewaysIPsSource use the NAT gateways
+                                    IPs as the source for the ingress rule.
+                                  type: boolean
                                 protocol:
                                   description: Protocol is the protocol for the ingress
                                     rule. Accepted values are "-1" (all), "4" (IP in
@@ -944,6 +948,10 @@ spec:
                                   items:
                                     type: string
                                   type: array
+                                natGatewaysIPsSource:
+                                  description: NatGatewaysIPsSource use the NAT gateways
+                                    IPs as the source for the ingress rule.
+                                  type: boolean
                                 protocol:
                                   description: Protocol is the protocol for the ingress
                                     rule. Accepted values are "-1" (all), "4" (IP in
@@ -1181,6 +1189,39 @@ spec:
                                   Defaults to 10.0.0.0/16.
                                   Mutually exclusive with IPAMPool.
                                 type: string
+                              elasticIpPool:
+                                description: |-
+                                  ElasticIPPool contains specific configuration to allocate Public IPv4 address (Elastic IP) from user-defined pool
+                                  brought to AWS for core infrastructure resources, like NAT Gateways and Public Network Load Balancers for
+                                  the API Server.
+                                properties:
+                                  publicIpv4Pool:
+                                    description: |-
+                                      PublicIpv4Pool sets a custom Public IPv4 Pool used to create Elastic IP address for resources
+                                      created in public IPv4 subnets. Every IPv4 address, Elastic IP, will be allocated from the custom
+                                      Public IPv4 pool that you brought to AWS, instead of Amazon-provided pool. The public IPv4 pool
+                                      resource ID starts with 'ipv4pool-ec2'.
+                                    maxLength: 30
+                                    type: string
+                                  publicIpv4PoolFallbackOrder:
+                                    description: |-
+                                      PublicIpv4PoolFallBackOrder defines the fallback action when the Public IPv4 Pool has been exhausted,
+                                      no more IPv4 address available in the pool.
+  
+
+                                      When set to 'amazon-pool', the controller check if the pool has available IPv4 address, when pool has reached the
+                                      IPv4 limit, the address will be claimed from Amazon-pool (default).
+
+
+                                      When set to 'none', the controller will fail the Elastic IP allocation when the publicIpv4Pool is exhausted.
+                                    enum:
+                                    - amazon-pool
+                                    - none
+                                    type: string
+                                    x-kubernetes-validations:
+                                    - message: allowed values are 'none' and 'amazon-pool'
+                                      rule: self in ['none','amazon-pool']
+                                type: object
                               emptyRoutesDefaultVPCSecurityGroup:
                                 description: |-
                                   EmptyRoutesDefaultVPCSecurityGroup specifies whether the default VPC security group ingress
@@ -1275,6 +1316,18 @@ spec:
                                 - ip-name
                                 - resource-name
                                 type: string
+                              subnetSchema:
+                                default: PreferPrivate
+                                description: |-
+                                  SubnetSchema specifies how CidrBlock should be divided on subnets in the VPC depending on the number of AZs.
+                                  PreferPrivate - one private subnet for each AZ plus one other subnet that will be further sub-divided for the public subnets.
+                                  PreferPublic - have the reverse logic of PreferPrivate, one public subnet for each AZ plus one other subnet
+                                  that will be further sub-divided for the private subnets.
+                                  Defaults to PreferPrivate
+                                enum:
+                                - PreferPrivate
+                                - PreferPublic
+                                type: string
                               tags:
                                 additionalProperties:
                                   type: string
@@ -1529,6 +1582,10 @@ spec:
                                   items:
                                     type: string
                                   type: array
+                                natGatewaysIPsSource:
+                                  description: NatGatewaysIPsSource use the NAT gateways
+                                    IPs as the source for the ingress rule.
+                                  type: boolean
                                 protocol:
                                   description: Protocol is the protocol for the ingress
                                     rule. Accepted values are "-1" (all), "4" (IP in
@@ -1640,4 +1697,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsfargateprofile.yaml b/templates/cluster-api-provider-aws/templates/crds/awsfargateprofile.yaml
@@ -409,4 +409,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsmachine.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmachine.yaml
@@ -640,6 +640,10 @@ spec:
                     description: ID of resource
                     type: string
                 type: object
+              capacityReservationId:
+                description: CapacityReservationID specifies the target Capacity Reservation
+                  into which the instance should be launched.
+                type: string
               cloudInit:
                 description: |-
                   CloudInit defines options related to the bootstrapping systems where
@@ -673,6 +677,37 @@ spec:
                     - ssm-parameter-store
                     type: string
                 type: object
+              elasticIpPool:
+                description: ElasticIPPool is the configuration to allocate Public IPv4
+                  address (Elastic IP/EIP) from user-defined pool.
+                properties:
+                  publicIpv4Pool:
+                    description: |-
+                      PublicIpv4Pool sets a custom Public IPv4 Pool used to create Elastic IP address for resources
+                      created in public IPv4 subnets. Every IPv4 address, Elastic IP, will be allocated from the custom
+                      Public IPv4 pool that you brought to AWS, instead of Amazon-provided pool. The public IPv4 pool
+                      resource ID starts with 'ipv4pool-ec2'.
+                    maxLength: 30
+                    type: string
+                  publicIpv4PoolFallbackOrder:
+                    description: |-
+                      PublicIpv4PoolFallBackOrder defines the fallback action when the Public IPv4 Pool has been exhausted,
+                      no more IPv4 address available in the pool.
+  
+
+                      When set to 'amazon-pool', the controller check if the pool has available IPv4 address, when pool has reached the
+                      IPv4 limit, the address will be claimed from Amazon-pool (default).
+
+
+                      When set to 'none', the controller will fail the Elastic IP allocation when the publicIpv4Pool is exhausted.
+                    enum:
+                    - amazon-pool
+                    - none
+                    type: string
+                    x-kubernetes-validations:
+                    - message: allowed values are 'none' and 'amazon-pool'
+                      rule: self in ['none','amazon-pool']
+                type: object
               iamInstanceProfile:
                 description: IAMInstanceProfile is a name of an IAM instance profile
                   to assign to the instance
@@ -1210,4 +1245,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsmachinepool.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmachinepool.yaml
@@ -1148,4 +1148,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsmachinetemplate.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmachinetemplate.yaml
@@ -574,6 +574,10 @@ spec:
                             description: ID of resource
                             type: string
                         type: object
+                      capacityReservationId:
+                        description: CapacityReservationID specifies the target Capacity
+                          Reservation into which the instance should be launched.
+                        type: string
                       cloudInit:
                         description: |-
                           CloudInit defines options related to the bootstrapping systems where
@@ -607,6 +611,37 @@ spec:
                             - ssm-parameter-store
                             type: string
                         type: object
+                      elasticIpPool:
+                        description: ElasticIPPool is the configuration to allocate
+                          Public IPv4 address (Elastic IP/EIP) from user-defined pool.
+                        properties:
+                          publicIpv4Pool:
+                            description: |-
+                              PublicIpv4Pool sets a custom Public IPv4 Pool used to create Elastic IP address for resources
+                              created in public IPv4 subnets. Every IPv4 address, Elastic IP, will be allocated from the custom
+                              Public IPv4 pool that you brought to AWS, instead of Amazon-provided pool. The public IPv4 pool
+                              resource ID starts with 'ipv4pool-ec2'.
+                            maxLength: 30
+                            type: string
+                          publicIpv4PoolFallbackOrder:
+                            description: |-
+                              PublicIpv4PoolFallBackOrder defines the fallback action when the Public IPv4 Pool has been exhausted,
+                              no more IPv4 address available in the pool.
+  
+
+                              When set to 'amazon-pool', the controller check if the pool has available IPv4 address, when pool has reached the
+                              IPv4 limit, the address will be claimed from Amazon-pool (default).
+
+
+                              When set to 'none', the controller will fail the Elastic IP allocation when the publicIpv4Pool is exhausted.
+                            enum:
+                            - amazon-pool
+                            - none
+                            type: string
+                            x-kubernetes-validations:
+                            - message: allowed values are 'none' and 'amazon-pool'
+                              rule: self in ['none','amazon-pool']
+                        type: object
                       iamInstanceProfile:
                         description: IAMInstanceProfile is a name of an IAM instance
                           profile to assign to the instance
@@ -1053,4 +1088,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/templates/cluster-api-provider-aws/templates/crds/awsmanagedcluster.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmanagedcluster.yaml
@@ -119,4 +119,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []