From acdc63293524070393bf37ff4e9f814a7e4481fc Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 19 Aug 2022 14:58:01 +0300 Subject: [PATCH] helm: rename "manifests" subdir to "crds" Rename the Helm subdir that contains CRD(s) to match the expected chart directory structure. --- .../{manifests => crds}/nodefeaturerule-crd.yaml | 0 .../node-feature-discovery/templates/nodefeaturerule-crd.yaml | 2 +- hack/generate.sh | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename deployment/helm/node-feature-discovery/{manifests => crds}/nodefeaturerule-crd.yaml (100%) diff --git a/deployment/helm/node-feature-discovery/manifests/nodefeaturerule-crd.yaml b/deployment/helm/node-feature-discovery/crds/nodefeaturerule-crd.yaml similarity index 100% rename from deployment/helm/node-feature-discovery/manifests/nodefeaturerule-crd.yaml rename to deployment/helm/node-feature-discovery/crds/nodefeaturerule-crd.yaml diff --git a/deployment/helm/node-feature-discovery/templates/nodefeaturerule-crd.yaml b/deployment/helm/node-feature-discovery/templates/nodefeaturerule-crd.yaml index f5d30850a..c02c633d8 100644 --- a/deployment/helm/node-feature-discovery/templates/nodefeaturerule-crd.yaml +++ b/deployment/helm/node-feature-discovery/templates/nodefeaturerule-crd.yaml @@ -1,3 +1,3 @@ {{- if .Values.nodeFeatureRule.createCRD }} -{{ .Files.Get "manifests/nodefeaturerule-crd.yaml" }} +{{ .Files.Get "crds/nodefeaturerule-crd.yaml" }} {{- end}} diff --git a/hack/generate.sh b/hack/generate.sh index e89e01f9c..9b3b5ca22 100755 --- a/hack/generate.sh +++ b/hack/generate.sh @@ -12,7 +12,8 @@ rm -rf vendor/ controller-gen object crd output:crd:stdout paths=./pkg/apis/... > deployment/base/nfd-crds/nodefeaturerule-crd.yaml -cp deployment/base/nfd-crds/nodefeaturerule-crd.yaml deployment/helm/node-feature-discovery/manifests/ +mkdir -p deployment/helm/node-feature-discovery/crds +cp deployment/base/nfd-crds/nodefeaturerule-crd.yaml deployment/helm/node-feature-discovery/crds/ rm -rf sigs.k8s.io