Refactor chart for faas-netes pro

* faas-netes pro is a new version of the original controller
in openfaas-ce, it comes with production settings and additional
functionality

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

chart/openfaas/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 type: application
 description: OpenFaaS - Serverless Functions Made Simple
 name: openfaas
-version: 10.0.8
+version: 10.0.9
 sources:
 - https://github.com/openfaas/faas
 - https://github.com/openfaas/faas-netes

chart/openfaas/templates/gateway-dep.yaml

@@ -36,6 +36,11 @@ spec:
         secret:
           secretName: basic-auth
       {{- end }}
+      {{- if .Values.openfaasPro }}
+      - name: license
+        secret:
+          secretName: openfaas-license
+      {{- end }}
       containers:
       - name: gateway
         resources:
@@ -144,12 +149,17 @@ spec:
           value: "{{ .Values.gateway.maxIdleConns }}"
         - name: max_idle_conns_per_host
           value: "{{ .Values.gateway.maxIdleConnsPerHost }}"
-        {{- if .Values.basic_auth }}
         volumeMounts:
+        {{- if .Values.basic_auth }}
         - name: auth
           readOnly: true
           mountPath: "/var/secrets"
         {{- end }}
+        {{- if .Values.openfaasPro }}
+        - name: license
+          readOnly: true
+          mountPath: "/var/secrets/license"
+        {{- end }}
         ports:
         - name: http
           containerPort: 8080
@@ -158,11 +168,18 @@ spec:
       - name: operator
         resources:
           {{- .Values.operator.resources | toYaml | nindent 12 }}
+      {{- if .Values.openfaasPro }}
+        image: {{ .Values.operatorPro.image }}
+      {{- else }}
         image: {{ .Values.operator.image }}
+      {{- end }}
         imagePullPolicy: {{ .Values.openfaasImagePullPolicy }}
         command:
           - ./faas-netes
           - -operator=true
+        {{- if .Values.openfaasPro }}
+          - "-license-file=/var/secrets/license/license"
+        {{- end }}
         env:
           - name: port
             value: "8081"
@@ -197,17 +214,34 @@ spec:
         ports:
         - containerPort: 8081
           protocol: TCP
+        {{- if .Values.openfaasPro }}
+        volumeMounts:
+        - name: license
+          readOnly: true
+          mountPath: "/var/secrets/license"
+        {{- end }}
+
       {{- else }}
       - name: faas-netes
         resources:
           {{- .Values.faasnetes.resources | toYaml | nindent 12 }}
+      {{- if .Values.openfaasPro }}
+        image: {{ .Values.faasnetesPro.image }}
+      {{- else }}
         image: {{ .Values.faasnetes.image }}
+      {{- end }}
         imagePullPolicy: {{ .Values.openfaasImagePullPolicy }}
         {{- if .Values.securityContext }}
         securityContext:
           readOnlyRootFilesystem: true
           runAsUser: 10001
         {{- end }}
+        command:
+          - ./faas-netes
+          - -operator=false
+        {{- if .Values.openfaasPro }}
+          - "-license-file=/var/secrets/license/license"
+        {{- end }}
         env:
         - name: port
           value: "8081"
@@ -240,6 +274,11 @@ spec:
         - name: cluster_role
           value: "{{ .Values.clusterRole }}"
         volumeMounts:
+        {{- if .Values.openfaasPro }}
+        - name: license
+          readOnly: true
+          mountPath: "/var/secrets/license"
+        {{- end }}
         - mountPath: /tmp
           name: faas-netes-temp-volume
         ports:

chart/openfaas/templates/queueworker-dep.yaml

@@ -28,7 +28,8 @@ spec:
         secret:
           secretName: basic-auth
       {{- end }}
-      {{- if .Values.queueWorkerPro.enabled }}
+
+      {{- if .Values.openfaasPro }}
       - name: license
         secret:
           secretName: openfaas-license
@@ -37,13 +38,13 @@ spec:
       - name:  queue-worker
         resources:
           {{- .Values.queueWorker.resources | toYaml | nindent 12 }}
-      {{- if .Values.queueWorkerPro.enabled }}
+        {{- if .Values.openfaasPro }}
         image: {{ .Values.queueWorkerPro.image }}
       {{- else }}
         image: {{ .Values.queueWorker.image }}
       {{- end }}
         imagePullPolicy: {{ .Values.openfaasImagePullPolicy }}
-        {{- if .Values.queueWorkerPro.enabled }}
+        {{- if .Values.openfaasPro }}
         command:
           - "/worker"
           - "-license-file=/var/secrets/license/license"
@@ -97,7 +98,7 @@ spec:
         - name: basic_auth
           value: "{{ .Values.basic_auth }}"
         volumeMounts:
-        {{- if .Values.queueWorkerPro.enabled }}
+        {{- if .Values.openfaasPro }}
         - name: license
           readOnly: true
           mountPath: "/var/secrets/license"

chart/openfaas/values.yaml

@@ -30,7 +30,9 @@ openfaasImagePullPolicy: "Always"
 # openfaasPro components, which require openfaasPro=true
 # clusterRole is also recommended for collecting CPU/RAM metrics for Pro add-ons
 
-# advanced scaling on concurrency and CPU
+# OpenFaaS Pro
+# Advanced auto-scaling on RPS, CPU and in-flight requests
+# Includes: scale to zero
 proScaler:
   image: alexellis2/openfaas-pro-scaler:0.1.3
   replicas: 1
@@ -41,20 +43,22 @@ proScaler:
     limits:
       memory: "256Mi"
 
-# Not required if using proScaler
-# scale-to-zero feature
+# OpenFaaS Pro
+# Original scale to zero feature
+# set "enabled=false" when using proScaler
 faasIdler:
   image: ghcr.io/openfaas/faas-idler-pro:0.4.4
   replicas: 1
   enabled: false
-  inactivityDuration: 3m               # If a function is inactive for 15 minutes, it may be scaled to zero
+  inactivityDuration: 3m                # If a function is inactive for 15 minutes, it may be scaled to zero
   reconcileInterval: 2m                 # The interval between each attempt to scale functions to zero
   readOnly: false                       # When set to true, no functions are scaled to zero
   writeDebug: false                     # Write additional debug information
   resources:
     requests:
       memory: "64Mi"
 
+# OpenFaaS Pro
 # OIDC plugin for authentication on the OpenFaaS REST API
 oidcAuthPlugin:
   enabled: false
@@ -105,6 +109,11 @@ basicAuthPlugin:
       memory: "50Mi"
       cpu: "20m"
 
+faasnetesPro:
+  image: ghcr.io/openfaasltd/faas-netes:0.1.0-rc3
+operatorPro:
+  image: ghcr.io/openfaasltd/faas-netes:0.1.0-rc3
+
 faasnetes:
   image: ghcr.io/openfaas/faas-netes:0.14.1
   readTimeout: "60s"
@@ -137,10 +146,11 @@ operator:
       memory: "120Mi"
       cpu: "50m"
 
-# Requires openfaas PRO subscription
+# OpenFaaS Pro
+# The values for queueWorkerPro are merged with those under
+# the "queueWorker" section
 queueWorkerPro:
   image: ghcr.io/openfaas/queue-worker-pro:0.1.0-rc5
-  enabled: false
   maxRetryAttempts: "10"
   maxRetryWait: "120s"
   initialRetryWait: "10s"