Skip to content

Commit 11f80d3

Browse files
bryan-coxclaude
bryan-cox
and
claude
committed
chore: bump NTO, CAPA, and add temporary replace directives for k8s 1.36 compat
- Bump cluster-node-tuning-operator to main branch (508d51a6f2bd) for controller-runtime v0.24 compatible webhook signatures - Bump cluster-api-provider-aws to v2.11.1 for controller-runtime v0.24 compat - Add replace directive for library-go pointing to jubittajohn/library-go rebase-1.36 branch (openshift/library-go#2171) for HasSyncedChecker interface - Add replace directive for kube-openapi to redirect NTO's fake v0.35.1 tag - Add lint exclusions for new controller-runtime v0.24 deprecation warnings (GetEventRecorderFor, client.Apply, ServiceInstanceID) - migration is a separate effort - Regenerate CRDs and vendor Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 8caf641 commit 11f80d3

403 files changed

Lines changed: 23114 additions & 69587 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,18 @@ linters:
8282
- linters:
8383
- staticcheck
8484
text: 'SA1019: "github.com/aws/aws-sdk-go'
85+
# GetEventRecorderFor is deprecated in controller-runtime v0.24 but migration to events.EventRecorder is a separate effort
86+
- linters:
87+
- staticcheck
88+
text: 'SA1019: mgr.GetEventRecorderFor is deprecated'
89+
# client.Apply is deprecated in controller-runtime v0.24 but migration to client.Client.Apply() is a separate effort
90+
- linters:
91+
- staticcheck
92+
text: 'SA1019: (.*)\.Apply is deprecated'
93+
# ibmCluster.Spec.ServiceInstanceID is deprecated but migration is a separate effort
94+
- linters:
95+
- staticcheck
96+
text: 'SA1019: ibmCluster.Spec.ServiceInstanceID is deprecated'
8597
# cluster-api v1beta1 is deprecated but migration to v1beta2 is a separate effort
8698
- linters:
8799
- staticcheck

‎cmd/install/assets/crds/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsclusters.yaml‎

Lines changed: 115 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,10 @@ spec:
281281
description: |-
282282
IPv6CidrBlock is the IPv6 CIDR block to be used when the provider creates a managed VPC.
283283
A subnet can have an IPv4 and an IPv6 address.
284-
IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
285284
type: string
286285
isIpv6:
287-
description: |-
288-
IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
289-
IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
286+
description: IsIPv6 defines the subnet as an IPv6 subnet.
287+
A subnet is IPv6 when it is associated with an IPv6 CIDR.
290288
type: boolean
291289
isPublic:
292290
description: IsPublic defines the subnet as a public subnet.
@@ -348,9 +346,8 @@ spec:
348346
associated with the VPC.
349347
type: string
350348
ipv6:
351-
description: |-
352-
IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters.
353-
This field cannot be set on AWSCluster object.
349+
description: IPv6 contains ipv6 specific settings for the
350+
network.
354351
properties:
355352
cidrBlock:
356353
description: CidrBlock is the CIDR block provided by Amazon
@@ -899,10 +896,14 @@ spec:
899896
name: Endpoint
900897
priority: 1
901898
type: string
902-
- description: Bastion IP address for breakglass access
899+
- description: Bastion IPv4 address for breakglass access
903900
jsonPath: .status.bastion.publicIp
904901
name: Bastion IP
905902
type: string
903+
- description: Bastion IPv6 address for breakglass access
904+
jsonPath: .status.bastion.ipv6Address
905+
name: Bastion IPv6
906+
type: string
906907
name: v1beta2
907908
schema:
908909
openAPIV3Schema:
@@ -944,6 +945,7 @@ spec:
944945
description: |-
945946
AllowedCIDRBlocks is a list of CIDR blocks allowed to access the bastion host.
946947
They are set as ingress rules for the Bastion host's Security Group (defaults to 0.0.0.0/0).
948+
If the cluster has IPv6 enabled, defaults to ::/0 and 0.0.0.0/0.
947949
items:
948950
type: string
949951
type: array
@@ -1065,6 +1067,16 @@ spec:
10651067
enum:
10661068
- TCP
10671069
type: string
1070+
targetGroupIPType:
1071+
description: |-
1072+
TargetGroupIPType sets the IP address type for the target group.
1073+
Valid values are ipv4 and ipv6. If not specified, defaults to ipv4 unless
1074+
the VPC has IPv6 enabled, in which case it defaults to ipv6.
1075+
This field cannot be set if LoadBalancerType is classic or disabled.
1076+
enum:
1077+
- ipv4
1078+
- ipv6
1079+
type: string
10681080
required:
10691081
- port
10701082
type: object
@@ -1261,6 +1273,17 @@ spec:
12611273
items:
12621274
type: string
12631275
type: array
1276+
targetGroupIPType:
1277+
description: |-
1278+
TargetGroupIPType sets the IP address type for the target group.
1279+
Valid values are ipv4 and ipv6. If not specified, defaults to ipv4 unless
1280+
the VPC has IPv6 enabled, in which case it defaults to ipv6.
1281+
This applies to the API server target group.
1282+
This field cannot be set if LoadBalancerType is classic or disabled.
1283+
enum:
1284+
- ipv4
1285+
- ipv6
1286+
type: string
12641287
type: object
12651288
identityRef:
12661289
description: |-
@@ -1540,12 +1563,10 @@ spec:
15401563
description: |-
15411564
IPv6CidrBlock is the IPv6 CIDR block to be used when the provider creates a managed VPC.
15421565
A subnet can have an IPv4 and an IPv6 address.
1543-
IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
15441566
type: string
15451567
isIpv6:
1546-
description: |-
1547-
IsIPv6 defines the subnet as an IPv6 subnet. A subnet is IPv6 when it is associated with a VPC that has IPv6 enabled.
1548-
IPv6 is only supported in managed clusters, this field cannot be set on AWSCluster object.
1568+
description: IsIPv6 defines the subnet as an IPv6 subnet.
1569+
A subnet is IPv6 when it is associated with an IPv6 CIDR.
15491570
type: boolean
15501571
isPublic:
15511572
description: IsPublic defines the subnet as a public subnet.
@@ -1722,13 +1743,13 @@ spec:
17221743
The netmask length of the IPv4 CIDR you want to allocate to VPC from
17231744
an Amazon VPC IP Address Manager (IPAM) pool.
17241745
Defaults to /16 for IPv4 if not specified.
1746+
Defaults to /56 for IPv6 if not specified.
17251747
format: int64
17261748
type: integer
17271749
type: object
17281750
ipv6:
1729-
description: |-
1730-
IPv6 contains ipv6 specific settings for the network. Supported only in managed clusters.
1731-
This field cannot be set on AWSCluster object.
1751+
description: IPv6 contains ipv6 specific settings for the
1752+
network.
17321753
properties:
17331754
cidrBlock:
17341755
description: |-
@@ -1758,6 +1779,7 @@ spec:
17581779
The netmask length of the IPv4 CIDR you want to allocate to VPC from
17591780
an Amazon VPC IP Address Manager (IPAM) pool.
17601781
Defaults to /16 for IPv4 if not specified.
1782+
Defaults to /56 for IPv6 if not specified.
17611783
format: int64
17621784
type: integer
17631785
type: object
@@ -1949,6 +1971,16 @@ spec:
19491971
enum:
19501972
- TCP
19511973
type: string
1974+
targetGroupIPType:
1975+
description: |-
1976+
TargetGroupIPType sets the IP address type for the target group.
1977+
Valid values are ipv4 and ipv6. If not specified, defaults to ipv4 unless
1978+
the VPC has IPv6 enabled, in which case it defaults to ipv6.
1979+
This field cannot be set if LoadBalancerType is classic or disabled.
1980+
enum:
1981+
- ipv4
1982+
- ipv6
1983+
type: string
19521984
required:
19531985
- port
19541986
type: object
@@ -2145,6 +2177,17 @@ spec:
21452177
items:
21462178
type: string
21472179
type: array
2180+
targetGroupIPType:
2181+
description: |-
2182+
TargetGroupIPType sets the IP address type for the target group.
2183+
Valid values are ipv4 and ipv6. If not specified, defaults to ipv4 unless
2184+
the VPC has IPv6 enabled, in which case it defaults to ipv6.
2185+
This applies to the API server target group.
2186+
This field cannot be set if LoadBalancerType is classic or disabled.
2187+
enum:
2188+
- ipv4
2189+
- ipv6
2190+
type: string
21482191
type: object
21492192
sshKeyName:
21502193
description: SSHKeyName is the name of the ssh key to attach to the
@@ -2184,6 +2227,10 @@ spec:
21842227
- type
21852228
type: object
21862229
type: array
2230+
assignPrimaryIPv6:
2231+
description: AssignPrimaryIPv6 specifies whether to enable assigning
2232+
a primary IPv6 address to the primary network Interface.
2233+
type: string
21872234
availabilityZone:
21882235
description: Availability zone of instance
21892236
type: string
@@ -2233,6 +2280,15 @@ spec:
22332280
- Disabled
22342281
- AMDEncryptedVirtualizationNestedPaging
22352282
type: string
2283+
nestedVirtualization:
2284+
description: |-
2285+
NestedVirtualization specifies whether to enable nested virtualization on the instance.
2286+
Nested virtualization is supported on C8i, M8i, and R8i instance types.
2287+
Valid values are: enabled, disabled
2288+
enum:
2289+
- enabled
2290+
- disabled
2291+
type: string
22362292
type: object
22372293
dynamicHostAllocation:
22382294
description: |-
@@ -2256,9 +2312,12 @@ spec:
22562312
hostAffinity:
22572313
description: |-
22582314
HostAffinity specifies the dedicated host affinity setting for the instance.
2259-
When hostAffinity is set to host, an instance started onto a specific host always restarts on the same host if stopped.
2260-
When hostAffinity is set to default, and you stop and restart the instance, it can be restarted on any available host.
2261-
When HostAffinity is defined, HostID is required.
2315+
When HostAffinity is set to "host", an instance started onto a specific host always restarts on the same host if stopped:
2316+
- If HostID is set, the instance launches on the specific host and must return to that same host after any stop/start (Targeted & Pinned).
2317+
- If HostID is not set, the instance gets launched on any available and must returns to the same host after any stop/start (Auto-placed & Pinned).
2318+
When HostAffinity is set to "default" (the default value), the instance (when restarted) can return on any available host:
2319+
- If HostID is set, the instance launches on the specified host now, but (when restarted) can return to any available hosts (Targeted & Flexible).
2320+
- If HostID is not set, the instance launches on any available host now, and (when restarted) can return to any available hosts (Auto-placed & Flexible).
22622321
enum:
22632322
- default
22642323
- host
@@ -2292,6 +2351,17 @@ spec:
22922351
- enabled
22932352
- disabled
22942353
type: string
2354+
httpProtocolIpv6:
2355+
default: disabled
2356+
description: |-
2357+
Enables or disables the IPv6 endpoint for the instance metadata service.
2358+
This applies only if you enabled the HTTP metadata endpoint.
2359+
2360+
Default: disabled
2361+
enum:
2362+
- enabled
2363+
- disabled
2364+
type: string
22952365
httpPutResponseHopLimit:
22962366
default: 1
22972367
description: |-
@@ -2341,6 +2411,9 @@ spec:
23412411
instanceState:
23422412
description: The current state of the instance.
23432413
type: string
2414+
ipv6Address:
2415+
description: The IPv6 address assigned to the instance.
2416+
type: string
23442417
marketType:
23452418
description: |-
23462419
MarketType specifies the type of market for the EC2 instance. Valid values include:
@@ -2669,6 +2742,10 @@ spec:
26692742
TargetGroupSpec specifies target group settings for a given listener.
26702743
This is created first, and the ARN is then passed to the listener.
26712744
properties:
2745+
ipType:
2746+
description: IPType is the IP address type for the
2747+
target group.
2748+
type: string
26722749
name:
26732750
description: Name of the TargetGroup. Must be unique
26742751
over the same group of listeners.
@@ -2788,6 +2865,14 @@ spec:
27882865
- protocol
27892866
type: object
27902867
type: array
2868+
loadBalancerIPAddressType:
2869+
description: LoadBalancerIPAddressType specifies the IP address
2870+
type for the load balancer.
2871+
enum:
2872+
- ipv4
2873+
- dualstack
2874+
- dualstack-without-public-ipv4
2875+
type: string
27912876
loadBalancerType:
27922877
description: LoadBalancerType sets the type for a load balancer.
27932878
The default type is classic.
@@ -2889,6 +2974,10 @@ spec:
28892974
TargetGroupSpec specifies target group settings for a given listener.
28902975
This is created first, and the ARN is then passed to the listener.
28912976
properties:
2977+
ipType:
2978+
description: IPType is the IP address type for the
2979+
target group.
2980+
type: string
28922981
name:
28932982
description: Name of the TargetGroup. Must be unique
28942983
over the same group of listeners.
@@ -3008,6 +3097,14 @@ spec:
30083097
- protocol
30093098
type: object
30103099
type: array
3100+
loadBalancerIPAddressType:
3101+
description: LoadBalancerIPAddressType specifies the IP address
3102+
type for the load balancer.
3103+
enum:
3104+
- ipv4
3105+
- dualstack
3106+
- dualstack-without-public-ipv4
3107+
type: string
30113108
loadBalancerType:
30123109
description: LoadBalancerType sets the type for a load balancer.
30133110
The default type is classic.

0 commit comments

Comments
 (0)