Force CRDs to have preserveUnknownFields: false
This commit is contained in:
		
							parent
							
								
									24602ff3ee
								
							
						
					
					
						commit
						1fafd0d139
					
				
							
								
								
									
										22
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										22
									
								
								Makefile
								
								
								
								
							|  | @ -86,8 +86,11 @@ deploy: manifests | ||||||
| # Generate manifests e.g. CRD, RBAC etc.
 | # Generate manifests e.g. CRD, RBAC etc.
 | ||||||
| manifests: manifests-gen-crds chart-crds | 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 | 	$(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: | chart-crds: | ||||||
| 	cp config/crd/bases/*.yaml charts/actions-runner-controller/crds/ | 	cp config/crd/bases/*.yaml charts/actions-runner-controller/crds/ | ||||||
|  | @ -227,6 +230,23 @@ else | ||||||
| CONTROLLER_GEN=$(shell which controller-gen) | CONTROLLER_GEN=$(shell which controller-gen) | ||||||
| endif | 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) | OS_NAME := $(shell uname -s | tr A-Z a-z) | ||||||
| 
 | 
 | ||||||
| # find or download etcd
 | # find or download etcd
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue