Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade CAPA to v2.3.0 but comment out CRD upgrade so existing clusters reconcile fine without having the newly-required subnet id field yet #192

Merged
merged 1 commit into from
Nov 30, 2023
+380 −33
Merged

Upgrade CAPA to v2.3.0 but comment out CRD upgrade so existing clusters reconcile fine without having the newly-required subnet id field yet #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletions ...plane/patches/versions/v1beta1/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,15 @@
type: string
type: array
protocol:
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6).
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6), "50" (ESP).
enum:
- "-1"
- "4"
- tcp
- udp
- icmp
- "58"
- "50"
type: string
sourceSecurityGroupIds:
description: The security group id to allow access from. Cannot be specified with CidrBlocks.
Expand Down Expand Up @@ -346,7 +347,7 @@
description: CidrBlock is the CIDR block to be used when the provider creates a managed VPC.
type: string
id:
description: ID defines a unique identifier to reference this resource.
description: "ID defines a unique identifier to reference this resource. If you're bringing your subnet, set the AWS subnet-id here, it must start with `subnet-`. \n When the VPC is managed by CAPA, and you'd like the provider to create a subnet for you, the id can be set to any placeholder value that does not start with `subnet-`; upon creation, the subnet AWS identifier will be populated in the `ResourceID` field and the `id` field is going to be used as the subnet name. If you specify a tag called `Name`, it takes precedence."
type: string
ipv6CidrBlock:
description: 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.
Expand All @@ -360,6 +361,9 @@
natGatewayId:
description: NatGatewayID is the NAT gateway id associated with the subnet. Ignored unless the subnet is managed by the provider, in which case this is set on the public subnet where the NAT gateway resides. It is then used to determine routes for private subnets in the same AZ as the public subnet.
type: string
resourceID:
description: ResourceID is the subnet identifier from AWS, READ ONLY. This field is populated when the provider manages the subnet.
type: string
routeTableId:
description: RouteTableID is the routing table id associated with the subnet.
type: string
Expand All @@ -368,8 +372,19 @@
type: string
description: Tags is a collection of tags describing the resource.
type: object
# While we migrate workload clusters to include the subnet `id` field (https://github.com/giantswarm/roadmap/issues/2870),
# this is commented out on purpose in the first step so that reconciliation continues working for old cluster-aws versions.
# ---
# required:
# - id
type: object
type: array
# While we migrate workload clusters to include the subnet `id` field (https://github.com/giantswarm/roadmap/issues/2870),
# this is commented out on purpose in the first step so that reconciliation continues working for old cluster-aws versions.
# ---
# x-kubernetes-list-map-keys:
# - id
# x-kubernetes-list-type: map
vpc:
description: VPC configuration.
properties:
Expand All @@ -386,25 +401,53 @@
minimum: 1
type: integer
cidrBlock:
description: CidrBlock is the CIDR block to be used when the provider creates a managed VPC. Defaults to 10.0.0.0/16.
description: CidrBlock is the CIDR block to be used when the provider creates a managed VPC. Defaults to 10.0.0.0/16. Mutually exclusive with IPAMPool.
type: string
id:
description: ID is the vpc-id of the VPC this provider should use to create resources.
type: string
internetGatewayId:
description: InternetGatewayID is the id of the internet gateway associated with the VPC.
type: string
ipamPool:
description: IPAMPool defines the IPAMv4 pool to be used for VPC. Mutually exclusive with CidrBlock.
properties:
id:
description: ID is the ID of the IPAM pool this provider should use to create VPC.
type: string
name:
description: Name is the name of the IPAM pool this provider should use to create VPC.
type: string
netmaskLength:
description: 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.
format: int64
type: integer
type: object
ipv6:
description: IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters. This field cannot be set on AWSCluster object.
properties:
cidrBlock:
description: CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6.
description: CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6. Mutually exclusive with IPAMPool.
type: string
egressOnlyInternetGatewayId:
description: EgressOnlyInternetGatewayID is the id of the egress only internet gateway associated with an IPv6 enabled VPC.
type: string
ipamPool:
description: IPAMPool defines the IPAMv6 pool to be used for VPC. Mutually exclusive with CidrBlock.
properties:
id:
description: ID is the ID of the IPAM pool this provider should use to create VPC.
type: string
name:
description: Name is the name of the IPAM pool this provider should use to create VPC.
type: string
netmaskLength:
description: 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.
format: int64
type: integer
type: object
poolId:
description: PoolID is the IP pool which must be defined in case of BYO IP is defined.
description: PoolID is the IP pool which must be defined in case of BYO IP is defined. Must be specified if CidrBlock is set. Mutually exclusive with IPAMPool.
type: string
type: object
tags:
Expand Down Expand Up @@ -1090,14 +1133,15 @@
type: string
type: array
protocol:
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6).
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6), "50" (ESP).
enum:
- "-1"
- "4"
- tcp
- udp
- icmp
- "58"
- "50"
type: string
sourceSecurityGroupIds:
description: The security group id to allow access from. Cannot be specified with CidrBlocks.
Expand Down
56 changes: 50 additions & 6 deletions ...plane/patches/versions/v1beta2/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,15 @@
type: string
type: array
protocol:
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6).
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6), "50" (ESP).
enum:
- "-1"
- "4"
- tcp
- udp
- icmp
- "58"
- "50"
type: string
sourceSecurityGroupIds:
description: The security group id to allow access from. Cannot be specified with CidrBlocks.
Expand Down Expand Up @@ -342,7 +343,7 @@
description: CidrBlock is the CIDR block to be used when the provider creates a managed VPC.
type: string
id:
description: ID defines a unique identifier to reference this resource.
description: "ID defines a unique identifier to reference this resource. If you're bringing your subnet, set the AWS subnet-id here, it must start with `subnet-`. \n When the VPC is managed by CAPA, and you'd like the provider to create a subnet for you, the id can be set to any placeholder value that does not start with `subnet-`; upon creation, the subnet AWS identifier will be populated in the `ResourceID` field and the `id` field is going to be used as the subnet name. If you specify a tag called `Name`, it takes precedence."
type: string
ipv6CidrBlock:
description: 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.
Expand All @@ -356,6 +357,9 @@
natGatewayId:
description: NatGatewayID is the NAT gateway id associated with the subnet. Ignored unless the subnet is managed by the provider, in which case this is set on the public subnet where the NAT gateway resides. It is then used to determine routes for private subnets in the same AZ as the public subnet.
type: string
resourceID:
description: ResourceID is the subnet identifier from AWS, READ ONLY. This field is populated when the provider manages the subnet.
type: string
routeTableId:
description: RouteTableID is the routing table id associated with the subnet.
type: string
Expand All @@ -364,8 +368,19 @@
type: string
description: Tags is a collection of tags describing the resource.
type: object
# While we migrate workload clusters to include the subnet `id` field (https://github.com/giantswarm/roadmap/issues/2870),
# this is commented out on purpose in the first step so that reconciliation continues working for old cluster-aws versions.
# ---
# required:
# - id
type: object
type: array
# While we migrate workload clusters to include the subnet `id` field (https://github.com/giantswarm/roadmap/issues/2870),
# this is commented out on purpose in the first step so that reconciliation continues working for old cluster-aws versions.
# ---
# x-kubernetes-list-map-keys:
# - id
# x-kubernetes-list-type: map
vpc:
description: VPC configuration.
properties:
Expand All @@ -382,25 +397,53 @@
minimum: 1
type: integer
cidrBlock:
description: CidrBlock is the CIDR block to be used when the provider creates a managed VPC. Defaults to 10.0.0.0/16.
description: CidrBlock is the CIDR block to be used when the provider creates a managed VPC. Defaults to 10.0.0.0/16. Mutually exclusive with IPAMPool.
type: string
id:
description: ID is the vpc-id of the VPC this provider should use to create resources.
type: string
internetGatewayId:
description: InternetGatewayID is the id of the internet gateway associated with the VPC.
type: string
ipamPool:
description: IPAMPool defines the IPAMv4 pool to be used for VPC. Mutually exclusive with CidrBlock.
properties:
id:
description: ID is the ID of the IPAM pool this provider should use to create VPC.
type: string
name:
description: Name is the name of the IPAM pool this provider should use to create VPC.
type: string
netmaskLength:
description: 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.
format: int64
type: integer
type: object
ipv6:
description: IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters. This field cannot be set on AWSCluster object.
properties:
cidrBlock:
description: CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6.
description: CidrBlock is the CIDR block provided by Amazon when VPC has enabled IPv6. Mutually exclusive with IPAMPool.
type: string
egressOnlyInternetGatewayId:
description: EgressOnlyInternetGatewayID is the id of the egress only internet gateway associated with an IPv6 enabled VPC.
type: string
ipamPool:
description: IPAMPool defines the IPAMv6 pool to be used for VPC. Mutually exclusive with CidrBlock.
properties:
id:
description: ID is the ID of the IPAM pool this provider should use to create VPC.
type: string
name:
description: Name is the name of the IPAM pool this provider should use to create VPC.
type: string
netmaskLength:
description: 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.
format: int64
type: integer
type: object
poolId:
description: PoolID is the IP pool which must be defined in case of BYO IP is defined.
description: PoolID is the IP pool which must be defined in case of BYO IP is defined. Must be specified if CidrBlock is set. Mutually exclusive with IPAMPool.
type: string
type: object
tags:
Expand Down Expand Up @@ -1093,14 +1136,15 @@
type: string
type: array
protocol:
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6).
description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6), "50" (ESP).
enum:
- "-1"
- "4"
- tcp
- udp
- icmp
- "58"
- "50"
type: string
sourceSecurityGroupIds:
description: The security group id to allow access from. Cannot be specified with CidrBlocks.
Expand Down
Loading
Loading