Skip to content

Commit

Permalink
Merge pull request #51 from crossplane-contrib/backport-50-to-release…
Browse files Browse the repository at this point in the history
…-0.4

[Backport release-0.4] Fix CRD generation
  • Loading branch information
turkenh committed Jul 29, 2022
2 parents 5ab5a93 + 461f56f commit 6235db2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
2 changes: 2 additions & 0 deletions package/crds/kubernetes.crossplane.io_objects.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/kubernetes.crossplane.io_providerconfigs.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
Expand Down

0 comments on commit 6235db2

Please sign in to comment.