diff --git a/http-add-on/README.md b/http-add-on/README.md index 2aec6dc70..51fcead14 100644 --- a/http-add-on/README.md +++ b/http-add-on/README.md @@ -114,6 +114,7 @@ their default values. | Parameter | Type | Default | Description | |-----------|------|---------|-------------| | `operator.affinity` | object | `{}` | Affinity for pod scheduling ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes-using-node-affinity/)) | +| `operator.image.tag` | string | `""` | The tag to use for the operator component image. If not set, the value from `images.tag` will be used. | | `operator.imagePullSecrets` | list | `[]` | The image pull secrets for the operator component | | `operator.kubeRbacProxy.resources.limits` | object | `{"cpu":"300m","memory":"200Mi"}` | The CPU/memory resource limit for the operator component's kube rbac proxy | | `operator.kubeRbacProxy.resources.requests` | object | `{"cpu":"10m","memory":"20Mi"}` | The CPU/memory resource request for the operator component's kube rbac proxy | @@ -133,6 +134,7 @@ their default values. |-----------|------|---------|-------------| | `scaler.affinity` | object | `{}` | Affinity for pod scheduling ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes-using-node-affinity/)) | | `scaler.grpcPort` | int | `9090` | The port for the scaler's gRPC server. This is the server that KEDA will send scaling requests to. | +| `scaler.image.tag` | string | `""` | The tag to use for the scaler component image. If not set, the value from `images.tag` will be used. | | `scaler.imagePullSecrets` | list | `[]` | The image pull secrets for the scaler component | | `scaler.nodeSelector` | object | `{}` | Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)) | | `scaler.pendingRequestsInterceptor` | int | `200` | The number of "target requests" that the external scaler will report to KEDA for the interceptor's scaling metrics. See the [KEDA external scaler documentation](https://keda.sh/docs/2.4/concepts/external-scalers/) for details on target requests. | @@ -158,6 +160,7 @@ their default values. | `interceptor.expectContinueTimeout` | string | `"1s"` | Special handling for responses with "Expect: 100-continue" response headers. see https://pkg.go.dev/net/http#Transport under the 'ExpectContinueTimeout' field for more details | | `interceptor.forceHTTP2` | bool | `false` | Whether or not the interceptor should force requests to use HTTP/2 | | `interceptor.idleConnTimeout` | string | `"90s"` | The timeout after which any idle connection is closed and removed from the interceptor's in-memory connection pool. | +| `interceptor.image.tag` | string | `""` | The tag to use for the interceptor component image. If not set, the value from `images.tag` will be used. | | `interceptor.imagePullSecrets` | list | `[]` | The image pull secrets for the interceptor component | | `interceptor.keepAlive` | string | `"1s"` | The interceptor's connection keep alive timeout | | `interceptor.maxIdleConns` | int | `100` | The maximum number of idle connections allowed in the interceptor's in-memory connection pool. Set to 0 to indicate no limit | diff --git a/http-add-on/templates/interceptor/deployment.yaml b/http-add-on/templates/interceptor/deployment.yaml index 27d943c50..b5073b7f5 100644 --- a/http-add-on/templates/interceptor/deployment.yaml +++ b/http-add-on/templates/interceptor/deployment.yaml @@ -26,7 +26,7 @@ spec: {{- end }} {{- end }} spec: - imagePullSecrets: + imagePullSecrets: {{- toYaml .Values.interceptor.imagePullSecrets | nindent 8 }} serviceAccountName: {{ .Chart.Name }}-interceptor {{- if .Values.podSecurityContext.interceptor }} @@ -44,7 +44,7 @@ spec: {{- if .Values.logging.interceptor.stackTracesEnabled }} - "--zap-stacktrace-level=error" {{- end }} - image: "{{ .Values.images.interceptor }}:{{ .Values.images.tag | default .Chart.AppVersion }}" + image: "{{ .Values.images.interceptor }}:{{ coalesce .Values.interceptor.image.tag .Values.images.tag .Chart.AppVersion }}" imagePullPolicy: '{{ .Values.interceptor.pullPolicy | default "Always" }}' name: "{{ .Chart.Name }}-interceptor" env: diff --git a/http-add-on/templates/operator/deployment.yaml b/http-add-on/templates/operator/deployment.yaml index c3471271a..d61e31b47 100644 --- a/http-add-on/templates/operator/deployment.yaml +++ b/http-add-on/templates/operator/deployment.yaml @@ -28,7 +28,7 @@ spec: {{- end }} {{- end }} spec: - imagePullSecrets: + imagePullSecrets: {{- toYaml .Values.operator.imagePullSecrets | nindent 8 }} serviceAccountName: {{ .Chart.Name }} {{- if .Values.podSecurityContext.operator }} @@ -64,7 +64,7 @@ spec: {{- if .Values.logging.operator.stackTracesEnabled }} - "--zap-stacktrace-level=error" {{- end }} - image: "{{ .Values.images.operator }}:{{ .Values.images.tag | default .Chart.AppVersion }}" + image: "{{ .Values.images.operator }}:{{ coalesce .Values.operator.image.tag .Values.images.tag .Chart.AppVersion }}" imagePullPolicy: '{{ .Values.operator.pullPolicy | default "Always" }}' name: "{{ .Chart.Name }}-operator" env: diff --git a/http-add-on/templates/scaler/deployment.yaml b/http-add-on/templates/scaler/deployment.yaml index ba0dc5346..bd35e4957 100644 --- a/http-add-on/templates/scaler/deployment.yaml +++ b/http-add-on/templates/scaler/deployment.yaml @@ -27,7 +27,7 @@ spec: {{- end }} {{- end }} spec: - imagePullSecrets: + imagePullSecrets: {{- toYaml .Values.scaler.imagePullSecrets | nindent 8 }} serviceAccountName: {{ .Chart.Name }}-external-scaler {{- if .Values.podSecurityContext.scaler }} @@ -45,7 +45,7 @@ spec: {{- if .Values.logging.scaler.stackTracesEnabled }} - "--zap-stacktrace-level=error" {{- end }} - image: "{{ .Values.images.scaler }}:{{ .Values.images.tag | default .Chart.AppVersion }}" + image: "{{ .Values.images.scaler }}:{{ coalesce .Values.scaler.image.tag .Values.images.tag .Chart.AppVersion }}" imagePullPolicy: {{ .Values.scaler.pullPolicy | default "Always" }} name: "{{ .Chart.Name }}-external-scaler" ports: diff --git a/http-add-on/values.yaml b/http-add-on/values.yaml index d66d2d3b2..f7d66a26b 100644 --- a/http-add-on/values.yaml +++ b/http-add-on/values.yaml @@ -55,6 +55,9 @@ operator: replicas: 1 # -- The image pull secrets for the operator component imagePullSecrets: [] + image: + # -- The tag to use for the operator component image. If not set, the value from `images.tag` will be used. + tag: "" # -- The namespace to watch for new `HTTPScaledObject`s. Leave this blank (i.e. `""`) to tell the operator to watch all namespaces. watchNamespace: "" # -- The image pull policy for the operator component @@ -96,6 +99,9 @@ scaler: replicas: 3 # -- The image pull secrets for the scaler component imagePullSecrets: [] + image: + # -- The tag to use for the scaler component image. If not set, the value from `images.tag` will be used. + tag: "" # -- The name of the Kubernetes `Service` for the scaler component service: external-scaler # -- The image pull policy for the scaler component @@ -123,6 +129,9 @@ scaler: podAnnotations: {} interceptor: + image: + # -- The tag to use for the interceptor component image. If not set, the value from `images.tag` will be used. + tag: "" # -- The image pull secrets for the interceptor component imagePullSecrets: [] # -- The image pull policy for the interceptor component