Merge pull request #8174 from mtulio/CORS-3214-wavelength-zones

CORS-3214: capi-aws - Wavelength Zones network provisioning
openshift · Apr 27, 2024 · 8470ede · 8470ede
2 parents cb05c07 + 3bb18a2
commit 8470ede
Show file tree

Hide file tree

Showing 22 changed files with 415 additions and 49 deletions.
diff --git a/cluster-api/providers/aws/go.mod b/cluster-api/providers/aws/go.mod
@@ -2,7 +2,7 @@ module openshift/installer/cluster-api/providers/aws
 
 go 1.21
 
-require sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240424180139-4c5b811deab4
+require sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240426161541-ac4958082eab
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1 // indirect

diff --git a/cluster-api/providers/aws/go.sum b/cluster-api/providers/aws/go.sum
@@ -491,8 +491,8 @@ sigs.k8s.io/aws-iam-authenticator v0.6.13 h1:QSQcAkpt/hF97Ogyoz6sj3WD2twTd2cmxFb
 sigs.k8s.io/aws-iam-authenticator v0.6.13/go.mod h1:CnvFyzR/xeLHmUY/BD0qW6q0wp6KIwXmFp4eTfrHdP8=
 sigs.k8s.io/cluster-api v1.7.0 h1:sWK6xs2MkCqPZhumsrti0OdKyGcu/c5aBz9XAWFIq5E=
 sigs.k8s.io/cluster-api v1.7.0/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
-sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240424180139-4c5b811deab4 h1:umGM3rug7fWtcP61OPDeUT6XVAQvqPOaW30EjoXwsTU=
-sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240424180139-4c5b811deab4/go.mod h1:Yk0azzVYeYIQX9z7HmSDMSY086gLjWjAEmCHD721eOo=
+sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240426161541-ac4958082eab h1:sTbr4ErndV0GgyK6NImGRCE4qRgf7RrkqQ67ZWxOtnI=
+sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240426161541-ac4958082eab/go.mod h1:Yk0azzVYeYIQX9z7HmSDMSY086gLjWjAEmCHD721eOo=
 sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
 sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

diff --git a/cluster-api/providers/aws/vendor/modules.txt b/cluster-api/providers/aws/vendor/modules.txt
@@ -1150,7 +1150,7 @@ sigs.k8s.io/cluster-api/util/predicates
 sigs.k8s.io/cluster-api/util/secret
 sigs.k8s.io/cluster-api/util/topology
 sigs.k8s.io/cluster-api/version
-# sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240424180139-4c5b811deab4
+# sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240426161541-ac4958082eab
 ## explicit; go 1.21
 sigs.k8s.io/cluster-api-provider-aws/v2
 sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1

diff --git a/...s/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1/awscluster_conversion.go b/...s/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1/awscluster_conversion.go
diff --git a/...aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1/zz_generated.conversion.go b/...aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1/zz_generated.conversion.go
diff --git a/...iders/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go b/...iders/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go
diff --git a/...providers/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go b/...providers/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go
diff --git a/...s/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go b/...s/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go
diff --git a/...roviders/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/awserrors/errors.go b/...roviders/aws/vendor/sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/awserrors/errors.go
diff --git a/...dor/sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/network/carriergateways.go b/...dor/sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/network/carriergateways.go