Remove support for legacy pro queue-worker

Signed-off-by: Han Verstraete (OpenFaaS Ltd) <[email protected]>

Author: welteki

chart/openfaas/README.md

@@ -597,7 +597,6 @@ See [values.yaml](./values.yaml) for detailed configuration.
 | `queueWorker.queueGroup` | The name of the queue group used to process asynchronous function invocations | `faas` |
 | `queueWorkerPro.backoff` | The backoff algorithm used for retries. Must be one off `exponential`, `full` or `equal`| `exponential` |
 | `queueWorkerPro.httpRetryCodes` | Comma-separated list of HTTP status codes the queue-worker should retry | `408,429,500,502,503,504` |
-| `queueWorkerPro.image` | Container image used for the Pro version of the queue-worker | See [values.yaml](./values.yaml) |
 | `queueWorkerPro.initialRetryWait` | Time to wait for the first retry | `10s` |
 | `queueWorkerPro.insecureTLS` | Enable insecure TLS for callback invocations | `false` |
 | `queueWorkerPro.maxRetryAttempts` | Amount of times to try sending a message to a function before discarding it | `10` |

chart/openfaas/templates/queueworker-dep.yaml

@@ -32,27 +32,12 @@ spec:
         secret:
           secretName: basic-auth
       {{- end }}
-
-      {{- if .Values.openfaasPro }}
-      - name: license
-        secret:
-          secretName: openfaas-license
-      {{- end }}
       containers:
       - name: queue-worker
         resources:
           {{- .Values.queueWorker.resources | toYaml | nindent 12 }}
-        {{- if .Values.openfaasPro }}
-        image: {{ include "openfaas.image" (dict "image" .Values.queueWorkerPro.image "registryPrefix" .Values.registryPrefix) }}
-      {{- else }}
         image: {{ include "openfaas.image" (dict "image" .Values.queueWorker.image "registryPrefix" .Values.registryPrefix) }}
-      {{- end }}
         imagePullPolicy: {{ .Values.openfaasImagePullPolicy }}
-        {{- if .Values.openfaasPro }}
-        command:
-          - "/worker"
-          - "-license-file=/var/secrets/license/license"
-        {{- end }}
         env:
         {{- if .Values.nats.external.enabled }}
         - name: faas_nats_address
@@ -78,38 +63,14 @@ spec:
         - name: ack_wait
           value: "{{ .Values.queueWorker.ackWait }}"
         - name: max_inflight
-          value: "{{ or (.Values.queueWorkerPro.maxInflight) (.Values.queueWorker.maxInflight ) ("1") }}"
-
-        # OpenFaaS PRO license required
-        - name: "max_retry_attempts"
-          value: "{{ .Values.queueWorkerPro.maxRetryAttempts }}"
-        - name: "max_retry_wait"
-          value: "{{ .Values.queueWorkerPro.maxRetryWait }}"
-        - name: "initial_retry_wait"
-          value: "{{ .Values.queueWorkerPro.initialRetryWait }}"
-        - name: "retry_http_codes"
-          value: "{{ .Values.queueWorkerPro.httpRetryCodes }}"
-        - name: print_request_body
-          value: "{{ .Values.queueWorkerPro.printRequestBody }}"
-        - name: print_response_body
-          value: "{{ .Values.queueWorkerPro.printResponseBody }}"
-        {{- if .Values.openfaasPro }}
-        - name: tls_insecure
-          value: "{{ .Values.queueWorkerPro.insecureTLS }}"
-        {{- end }}
+          value: "{{ (.Values.queueWorker.maxInflight ) ("1") }}"
 
         {{- if .Values.basic_auth }}
         - name: secret_mount_path
           value: "/var/secrets/gateway"
         - name: basic_auth
           value: "{{ .Values.basic_auth }}"
-
         volumeMounts:
-        {{- if .Values.openfaasPro }}
-        - name: license
-          readOnly: true
-          mountPath: "/var/secrets/license"
-        {{- end }}
         - name: auth
           readOnly: true
           mountPath: "/var/secrets/gateway"

chart/openfaas/values.yaml

@@ -253,7 +253,6 @@ jetstreamQueueWorker:
 #
 # Enabled automatically when openfaasPro is set to true
 queueWorkerPro:
-  image: ghcr.io/openfaasltd/queue-worker:0.4.0
   maxRetryAttempts: "10"
   maxRetryWait: "120s"
   initialRetryWait: "10s"