Move CRDs into templates

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
openfaas · May 10, 2024 · c53c341 · c53c341
1 parent 55c615e
commit c53c341
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 5 deletions.
diff --git a/chart/openfaas/README.md b/chart/openfaas/README.md
@@ -174,24 +174,24 @@ kubectl apply -f ./faas-netes/namespaces.yml
 kubectl apply -f ./faas-netes/artifacts/crds/
 ```
 
-Now, your application team can install OpenFaaS with a Role instead of a ClusterRole. They will also need to pass the `--skip-crds` flag to the helm command.
+Now, your application team can install OpenFaaS with a Role instead of a ClusterRole, along with the `skipCRDs` flag.
 
 *values-role.yaml*
 
 ```yaml
 clusterRole: false
+skipCRDs: true
 ```
 
-Next, your application team can update and upgrade OpenFaaS using the chart by adding `--skip-crds` to the `helm` command, along with `-f values-role.yaml`, for example:
+Next, your application team can update and upgrade OpenFaaS using the chart by adding `-f values-role.yaml` to the `helm upgrade` command.
 
 ```bash
 helm repo update \
  && helm upgrade openfaas \
   --install openfaas/openfaas \
   --namespace openfaas  \
   -f values-pro.yaml \
-  -f values-role.yaml \
-  --skip-crds
+  -f values-role.yaml
 ```
 
 ## Test changes for the helm chart

diff --git a/...aas/crds/iam.openfaas.com_jwtissuers.yaml → ...ates/iam.openfaas.com_jwtissuers-crd.yaml b/...aas/crds/iam.openfaas.com_jwtissuers.yaml → ...ates/iam.openfaas.com_jwtissuers-crd.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.createCRDs }}
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -75,3 +77,5 @@ spec:
       served: true
       storage: true
       subresources: {}
+
+{{- end }}
diff --git a/...nfaas/crds/iam.openfaas.com_policies.yaml → ...plates/iam.openfaas.com_policies-crd.yaml b/...nfaas/crds/iam.openfaas.com_policies.yaml → ...plates/iam.openfaas.com_policies-crd.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.createCRDs }}
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -96,3 +98,6 @@ spec:
       served: true
       storage: true
       subresources: {}
+
+
+{{- end }}
diff --git a/...openfaas/crds/iam.openfaas.com_roles.yaml → ...templates/iam.openfaas.com_roles-crd.yaml b/...openfaas/crds/iam.openfaas.com_roles.yaml → ...templates/iam.openfaas.com_roles-crd.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.createCRDs }}
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -92,3 +94,6 @@ spec:
       served: true
       storage: true
       subresources: {}
+
+
+{{- end }}
diff --git a/.../crds/openfaas.com_functioningresses.yaml → ...s/openfaas.com_functioningresses-crd.yaml b/.../crds/openfaas.com_functioningresses.yaml → ...s/openfaas.com_functioningresses-crd.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.createCRDs }}
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -124,3 +126,6 @@ spec:
       served: true
       storage: true
       subresources: {}
+
+
+{{- end }}
diff --git a/...openfaas/crds/openfaas.com_functions.yaml → ...templates/openfaas.com_functions-crd.yaml b/...openfaas/crds/openfaas.com_functions.yaml → ...templates/openfaas.com_functions-crd.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.createCRDs }}
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -196,3 +198,6 @@ spec:
       storage: true
       subresources:
         status: {}
+
+
+{{- end }}
diff --git a/.../openfaas/crds/openfaas.com_profiles.yaml → .../templates/openfaas.com_profiles-crd.yaml b/.../openfaas/crds/openfaas.com_profiles.yaml → .../templates/openfaas.com_profiles-crd.yaml
@@ -1,3 +1,5 @@
+{{- if .Values.createCRDs }}
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -1432,3 +1434,5 @@ spec:
                         type: string
       served: true
       storage: true
+
+{{- end }}
diff --git a/hack/update-crds.sh b/hack/update-crds.sh
@@ -15,4 +15,9 @@ fi
   paths=./pkg/apis/... \
   output:dir=./artifacts/crds
 
-echo "Run \"cp ./artifacts/crds/* ./chart/openfaas/crds/\" to sync with the chart"
+
+@for f in ./artifacts/crds/*.yaml; do \
+  echo "Annotating helm.sh/resource-policy: keep to: $$f"; \
+  kubectl annotate --overwrite -f $$f --local=true -o yaml helm.sh/resource-policy: keep 
+done
+