diff --git a/chart/openfaas/README.md b/chart/openfaas/README.md index 15d32ad9b..afe7d38e0 100644 --- a/chart/openfaas/README.md +++ b/chart/openfaas/README.md @@ -179,9 +179,9 @@ Additional OpenFaaS options in `values.yaml`. | `ingress.enabled` | Create ingress resources | `false` | | `rbac` | Enable RBAC | `true` | | `basic_auth` | Enable basic authentication on the Gateway | `false` | -| `faasnetesd.readTimeout` | Queue worker read timeout | `60s` | -| `faasnetesd.writeTimeout` | Queue worker write timeout | `60s` | -| `faasnetesd.imagePullPolicy` | Image pull policy for deployed functions | `Always` | +| `faasnetes.readTimeout` | Queue worker read timeout | `60s` | +| `faasnetes.writeTimeout` | Queue worker write timeout | `60s` | +| `faasnetes.imagePullPolicy` | Image pull policy for deployed functions | `Always` | | `gateway.replicas` | Replicas of the gateway, pick more than `1` for HA | `1` | | `gateway.readTimeout` | Queue worker read timeout | `65s` | | `gateway.writeTimeout` | Queue worker write timeout | `65s` | diff --git a/chart/openfaas/templates/gateway-dep.yaml b/chart/openfaas/templates/gateway-dep.yaml index b970c8bee..5d07eb386 100644 --- a/chart/openfaas/templates/gateway-dep.yaml +++ b/chart/openfaas/templates/gateway-dep.yaml @@ -113,43 +113,43 @@ spec: - name: function_namespace value: {{ $functionNs | quote }} - name: read_timeout - value: "{{ .Values.faasnetesd.readTimeout }}" + value: "{{ .Values.faasnetes.readTimeout }}" - name: write_timeout - value: "{{ .Values.faasnetesd.writeTimeout }}" + value: "{{ .Values.faasnetes.writeTimeout }}" - name: image_pull_policy - value: {{ .Values.faasnetesd.imagePullPolicy | quote }} + value: {{ .Values.faasnetes.imagePullPolicy | quote }} ports: - containerPort: 8081 protocol: TCP {{- else }} - name: faas-netes - image: {{ .Values.faasnetesd.image }} - imagePullPolicy: {{ .Values.faasnetesd.imagePullPolicy | quote }} + image: {{ .Values.faasnetes.image }} + imagePullPolicy: {{ .Values.faasnetes.imagePullPolicy | quote }} env: - name: port value: "8081" - name: function_namespace value: {{ $functionNs | quote }} - name: read_timeout - value: "{{ .Values.faasnetesd.readTimeout }}" + value: "{{ .Values.faasnetes.readTimeout }}" - name: write_timeout - value: "{{ .Values.faasnetesd.writeTimeout }}" + value: "{{ .Values.faasnetes.writeTimeout }}" - name: image_pull_policy - value: {{ .Values.faasnetesd.imagePullPolicy | quote }} + value: {{ .Values.faasnetes.imagePullPolicy | quote }} - name: http_probe - value: "{{ .Values.faasnetesd.httpProbe }}" + value: "{{ .Values.faasnetes.httpProbe }}" - name: readiness_probe_initial_delay_seconds - value: "{{ .Values.faasnetesd.readinessProbe.initialDelaySeconds }}" + value: "{{ .Values.faasnetes.readinessProbe.initialDelaySeconds }}" - name: readiness_probe_timeout_seconds - value: "{{ .Values.faasnetesd.readinessProbe.timeoutSeconds }}" + value: "{{ .Values.faasnetes.readinessProbe.timeoutSeconds }}" - name: readiness_probe_period_seconds - value: "{{ .Values.faasnetesd.readinessProbe.periodSeconds }}" + value: "{{ .Values.faasnetes.readinessProbe.periodSeconds }}" - name: liveness_probe_initial_delay_seconds - value: "{{ .Values.faasnetesd.livenessProbe.initialDelaySeconds }}" + value: "{{ .Values.faasnetes.livenessProbe.initialDelaySeconds }}" - name: liveness_probe_timeout_seconds - value: "{{ .Values.faasnetesd.livenessProbe.timeoutSeconds }}" + value: "{{ .Values.faasnetes.livenessProbe.timeoutSeconds }}" - name: liveness_probe_period_seconds - value: "{{ .Values.faasnetesd.livenessProbe.periodSeconds }}" + value: "{{ .Values.faasnetes.livenessProbe.periodSeconds }}" ports: - containerPort: 8081 protocol: TCP diff --git a/chart/openfaas/values.yaml b/chart/openfaas/values.yaml index ff183f7fb..faba5560f 100644 --- a/chart/openfaas/values.yaml +++ b/chart/openfaas/values.yaml @@ -8,7 +8,7 @@ rbac: true securityContext: true basic_auth: false -faasnetesd: +faasnetes: image: openfaas/faas-netes:0.7.0 readTimeout : "60s" writeTimeout : "60s"