CAPA/vendor: Wavelength Zones support

unti tests for zones. WIP managed CORS-2899: CAPA/edge-zones - Local Zones provisioner CORS-3214: CAPA/edge-zones - Wavelength implementation CAPA/vendor: Wavelength Zones support
openshift · Apr 12, 2024 · ef39343 · ef39343
1 parent 9c41630
commit ef39343
Show file tree

Hide file tree

Showing 23 changed files with 941 additions and 210 deletions.
diff --git a/cluster-api/providers/aws/go.mod b/cluster-api/providers/aws/go.mod
@@ -144,3 +144,6 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
+
+// Must use to CAPA branch mtulio:CORS-3214-wavelength-zones while upstream PR isn't merged: https://github.com/kubernetes-sigs/cluster-api-provider-aws/pull/4901
+replace sigs.k8s.io/cluster-api-provider-aws/v2 => github.com/mtulio/cluster-api-provider-aws/v2 v2.0.0-20240412024240-1c1bb9bae6bf
diff --git a/cluster-api/providers/aws/go.sum b/cluster-api/providers/aws/go.sum
@@ -245,6 +245,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mtulio/cluster-api-provider-aws/v2 v2.0.0-20240412024240-1c1bb9bae6bf h1:qhy5Ss9cK7TW6q4jRW1aj4p4c5ES7qyzXq5mIcWYm0Y=
+github.com/mtulio/cluster-api-provider-aws/v2 v2.0.0-20240412024240-1c1bb9bae6bf/go.mod h1:EzFu/v1hEeiBr9QTLVReimhIiCMVCY3FD8GnfSOTmjE=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -537,8 +539,6 @@ 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.6.1 h1:I34p/fwgRlEhs+o9cUhKXDwNNfPS3no0yJsd2bJyQVc=
 sigs.k8s.io/cluster-api v1.6.1/go.mod h1:DaxwruDvSaEYq5q6FREDaGzX6UsAVUCA99Sp8vfMHyQ=
-sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240408095607-ad71a542f8b4 h1:uDZsC7NfGJ6N23qbcgbSAz3TqdfGMDnI1j3z4oXQtZA=
-sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240408095607-ad71a542f8b4/go.mod h1:EzFu/v1hEeiBr9QTLVReimhIiCMVCY3FD8GnfSOTmjE=
 sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
 sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
 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
@@ -1418,7 +1418,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.20240408095607-ad71a542f8b4
+# sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240408095607-ad71a542f8b4 => github.com/mtulio/cluster-api-provider-aws/v2 v2.0.0-20240412024240-1c1bb9bae6bf
 ## explicit; go 1.21
 sigs.k8s.io/cluster-api-provider-aws/v2
 sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1
@@ -1572,3 +1572,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
+# sigs.k8s.io/cluster-api-provider-aws/v2 => github.com/mtulio/cluster-api-provider-aws/v2 v2.0.0-20240412024240-1c1bb9bae6bf
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