Merge 23c0cecc57 into e98a7734cb

http-add-on/README.md

@@ -86,6 +86,9 @@ their default values.
 |-----------|------|---------|-------------|
 | `additionalLabels` | object | `{}` | Additional labels to be applied to installed resources. Note that not all resources will receive these labels. |
 | `crds.install` | bool | `true` | Whether to install the `HTTPScaledObject` [`CustomResourceDefinition`](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) |
+| `extraEnvs.interceptor` | object | `{}` | Additional ENV vars to be applied to the interceptor container |
+| `extraEnvs.operator` | object | `{}` | Additional ENV vars to be applied to the operator container |
+| `extraEnvs.scaler` | object | `{}` | Additional ENV vars to be applied to the operator container |
 | `images.interceptor` | string | `"ghcr.io/kedacore/http-add-on-interceptor"` | Image name for the interceptor image component |
 | `images.kubeRbacProxy.name` | string | `"gcr.io/kubebuilder/kube-rbac-proxy"` | Image name for the Kube RBAC Proxy image component |
 | `images.kubeRbacProxy.tag` | string | `"v0.13.0"` | Image tag for the Kube RBAC Proxy image component |

http-add-on/templates/interceptor/deployment.yaml

@@ -88,6 +88,10 @@ spec:
         - name: PROFILING_BIND_ADDRESS
           value: "127.0.0.1:{{ .Values.profiling.interceptor.port }}"
         {{- end}}
+        {{- range $key, $value := .Values.extraEnvs.interceptor }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
         ports:
         - containerPort: {{ .Values.interceptor.admin.port }}
           name: admin

http-add-on/templates/operator/deployment.yaml

@@ -79,6 +79,10 @@ spec:
           value: "{{ .Release.Namespace }}"
         - name: KEDA_HTTP_OPERATOR_WATCH_NAMESPACE
           value: "{{ .Values.operator.watchNamespace }}"
+        {{- range $key, $value := .Values.extraEnvs.operator }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
         ports:
         - name: metrics
           containerPort: 8080

http-add-on/templates/scaler/deployment.yaml

@@ -68,6 +68,10 @@ spec:
         - name: PROFILING_BIND_ADDRESS
           value: "127.0.0.1:{{ .Values.profiling.scaler.port }}"
         {{- end}}
+        {{- range $key, $value := .Values.extraEnvs.scaler }}
+        - name: {{ $key }}
+          value: {{ $value | quote }}
+        {{- end }}
         resources:
           {{- toYaml .Values.scaler.resources | nindent 10 }}
         livenessProbe:

http-add-on/values.yaml

@@ -5,6 +5,11 @@ crds:
   # -- Whether to install the `HTTPScaledObject` [`CustomResourceDefinition`](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
   install: true
 
+extraEnvs:
+  interceptor: {}
+  operator: {}
+  scaler: {}
+
 logging:
   operator:
     # -- Logging level for KEDA http-add-on operator.