Skip to content

Commit

Permalink
Merge pull request #843 from tyrken/add-preserve-unknown-false-crds
Browse files Browse the repository at this point in the history
Add preserveUnknown=false to crds
  • Loading branch information
mumoshu authored Sep 24, 2021
2 parents 5e3f89b + 9f4f5ec commit 2e325fa
Show file tree
Hide file tree
Showing 11 changed files with 34,699 additions and 58,425 deletions.
22 changes: 21 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@ deploy: manifests
# Generate manifests e.g. CRD, RBAC etc.
manifests: manifests-gen-crds chart-crds

manifests-gen-crds: controller-gen
manifests-gen-crds: controller-gen yq
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
for YAMLFILE in config/crd/bases/actions*.yaml; do \
$(YQ) write --inplace "$$YAMLFILE" spec.preserveUnknownFields false; \
done

chart-crds:
cp config/crd/bases/*.yaml charts/actions-runner-controller/crds/
Expand Down Expand Up @@ -227,6 +230,23 @@ else
CONTROLLER_GEN=$(shell which controller-gen)
endif

# find or download yq
# download yq if necessary
# Use always go-version to get consistent line wraps etc.
yq:
ifeq (, $(wildcard $(GOBIN)/yq))
echo "Downloading yq"
@{ \
set -e ;\
YQ_TMP_DIR=$$(mktemp -d) ;\
cd $$YQ_TMP_DIR ;\
go mod init tmp ;\
go get github.com/mikefarah/yq/v3@3.4.0 ;\
rm -rf $$YQ_TMP_DIR ;\
}
endif
YQ=$(GOBIN)/yq

OS_NAME := $(shell uname -s | tr A-Z a-z)

# find or download etcd
Expand Down

Large diffs are not rendered by default.

12,022 changes: 4,434 additions & 7,588 deletions charts/actions-runner-controller/crds/actions.summerwind.dev_runnerdeployments.yaml

Large diffs are not rendered by default.

12,002 changes: 4,428 additions & 7,574 deletions charts/actions-runner-controller/crds/actions.summerwind.dev_runnerreplicasets.yaml

Large diffs are not rendered by default.

11,381 changes: 4,381 additions & 7,000 deletions charts/actions-runner-controller/crds/actions.summerwind.dev_runners.yaml

Large diffs are not rendered by default.

10,657 changes: 3,884 additions & 6,773 deletions charts/actions-runner-controller/crds/actions.summerwind.dev_runnersets.yaml

Large diffs are not rendered by default.

489 changes: 212 additions & 277 deletions config/crd/bases/actions.summerwind.dev_horizontalrunnerautoscalers.yaml

Large diffs are not rendered by default.

12,022 changes: 4,434 additions & 7,588 deletions config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml

Large diffs are not rendered by default.

12,002 changes: 4,428 additions & 7,574 deletions config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml

Large diffs are not rendered by default.

11,381 changes: 4,381 additions & 7,000 deletions config/crd/bases/actions.summerwind.dev_runners.yaml

Large diffs are not rendered by default.

10,657 changes: 3,884 additions & 6,773 deletions config/crd/bases/actions.summerwind.dev_runnersets.yaml

Large diffs are not rendered by default.

0 comments on commit 2e325fa

Please sign in to comment.