Skip to content

Move CRDs to config directory #1798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Move CRDs to config directory #1798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1efa41b
Move CRDs to config directory
lucacome Apr 2, 2024
bc61687
Merge branch 'main' into chore/config-crd
lucacome Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .yamllint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ yaml-files:

ignore:
- deploy/helm-chart/templates/
- deploy/helm-chart/crds/
- config/crd/bases/
- .github/workflows/

rules:
Expand All @@ -30,7 +30,6 @@ rules:
check-multi-line-strings: true
ignore: |
deploy/manifests/nginx-gateway.yaml
deploy/manifests/crds
key-duplicates: enable
key-ordering: disable
line-length:
Expand All @@ -40,7 +39,6 @@ rules:
ignore: |
.github/
deploy/manifests/nginx-gateway.yaml
deploy/manifests/crds
tests/suite/manifests/longevity/cronjob.yaml
.goreleaser.yml
new-line-at-end-of-file: enable
Expand Down
4 changes: 1 addition & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,10 @@ generate: ## Run go generate

.PHONY: generate-crds
generate-crds: ## Generate CRDs and Go types using kubebuilder
go run sigs.k8s.io/controller-tools/cmd/controller-gen crd paths=./apis/... output:crd:dir=deploy/helm-chart/crds
go run sigs.k8s.io/controller-tools/cmd/controller-gen object paths=./apis/...
go run sigs.k8s.io/controller-tools/cmd/controller-gen crd object paths=./apis/... output:crd:artifacts:config=config/crd/bases

.PHONY: generate-manifests
generate-manifests: ## Generate manifests using Helm.
cp $(CHART_DIR)/crds/* $(MANIFEST_DIR)/crds/
helm template nginx-gateway $(CHART_DIR) $(HELM_TEMPLATE_COMMON_ARGS) $(HELM_TEMPLATE_EXTRA_ARGS_FOR_ALL_MANIFESTS_FILE) -n nginx-gateway | cat $(strip $(MANIFEST_DIR))/namespace.yaml - > $(strip $(MANIFEST_DIR))/nginx-gateway.yaml
helm template nginx-gateway $(CHART_DIR) $(HELM_TEMPLATE_COMMON_ARGS) $(HELM_TEMPLATE_EXTRA_ARGS_FOR_ALL_MANIFESTS_FILE) --set nginx.plus=true --set nginx.image.repository=$(NGINX_PLUS_PREFIX) -n nginx-gateway | cat $(strip $(MANIFEST_DIR))/namespace.yaml - > $(strip $(MANIFEST_DIR))/nginx-plus-gateway.yaml
helm template nginx-gateway $(CHART_DIR) $(HELM_TEMPLATE_COMMON_ARGS) $(HELM_TEMPLATE_EXTRA_ARGS_FOR_ALL_MANIFESTS_FILE) --set nginxGateway.gwAPIExperimentalFeatures.enable=true -n nginx-gateway | cat $(strip $(MANIFEST_DIR))/namespace.yaml - > $(strip $(MANIFEST_DIR))/nginx-gateway-experimental.yaml
Expand Down
0 ...crds/gateway.nginx.org_nginxgateways.yaml → ...ases/gateway.nginx.org_nginxgateways.yaml
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions deploy/helm-chart/crds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../config/crd/bases
1 change: 1 addition & 0 deletions deploy/manifests/crds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../config/crd/bases
140 changes: 0 additions & 140 deletions deploy/manifests/crds/gateway.nginx.org_nginxgateways.yaml
View file
Open in desktop

This file was deleted.