Skip to content

Commit 8126f05

Browse files
committed
chore(make): drop generated crd manifest status
Remove the status field from generated CRD manifests. This allows the manifests to be used with server-side apply.
1 parent e368625 commit 8126f05

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

Makefile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif
1212
REPO = github.com/operator-framework/api
1313
BUILD_PATH = $(REPO)/cmd/operator-verify
1414
PKGS = $(shell go list ./... | grep -v /vendor/)
15-
YQ := $(Q) go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v2/
15+
YQ := go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v2/
1616

1717
.PHONY: help
1818
help: ## Show this help screen
@@ -61,14 +61,17 @@ manifests: controller-gen ## Generate manifests e.g. CRD, RBAC etc
6161
$(CONTROLLER_GEN) schemapatch:manifests=./crds output:dir=./crds paths=./pkg/operators/...
6262

6363
@# Add missing defaults in embedded core API schemas
64-
$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.containers.items.properties.ports.items.properties.protocol.default TCP
65-
$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.ports.items.properties.protocol.default TCP
64+
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.containers.items.properties.ports.items.properties.protocol.default TCP
65+
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.ports.items.properties.protocol.default TCP
6666

6767
@# Preserve fields for embedded metadata fields
68-
$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.metadata.x-kubernetes-preserve-unknown-fields true
68+
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.metadata.x-kubernetes-preserve-unknown-fields true
69+
70+
@# Remove status subresource from the CRD manifests to ensure server-side apply works
71+
$(Q)for f in ./crds/*.yaml ; do $(YQ) d --inplace $$f status; done
6972

7073
@# Update embedded CRD files.
71-
@go generate ./crds/...
74+
$(Q)go generate ./crds/...
7275

7376
# Static tests.
7477
.PHONY: test test-unit

0 commit comments

Comments
 (0)