Merge pull request #421 from turkenh/add-ess-support

Add External Secret Support as an Alpha Feature
crossplane-contrib · Mar 22, 2022 · 95ff02f · 95ff02f
2 parents e6d0cc8 + 861dd46
commit 95ff02f
Show file tree

Hide file tree

Showing 83 changed files with 3,244 additions and 640 deletions.
diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ GO111MODULE = on
 # ====================================================================================
 # Setup Images
 
-DOCKER_REGISTRY = crossplane
+DOCKER_REGISTRY ?= crossplane
 IMAGES = provider-gcp provider-gcp-controller
 -include build/makelib/image.mk
 
@@ -77,13 +77,6 @@ cobertura:
 		$(GOCOVER_COBERTURA) > $(GO_TEST_OUTPUT)/cobertura-coverage.xml
 
 CRD_DIR=package/crds
-crds.clean:
-	@$(INFO) cleaning generated CRDs
-	@find $(CRD_DIR) -name *.yaml -exec sed -i.sed -e '1,2d' {} \; || $(FAIL)
-	@find $(CRD_DIR) -name *.yaml.sed -delete || $(FAIL)
-	@$(OK) cleaned generated CRDs
-
-generate.done: crds.clean
 
 # integration tests
 e2e.run: test-integration

diff --git a/apis/cache/v1beta1/zz_generated.managed.go b/apis/cache/v1beta1/zz_generated.managed.go
diff --git a/apis/compute/v1alpha1/zz_generated.managed.go b/apis/compute/v1alpha1/zz_generated.managed.go
diff --git a/apis/compute/v1beta1/zz_generated.managed.go b/apis/compute/v1beta1/zz_generated.managed.go
diff --git a/apis/container/v1beta1/zz_generated.managed.go b/apis/container/v1beta1/zz_generated.managed.go
diff --git a/apis/container/v1beta2/zz_generated.managed.go b/apis/container/v1beta2/zz_generated.managed.go
diff --git a/apis/database/v1beta1/zz_generated.managed.go b/apis/database/v1beta1/zz_generated.managed.go
diff --git a/apis/dns/v1alpha1/zz_generated.managed.go b/apis/dns/v1alpha1/zz_generated.managed.go
diff --git a/apis/gcp.go b/apis/gcp.go
@@ -34,13 +34,15 @@ import (
 	servicenetworkingv1beta1 "github.com/crossplane/provider-gcp/apis/servicenetworking/v1beta1"
 	storagev1alpha1 "github.com/crossplane/provider-gcp/apis/storage/v1alpha1"
 	storagev1alpha3 "github.com/crossplane/provider-gcp/apis/storage/v1alpha3"
+	gcpv1alpha1 "github.com/crossplane/provider-gcp/apis/v1alpha1"
 	gcpv1alpha3 "github.com/crossplane/provider-gcp/apis/v1alpha3"
 	gcpv1beta1 "github.com/crossplane/provider-gcp/apis/v1beta1"
 )
 
 func init() {
 	// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
 	AddToSchemes = append(AddToSchemes,
+		gcpv1alpha1.SchemeBuilder.AddToScheme,
 		gcpv1alpha3.SchemeBuilder.AddToScheme,
 		gcpv1beta1.SchemeBuilder.AddToScheme,
 		cachev1beta1.SchemeBuilder.AddToScheme,

diff --git a/apis/generate.go b/apis/generate.go
@@ -1,3 +1,4 @@
+//go:build generate
 // +build generate
 
 /*
@@ -23,7 +24,7 @@ limitations under the License.
 //go:generate rm -rf ../package/crds
 
 // Generate deepcopy methodsets and CRD manifests
-//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:trivialVersions=true,crdVersions=v1 output:artifacts:config=../package/crds
+//go:generate go run -tags generate sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile=../hack/boilerplate.go.txt paths=./... crd:crdVersions=v1 output:artifacts:config=../package/crds
 
 // Generate crossplane-runtime methodsets (resource.Managed, etc)
 //go:generate go run -tags generate github.com/crossplane/crossplane-tools/cmd/angryjet generate-methodsets --header-file=../hack/boilerplate.go.txt ./...

diff --git a/apis/iam/v1alpha1/zz_generated.managed.go b/apis/iam/v1alpha1/zz_generated.managed.go