Profiles CRD toggle

Introduces a toggle for creating the Profiles CRD. This is
to help users overcome #686

Makes a breaking change where "createCRDs" controls whether
any CRDs are created. This is on by default. Existing users
must take note when upgrading.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>

chart/openfaas/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: OpenFaaS - Serverless Functions Made Simple
 name: openfaas
-version: 6.0.4
+version: 6.1.0
 sources:
 - https://github.com/openfaas/faas
 - https://github.com/openfaas/faas-netes

chart/openfaas/templates/function-crd.yaml

@@ -0,0 +1,107 @@
+{{- $functionNs := default .Release.Namespace .Values.functionNamespace }}
+{{- if .Values.operator.create }}
+{{- if .Values.createCRDs }}
+
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: functions.openfaas.com
+spec:
+  group: openfaas.com
+  names:
+    kind: Function
+    listKind: FunctionList
+    plural: functions
+    singular: function
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: Function describes an OpenFaaS function
+      type: object
+      required:
+      - spec
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: FunctionSpec is the spec for a Function resource
+          type: object
+          required:
+          - image
+          - name
+          properties:
+            annotations:
+              type: object
+              additionalProperties:
+                type: string
+            constraints:
+              type: array
+              items:
+                type: string
+            environment:
+              type: object
+              additionalProperties:
+                type: string
+            handler:
+              type: string
+            image:
+              type: string
+            labels:
+              type: object
+              additionalProperties:
+                type: string
+            limits:
+              description: FunctionResources is used to set CPU and memory limits
+                and requests
+              type: object
+              properties:
+                cpu:
+                  type: string
+                memory:
+                  type: string
+            name:
+              type: string
+            readOnlyRootFilesystem:
+              type: boolean
+            requests:
+              description: FunctionResources is used to set CPU and memory limits
+                and requests
+              type: object
+              properties:
+                cpu:
+                  type: string
+                memory:
+                  type: string
+            secrets:
+              type: array
+              items:
+                type: string
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
+
+
+---
+{{- end }}
+{{- end }}

chart/openfaas/templates/ingress-operator-crd.yaml

@@ -1,4 +1,6 @@
 {{- if .Values.ingressOperator.create }}
+{{- if .Values.createCRDs }}
+
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -83,4 +85,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: true
+
+---
+
+{{- end }}
 {{- end }}

chart/openfaas/templates/crd.yaml → chart/openfaas/templates/profile-crd.yaml

@@ -1,110 +1,4 @@
-{{- $functionNs := default .Release.Namespace .Values.functionNamespace }}
-{{- if .Values.operator.create }}
-{{- if .Values.operator.createCRD }}
-
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
-  creationTimestamp: null
-  name: functions.openfaas.com
-spec:
-  group: openfaas.com
-  names:
-    kind: Function
-    listKind: FunctionList
-    plural: functions
-    singular: function
-  scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: Function describes an OpenFaaS function
-      type: object
-      required:
-      - spec
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: FunctionSpec is the spec for a Function resource
-          type: object
-          required:
-          - image
-          - name
-          properties:
-            annotations:
-              type: object
-              additionalProperties:
-                type: string
-            constraints:
-              type: array
-              items:
-                type: string
-            environment:
-              type: object
-              additionalProperties:
-                type: string
-            handler:
-              type: string
-            image:
-              type: string
-            labels:
-              type: object
-              additionalProperties:
-                type: string
-            limits:
-              description: FunctionResources is used to set CPU and memory limits
-                and requests
-              type: object
-              properties:
-                cpu:
-                  type: string
-                memory:
-                  type: string
-            name:
-              type: string
-            readOnlyRootFilesystem:
-              type: boolean
-            requests:
-              description: FunctionResources is used to set CPU and memory limits
-                and requests
-              type: object
-              properties:
-                cpu:
-                  type: string
-                memory:
-                  type: string
-            secrets:
-              type: array
-              items:
-                type: string
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
-
-
----
-{{- end }}
-{{- end }}
+{{- if .Values.createCRDs }}
 
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -912,4 +806,6 @@ status:
   conditions: []
   storedVersions: []
 
+---
 
+{{- end }}

chart/openfaas/values-arm64.yaml

@@ -1,5 +1,8 @@
 basic_auth: true
 
+clusterRole: false
+createCRDs: true
+
 nodeSelector:
   beta.kubernetes.io/arch: arm64
 

chart/openfaas/values-armhf.yaml

@@ -1,5 +1,8 @@
 basic_auth: false
 
+clusterRole: false
+createCRDs: true
+
 nodeSelector:
   beta.kubernetes.io/arch: arm
 

chart/openfaas/values.yaml

@@ -7,6 +7,7 @@ serviceType: NodePort
 httpProbe: true               # Setting to true will use HTTP for readiness and liveness probe on the OpenFaaS system Pods (incompatible with Istio < 1.1.5)
 rbac: true
 clusterRole: false            # Set to true to have OpenFaaS administrate multiple namespaces
+createCRDs: true
 
 # create pod security policies for OpenFaaS control plane
 # https://kubernetes.io/docs/concepts/policy/pod-security-policy/