From 4bfe587b58d52f8cbc37111c18bf06cff15eb064 Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Fri, 29 Jul 2022 10:56:18 +0300 Subject: [PATCH 1/2] Remove crds.clean target from Makefile Signed-off-by: Hasan Turken (cherry picked from commit 780ed0e26a2c17bb941fab5c19d19c20dc054885) --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 266375d2..5a92adf1 100644 --- a/Makefile +++ b/Makefile @@ -70,14 +70,6 @@ cobertura: grep -v zz_generated.deepcopy | \ $(GOCOVER_COBERTURA) > $(GO_TEST_OUTPUT)/cobertura-coverage.xml -crds.clean: - @$(INFO) cleaning generated CRDs - @find package/crds -name *.yaml -exec sed -i.sed -e '1,2d' {} \; || $(FAIL) - @find package/crds -name *.yaml.sed -delete || $(FAIL) - @$(OK) cleaned generated CRDs - -generate.done: crds.clean - # integration tests e2e.run: test-integration @@ -105,4 +97,4 @@ run: $(KUBECTL) generate manifests: @$(INFO) Deprecated. Run make generate instead. -.PHONY: cobertura submodules fallthrough test-integration run manifests crds.clean +.PHONY: cobertura submodules fallthrough test-integration run manifests From 461f56f2ab7cda0f59720c8f21651134ecad778f Mon Sep 17 00:00:00 2001 From: Hasan Turken Date: Fri, 29 Jul 2022 10:56:32 +0300 Subject: [PATCH 2/2] Regenerate CRDs Signed-off-by: Hasan Turken (cherry picked from commit 884a7869ca775d0a3bdf9778f85ad49b39af33e6) --- package/crds/kubernetes.crossplane.io_objects.yaml | 2 ++ package/crds/kubernetes.crossplane.io_providerconfigs.yaml | 2 ++ package/crds/kubernetes.crossplane.io_providerconfigusages.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/package/crds/kubernetes.crossplane.io_objects.yaml b/package/crds/kubernetes.crossplane.io_objects.yaml index cab5b527..842a9b4a 100644 --- a/package/crds/kubernetes.crossplane.io_objects.yaml +++ b/package/crds/kubernetes.crossplane.io_objects.yaml @@ -1,3 +1,5 @@ +--- +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: diff --git a/package/crds/kubernetes.crossplane.io_providerconfigs.yaml b/package/crds/kubernetes.crossplane.io_providerconfigs.yaml index 94ccce94..6675e51b 100644 --- a/package/crds/kubernetes.crossplane.io_providerconfigs.yaml +++ b/package/crds/kubernetes.crossplane.io_providerconfigs.yaml @@ -1,3 +1,5 @@ +--- +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: diff --git a/package/crds/kubernetes.crossplane.io_providerconfigusages.yaml b/package/crds/kubernetes.crossplane.io_providerconfigusages.yaml index f7035569..6b488dcb 100644 --- a/package/crds/kubernetes.crossplane.io_providerconfigusages.yaml +++ b/package/crds/kubernetes.crossplane.io_providerconfigusages.yaml @@ -1,3 +1,5 @@ +--- +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: