Skip to content

Commit 54e81ef

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#8596 from r4f4/aws-ingress-rules-fix
OCPBUGS-35440: capi/aws: bump provider for ingress rules fix
2 parents 98d66ad + 55dd8b7 commit 54e81ef

File tree

15 files changed

+158
-31
lines changed

15 files changed

+158
-31
lines changed

‎cluster-api/providers/aws/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module openshift/installer/cluster-api/providers/aws
22

33
go 1.22
44

5-
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240613114012-888c6596e3a1
5+
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2-0.20240710112636-d375b7daa7fe
66

77
require (
88
github.com/NYTimes/gziphandler v1.1.1 // indirect

‎cluster-api/providers/aws/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,8 @@ sigs.k8s.io/aws-iam-authenticator v0.6.13 h1:QSQcAkpt/hF97Ogyoz6sj3WD2twTd2cmxFb
491491
sigs.k8s.io/aws-iam-authenticator v0.6.13/go.mod h1:CnvFyzR/xeLHmUY/BD0qW6q0wp6KIwXmFp4eTfrHdP8=
492492
sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=
493493
sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
494-
sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240613114012-888c6596e3a1 h1:Q6AjpSS4xKw1dhOoNGJh51EsQnRcVojmcOavTjZRTf0=
495-
sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240613114012-888c6596e3a1/go.mod h1:IiScIRlLiMZw8J9SrppViva89l5dYpqeMyAqI+49lIw=
494+
sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2-0.20240710112636-d375b7daa7fe h1:6vY2rh1IVZtv+juJmRwjBd56lttNnTAIp+m78xjkUTk=
495+
sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2-0.20240710112636-d375b7daa7fe/go.mod h1:IiScIRlLiMZw8J9SrppViva89l5dYpqeMyAqI+49lIw=
496496
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
497497
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
498498
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎cluster-api/providers/aws/vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ sigs.k8s.io/cluster-api/util/predicates
11521152
sigs.k8s.io/cluster-api/util/secret
11531153
sigs.k8s.io/cluster-api/util/topology
11541154
sigs.k8s.io/cluster-api/version
1155-
# sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240613114012-888c6596e3a1
1155+
# sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2-0.20240710112636-d375b7daa7fe
11561156
## explicit; go 1.21
11571157
sigs.k8s.io/cluster-api-provider-aws/v2
11581158
sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1

‎cluster-api/providers/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/OWNERS_ALIASES‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cluster-api/providers/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1/zz_generated.conversion.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cluster-api/providers/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awscluster_webhook.go‎

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cluster-api/providers/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cluster-api/providers/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/securitygroup/securitygroups.go‎

Lines changed: 71 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎data/data/cluster-api/aws-infrastructure-components.yaml‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1760,6 +1760,10 @@ spec:
17601760
items:
17611761
type: string
17621762
type: array
1763+
natGatewaysIPsSource:
1764+
description: NatGatewaysIPsSource use the NAT gateways IPs
1765+
as the source for the ingress rule.
1766+
type: boolean
17631767
protocol:
17641768
description: Protocol is the protocol for the ingress rule.
17651769
Accepted values are "-1" (all), "4" (IP in IP),"tcp",
@@ -1925,6 +1929,10 @@ spec:
19251929
items:
19261930
type: string
19271931
type: array
1932+
natGatewaysIPsSource:
1933+
description: NatGatewaysIPsSource use the NAT gateways IPs
1934+
as the source for the ingress rule.
1935+
type: boolean
19281936
protocol:
19291937
description: Protocol is the protocol for the ingress rule.
19301938
Accepted values are "-1" (all), "4" (IP in IP),"tcp",
@@ -2539,6 +2547,10 @@ spec:
25392547
items:
25402548
type: string
25412549
type: array
2550+
natGatewaysIPsSource:
2551+
description: NatGatewaysIPsSource use the NAT gateways IPs
2552+
as the source for the ingress rule.
2553+
type: boolean
25422554
protocol:
25432555
description: Protocol is the protocol for the ingress rule.
25442556
Accepted values are "-1" (all), "4" (IP in IP),"tcp",
@@ -3462,6 +3474,10 @@ spec:
34623474
items:
34633475
type: string
34643476
type: array
3477+
natGatewaysIPsSource:
3478+
description: NatGatewaysIPsSource use the NAT gateways
3479+
IPs as the source for the ingress rule.
3480+
type: boolean
34653481
protocol:
34663482
description: Protocol is the protocol for the ingress
34673483
rule. Accepted values are "-1" (all), "4" (IP in
@@ -4547,6 +4563,10 @@ spec:
45474563
items:
45484564
type: string
45494565
type: array
4566+
natGatewaysIPsSource:
4567+
description: NatGatewaysIPsSource use the NAT gateways
4568+
IPs as the source for the ingress rule.
4569+
type: boolean
45504570
protocol:
45514571
description: Protocol is the protocol for the ingress
45524572
rule. Accepted values are "-1" (all), "4" (IP
@@ -4716,6 +4736,10 @@ spec:
47164736
items:
47174737
type: string
47184738
type: array
4739+
natGatewaysIPsSource:
4740+
description: NatGatewaysIPsSource use the NAT gateways
4741+
IPs as the source for the ingress rule.
4742+
type: boolean
47194743
protocol:
47204744
description: Protocol is the protocol for the ingress
47214745
rule. Accepted values are "-1" (all), "4" (IP
@@ -5335,6 +5359,10 @@ spec:
53355359
items:
53365360
type: string
53375361
type: array
5362+
natGatewaysIPsSource:
5363+
description: NatGatewaysIPsSource use the NAT gateways
5364+
IPs as the source for the ingress rule.
5365+
type: boolean
53385366
protocol:
53395367
description: Protocol is the protocol for the ingress
53405368
rule. Accepted values are "-1" (all), "4" (IP
@@ -9841,6 +9869,10 @@ spec:
98419869
items:
98429870
type: string
98439871
type: array
9872+
natGatewaysIPsSource:
9873+
description: NatGatewaysIPsSource use the NAT gateways IPs
9874+
as the source for the ingress rule.
9875+
type: boolean
98449876
protocol:
98459877
description: Protocol is the protocol for the ingress rule.
98469878
Accepted values are "-1" (all), "4" (IP in IP),"tcp",
@@ -11368,6 +11400,10 @@ spec:
1136811400
items:
1136911401
type: string
1137011402
type: array
11403+
natGatewaysIPsSource:
11404+
description: NatGatewaysIPsSource use the NAT gateways
11405+
IPs as the source for the ingress rule.
11406+
type: boolean
1137111407
protocol:
1137211408
description: Protocol is the protocol for the ingress
1137311409
rule. Accepted values are "-1" (all), "4" (IP in
@@ -11824,6 +11860,10 @@ spec:
1182411860
items:
1182511861
type: string
1182611862
type: array
11863+
natGatewaysIPsSource:
11864+
description: NatGatewaysIPsSource use the NAT gateways IPs
11865+
as the source for the ingress rule.
11866+
type: boolean
1182711867
protocol:
1182811868
description: Protocol is the protocol for the ingress rule.
1182911869
Accepted values are "-1" (all), "4" (IP in IP),"tcp",
@@ -13364,6 +13404,10 @@ spec:
1336413404
items:
1336513405
type: string
1336613406
type: array
13407+
natGatewaysIPsSource:
13408+
description: NatGatewaysIPsSource use the NAT gateways
13409+
IPs as the source for the ingress rule.
13410+
type: boolean
1336713411
protocol:
1336813412
description: Protocol is the protocol for the ingress
1336913413
rule. Accepted values are "-1" (all), "4" (IP in
@@ -17470,7 +17514,7 @@ spec:
1747017514
env:
1747117515
- name: AWS_SHARED_CREDENTIALS_FILE
1747217516
value: /home/.aws/credentials
17473-
image: gcr.io/k8s-staging-cluster-api-aws/cluster-api-aws-controller:v2.4.1
17517+
image: gcr.io/k8s-staging-cluster-api-aws/cluster-api-aws-controller:v2.5.1
1747417518
imagePullPolicy: IfNotPresent
1747517519
livenessProbe:
1747617520
failureThreshold: 3

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ require (
120120
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
121121
libvirt.org/go/libvirtxml v1.10002.0
122122
sigs.k8s.io/cluster-api v1.7.3
123-
sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240613114012-888c6596e3a1
123+
sigs.k8s.io/cluster-api-provider-aws/v2 v2.5.2-0.20240710112636-d375b7daa7fe
124124
sigs.k8s.io/cluster-api-provider-azure v1.15.1-0.20240617212811-a52056dfb88c
125125
sigs.k8s.io/cluster-api-provider-gcp v1.7.0
126126
sigs.k8s.io/cluster-api-provider-ibmcloud v0.7.0

0 commit comments

Comments
 (0)