diff --git a/keda/Chart.yaml b/keda/Chart.yaml index 316dee14..3875b642 100644 --- a/keda/Chart.yaml +++ b/keda/Chart.yaml @@ -8,7 +8,7 @@ kubeVersion: ">=v1.23.0-0" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.11.2 +version: 2.11.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/keda/README.md b/keda/README.md index 3114f2d9..ab959ef8 100644 --- a/keda/README.md +++ b/keda/README.md @@ -134,6 +134,7 @@ their default values. | `prometheus.operator.podMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for KEDA Operator podMonitor crd (prometheus operator) | | `prometheus.operator.podMonitor.scrapeTimeout` | string | `""` | Scraping timeout for KEDA Operator using podMonitor crd (prometheus operator) | | `prometheus.operator.port` | int | `8080` | Port used for exposing KEDA Operator prometheus metrics | +| `prometheus.operator.portName` | string | `"metrics"` | HTTP port name for exposing KEDA Operator prometheus metrics | | `prometheus.operator.prometheusRules.additionalLabels` | object | `{}` | Additional labels to add for KEDA Operator using prometheusRules crd (prometheus operator) | | `prometheus.operator.prometheusRules.alerts` | list | `[]` | Additional alerts to add for KEDA Operator using prometheusRules crd (prometheus operator) | | `prometheus.operator.prometheusRules.enabled` | bool | `false` | Enables PrometheusRules creation for the Prometheus Operator | @@ -146,9 +147,11 @@ their default values. | `prometheus.operator.serviceMonitor.port` | string | `"metrics"` | Name of the service port this endpoint refers to. Mutually exclusive with targetPort | | `prometheus.operator.serviceMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] | | `prometheus.operator.serviceMonitor.relabellings` | list | `[]` | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] | +| `prometheus.operator.serviceMonitor.scheme` | string | `"http"` | HTTP scheme used for scraping. Defaults to `http` | | `prometheus.operator.serviceMonitor.scrapeTimeout` | string | `""` | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used | | `prometheus.operator.serviceMonitor.targetLabels` | list | `[]` | TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics | | `prometheus.operator.serviceMonitor.targetPort` | string | `""` | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port | +| `prometheus.operator.serviceMonitor.tlsConfig` | object | `{}` | TLS configuration for scraping metrics | | `resources.operator` | object | `{"limits":{"cpu":1,"memory":"1000Mi"},"requests":{"cpu":"100m","memory":"100Mi"}}` | Manage [resource request & limits] of KEDA operator pod | | `securityContext.operator` | object | [See below](#KEDA-is-secure-by-default) | [Security context] of the operator container | | `topologySpreadConstraints.operator` | list | `[]` | [Pod Topology Constraints] of KEDA operator pod | @@ -182,7 +185,9 @@ their default values. | `prometheus.metricServer.podMonitor.interval` | string | `""` | Scraping interval for metric server using podMonitor crd (prometheus operator) | | `prometheus.metricServer.podMonitor.namespace` | string | `""` | Scraping namespace for metric server using podMonitor crd (prometheus operator) | | `prometheus.metricServer.podMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server podMonitor crd (prometheus operator) | +| `prometheus.metricServer.podMonitor.scheme` | string | `"http"` | HTTP scheme used for scraping. Defaults to `http` | | `prometheus.metricServer.podMonitor.scrapeTimeout` | string | `""` | Scraping timeout for metric server using podMonitor crd (prometheus operator) | +| `prometheus.metricServer.podMonitor.tlsConfig` | object | `{}` | TLS configuration for scraping metrics | | `prometheus.metricServer.port` | int | `8080` | HTTP port used for exposing metrics server prometheus metrics | | `prometheus.metricServer.portName` | string | `"metrics"` | HTTP port name for exposing metrics server prometheus metrics | | `prometheus.metricServer.serviceMonitor.additionalLabels` | object | `{}` | Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) | @@ -222,6 +227,7 @@ their default values. | `podSecurityContext.webhooks` | object | [See below](#KEDA-is-secure-by-default) | [Pod security context] of the KEDA admission webhooks | | `prometheus.webhooks.enabled` | bool | `false` | Enable KEDA admission webhooks prometheus metrics expose | | `prometheus.webhooks.port` | int | `8080` | Port used for exposing KEDA admission webhooks prometheus metrics | +| `prometheus.webhooks.portName` | string | `"metrics"` | HTTP port name for KEDA admission webhooks prometheus metrics | | `prometheus.webhooks.prometheusRules.additionalLabels` | object | `{}` | Additional labels to add for KEDA admission webhooks using prometheusRules crd (prometheus operator) | | `prometheus.webhooks.prometheusRules.alerts` | list | `[]` | Additional alerts to add for KEDA admission webhooks using prometheusRules crd (prometheus operator) | | `prometheus.webhooks.prometheusRules.enabled` | bool | `false` | Enables PrometheusRules creation for the Prometheus Operator | @@ -234,9 +240,11 @@ their default values. | `prometheus.webhooks.serviceMonitor.port` | string | `"metrics"` | Name of the service port this endpoint refers to. Mutually exclusive with targetPort | | `prometheus.webhooks.serviceMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] | | `prometheus.webhooks.serviceMonitor.relabellings` | list | `[]` | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] | +| `prometheus.webhooks.serviceMonitor.scheme` | string | `"http"` | HTTP scheme used for scraping. Defaults to `http` | | `prometheus.webhooks.serviceMonitor.scrapeTimeout` | string | `""` | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used | | `prometheus.webhooks.serviceMonitor.targetLabels` | list | `[]` | TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics | | `prometheus.webhooks.serviceMonitor.targetPort` | string | `""` | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port | +| `prometheus.webhooks.serviceMonitor.tlsConfig` | object | `{}` | TLS configuration for scraping metrics | | `resources.webhooks` | object | `{"limits":{"cpu":"50m","memory":"100Mi"},"requests":{"cpu":"10m","memory":"10Mi"}}` | Manage [resource request & limits] of KEDA admission webhooks pod | | `securityContext.webhooks` | object | [See below](#KEDA-is-secure-by-default) | [Security context] of the admission webhooks container | | `topologySpreadConstraints.webhooks` | list | `[]` | [Pod Topology Constraints] of KEDA admission webhooks pod | diff --git a/keda/templates/manager/servicemonitor.yaml b/keda/templates/manager/servicemonitor.yaml index 727601cb..1213ee59 100644 --- a/keda/templates/manager/servicemonitor.yaml +++ b/keda/templates/manager/servicemonitor.yaml @@ -51,6 +51,11 @@ spec: {{- toYaml . | nindent 6 }} {{- end }} {{- end}} + scheme: {{ .Values.prometheus.operator.serviceMonitor.scheme }} + {{- with .Values.prometheus.operator.serviceMonitor.tlsConfig }} + tlsConfig: + {{ toYaml . | nindent 6}} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/keda/templates/metrics-server/servicemonitor.yaml b/keda/templates/metrics-server/servicemonitor.yaml index e667aa72..326f7e2e 100644 --- a/keda/templates/metrics-server/servicemonitor.yaml +++ b/keda/templates/metrics-server/servicemonitor.yaml @@ -51,6 +51,11 @@ spec: {{- toYaml . | nindent 6 }} {{- end }} {{- end}} + scheme: {{ .Values.prometheus.metricServer.serviceMonitor.scheme }} + {{- with .Values.prometheus.metricServer.serviceMonitor.tlsConfig }} + tlsConfig: + {{ toYaml . | nindent 6}} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/keda/templates/webhooks/servicemonitor.yaml b/keda/templates/webhooks/servicemonitor.yaml index 48b5223d..8452b4d0 100644 --- a/keda/templates/webhooks/servicemonitor.yaml +++ b/keda/templates/webhooks/servicemonitor.yaml @@ -52,6 +52,11 @@ spec: {{- toYaml . | nindent 6 }} {{- end }} {{- end}} + scheme: {{ .Values.prometheus.webhooks.serviceMonitor.scheme }} + {{- with .Values.prometheus.webhooks.serviceMonitor.tlsConfig }} + tlsConfig: + {{ toYaml . | nindent 6}} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/keda/values.yaml b/keda/values.yaml index 8c41c80e..55547a2e 100644 --- a/keda/values.yaml +++ b/keda/values.yaml @@ -535,6 +535,14 @@ prometheus: additionalLabels: {} # -- List of expressions that define custom relabeling rules for metric server podMonitor crd (prometheus operator) relabelings: [] + # -- HTTP scheme used for scraping. Defaults to `http` + scheme: http + # -- TLS configuration for scraping metrics + tlsConfig: {} + # caFile: /etc/prom-certs/root-cert.pem + # certFile: /etc/prom-certs/cert-chain.pem + # insecureSkipVerify: true + # keyFile: /etc/prom-certs/key.pem operator: # -- Enable KEDA Operator prometheus metrics expose enabled: false @@ -566,6 +574,14 @@ prometheus: relabelings: [] # -- Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) additionalLabels: {} + # -- HTTP scheme used for scraping. Defaults to `http` + scheme: http + # -- TLS configuration for scraping metrics + tlsConfig: {} + # caFile: /etc/prom-certs/root-cert.pem + # certFile: /etc/prom-certs/cert-chain.pem + # insecureSkipVerify: true + # keyFile: /etc/prom-certs/key.pem podMonitor: # -- Enables PodMonitor creation for the Prometheus Operator enabled: false @@ -626,6 +642,14 @@ prometheus: relabelings: [] # -- Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) additionalLabels: {} + # -- HTTP scheme used for scraping. Defaults to `http` + scheme: http + # -- TLS configuration for scraping metrics + tlsConfig: {} + # caFile: /etc/prom-certs/root-cert.pem + # certFile: /etc/prom-certs/cert-chain.pem + # insecureSkipVerify: true + # keyFile: /etc/prom-certs/key.pem prometheusRules: # -- Enables PrometheusRules creation for the Prometheus Operator enabled: false