move tls config the the proper section

Signed-off-by: Jorge Turrado <[email protected]>
kedacore · Jan 18, 2024 · baa6938 · baa6938
1 parent 5f9bd53
commit baa6938
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/keda/README.md b/keda/README.md
@@ -184,9 +184,7 @@ 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) |
@@ -197,9 +195,11 @@ their default values.
 | `prometheus.metricServer.serviceMonitor.port` | string | `"metrics"` | Name of the service port this endpoint refers to. Mutually exclusive with targetPort |
 | `prometheus.metricServer.serviceMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
 | `prometheus.metricServer.serviceMonitor.relabellings` | list | `[]` | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.metricServer.serviceMonitor.scheme` | string | `"http"` | HTTP scheme used for scraping. Defaults to `http` |
 | `prometheus.metricServer.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.metricServer.serviceMonitor.targetLabels` | list | `[]` | TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics |
 | `prometheus.metricServer.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.metricServer.serviceMonitor.tlsConfig` | object | `{}` | TLS configuration for scraping metrics |
 | `prometheus.operator.enabled` | bool | `false` | Enable KEDA Operator prometheus metrics expose |
 | `prometheus.operator.podMonitor.additionalLabels` | object | `{}` | Additional labels to add for KEDA Operator using podMonitor crd (prometheus operator) |
 | `prometheus.operator.podMonitor.enabled` | bool | `false` | Enables PodMonitor creation for the Prometheus Operator |

diff --git a/keda/values.yaml b/keda/values.yaml
@@ -570,6 +570,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
@@ -583,14 +591,6 @@ 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