diff --git a/chart/openfaas/README.md b/chart/openfaas/README.md index 78ce362e0..d617d4070 100644 --- a/chart/openfaas/README.md +++ b/chart/openfaas/README.md @@ -456,6 +456,7 @@ yaml) | | `nodeSelector` | Global [NodeSelector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) | `{}` | | `openfaasImagePullPolicy` | Image pull policy for openfaas components, can change to `IfNotPresent` in offline env | `Always` | | `openfaasPro` | Deploy OpenFaaS Pro | `false` | +| `oem` | Deploy OpenFaaS oem | `false` | | `psp` | Enable [Pod Security Policy](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) for OpenFaaS accounts | `false` | | `rbac` | Enable RBAC | `true` | | `securityContext` | Deploy with a `securityContext` set, this can be disabled for use with Istio sidecar injection | `true` | @@ -490,6 +491,7 @@ yaml) | | `faasnetes.resources` | Resource limits and requests for faas-netes container | See [values.yaml](./values.yaml) | | `faasnetes.writeTimeout` | Write timeout for the faas-netes API | `""` (defaults to gateway.writeTimeout) | | `faasnetesPro.image` | Container image used for faas-netes when `openfaasPro=true` | See [values.yaml](./values.yaml) | +| `faasnetesOem.image` | Container image used for faas-netes when `oem=true` | See [values.yaml](./values.yaml) | | `faasnetesPro.logs.format` | Set the log format, supports `console` or `json` | `console` | | `faasnetesPro.logs.debug` | Print debug logs | `false` | | `operator.create` | Use the OpenFaaS operator CRD controller, default uses faas-netes as the Kubernetes controller | `false` | diff --git a/chart/openfaas/templates/gateway-dep.yaml b/chart/openfaas/templates/gateway-dep.yaml index d06e90104..eab1d1907 100644 --- a/chart/openfaas/templates/gateway-dep.yaml +++ b/chart/openfaas/templates/gateway-dep.yaml @@ -55,7 +55,7 @@ spec: secret: secretName: basic-auth {{- end }} - {{- if .Values.openfaasPro }} + {{- if or .Values.openfaasPro .Values.oem }} - name: license secret: secretName: openfaas-license @@ -353,6 +353,8 @@ spec: {{- .Values.faasnetes.resources | toYaml | nindent 12 }} {{- if .Values.openfaasPro }} image: {{ .Values.faasnetesPro.image }} + {{- else if .Values.oem }} + image: {{ .Values.faasnetesOem.image}} {{- else }} image: {{ .Values.faasnetes.image }} {{- end }} @@ -364,7 +366,7 @@ spec: {{- end }} command: - ./faas-netes - {{- if .Values.openfaasPro }} + {{- if or .Values.openfaasPro .Values.oem }} - "-license-file=/var/secrets/license/license" {{- end }} env: @@ -445,7 +447,7 @@ spec: readOnly: true mountPath: "/var/secrets/issuer-key" {{- end }} - {{- if .Values.openfaasPro }} + {{- if or .Values.openfaasPro .Values.oem }} - name: license readOnly: true mountPath: "/var/secrets/license" diff --git a/chart/openfaas/values.yaml b/chart/openfaas/values.yaml index 6572906ae..aa4ea1e9f 100644 --- a/chart/openfaas/values.yaml +++ b/chart/openfaas/values.yaml @@ -3,6 +3,9 @@ functionNamespace: openfaas-fn # Default namespace for functions # Contact us via https://www.openfaas.com/support to purchase a license openfaasPro: false +# Contact us via https://www.openfaas.com/support to purchase a license +oem: false + httpProbe: true # Setting to true will use HTTP for readiness and liveness probe on the OpenFaaS core components # set clusterRole: true for: @@ -176,6 +179,9 @@ faasnetesPro: debug: false format: "console" +faasnetesOem: + image: ghcr.io/openfaasltd/faas-netes-oem:0.1.0-rc1 + # For the Community Edition faasnetes: image: ghcr.io/openfaas/faas-netes:0.18.0