Fix deployCrds template rewrite in generated CRD #832
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Fixed the auto-removal of deployCrds logic from CRD manifest by controller-gen, the manifest is wrapped with template after generation - Added extra helper messages to affected make targets and functions Signed-off-by: Timofey Ilinykh <[email protected]>
somaritane
requested review from
donovanmuller,
jkremser,
k0da,
kuritka and
ytsarev
as code owners
kuritka
approved these changes
Jan 19, 2022
ytsarev
reviewed
Jan 19, 2022
| @echo -e "\n$(YELLOW)Generating the CRD manifests$(NC)" | ||
| @echo -n "{{- if .Values.k8gb.deployCrds }}" > $(GSLB_CRD_YAML) | ||
| $(GOBIN)/controller-gen crd:crdVersions=v1 paths="./..." output:crd:stdout >> $(GSLB_CRD_YAML) | ||
| @echo "{{- end }}" >> $(GSLB_CRD_YAML) |
There was a problem hiding this comment.
looks like it will tamper the git status?
There was a problem hiding this comment.
@ytsarev not sure I'm following
There was a problem hiding this comment.
@somaritane i've meant from the PoV that it will affect git status after regeneration but it is actually valid in case of API changes. And if there are no API changes in the working tree the GSLB_CRD_YAML file will stay intact. So all good, approving
ytsarev
approved these changes
Jan 19, 2022
| @echo -e "\n$(YELLOW)Generating the CRD manifests$(NC)" | ||
| @echo -n "{{- if .Values.k8gb.deployCrds }}" > $(GSLB_CRD_YAML) | ||
| $(GOBIN)/controller-gen crd:crdVersions=v1 paths="./..." output:crd:stdout >> $(GSLB_CRD_YAML) | ||
| @echo "{{- end }}" >> $(GSLB_CRD_YAML) |
There was a problem hiding this comment.
@somaritane i've meant from the PoV that it will affect git status after regeneration but it is actually valid in case of API changes. And if there are no API changes in the working tree the GSLB_CRD_YAML file will stay intact. So all good, approving
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
controller-gen, the manifest is wrapped with template after generation
Signed-off-by: Timofey Ilinykh [email protected]