Created
August 21, 2020 07:48
-
-
Save amuraru/d277244552eeca95cf94be8141ad2a8c to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <html><head><meta charset="utf-8"><title>Pretty Diff</title><style>body {text-align: center;}#wrapper {display: inline-block;margin-top: 1em;min-width: 800px;text-align: left;}h2 {background: #fafafa;background: -moz-linear-gradient(#fafafa, #eaeaea);background: -webkit-linear-gradient(#fafafa, #eaeaea);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa',endColorstr='#eaeaea')";border: 1px solid #d8d8d8;border-bottom: 0;color: #555;font: 14px sans-serif;overflow: hidden;padding: 10px 6px;text-shadow: 0 1px 0 white;margin: 0;}.file-diff {border: 1px solid #d8d8d8;margin-bottom: 1em;overflow: auto;padding: 0.5em 0;}.file-diff > div {width: 100%:}pre {margin: 0;font-family: "Bitstream Vera Sans Mono", Courier, monospace;font-size: 12px;line-height: 1.4em;text-indent: 0.5em;}.file {color: #aaa;}.delete {background-color: #fdd;}.insert {background-color: #dfd;}.info {color: #a0b;}</style></head><body><div id="wrapper"><h2>stable/prometheus-operator/Chart.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml</pre><pre class="context">index e17e50f65..325bf46a3 100644</pre><pre class="delete">--- a/stable/prometheus-operator/Chart.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/Chart.yaml</pre><pre class="info">@@ -12,7 +12,7 @@ sources:</pre><pre class="context"> - https://github.com/coreos/kube-prometheus</pre><pre class="context"> - https://github.com/coreos/prometheus-operator</pre><pre class="context"> - https://coreos.com/operators/prometheus</pre><pre class="delete">-version: 8.15.11</pre><pre class="insert">+version: 9.3.1</pre><pre class="context"> appVersion: 0.38.1</pre><pre class="context"> tillerVersion: ">=2.12.0"</pre><pre class="context"> home: https://github.com/coreos/prometheus-operator</pre></div><h2>stable/prometheus-operator/README.md</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md</pre><pre class="context">index 71177f4b4..6f378b1ea 100644</pre><pre class="delete">--- a/stable/prometheus-operator/README.md</pre><pre class="insert">+++ b/stable/prometheus-operator/README.md</pre><pre class="info">@@ -103,6 +103,9 @@ $ helm install --name my-release stable/prometheus-operator --set prometheusOper</pre><pre class="context"> A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an</pre><pre class="context"> incompatible breaking change needing manual actions.</pre><pre class="context"> </pre><pre class="insert">+### Upgrading from 8.x.x to 9.x.x</pre><pre class="insert">+Version 9 of the helm chart removes the existing `additionalScrapeConfigsExternal` in favour of `additionalScrapeConfigsSecret`. This change lets users specify the secret name and secret key to use for the additional scrape configuration of prometheus. This is useful for users that have prometheus-operator as a subchart and also have a template that creates the additional scrape configuration.</pre><pre class="insert">+</pre><pre class="context"> ### Upgrading from 7.x.x to 8.x.x</pre><pre class="context"> Due to new template functions being used in the rules in version 8.x.x of the chart, an upgrade to Prometheus Operator and Prometheus is necessary in order to support them.</pre><pre class="context"> First, upgrade to the latest version of 7.x.x</pre><pre class="info">@@ -153,6 +156,7 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `defaultRules.rules.general` | Create General default rules| `true` |</pre><pre class="context"> | `defaultRules.rules.k8s` | Create K8S default rules| `true` |</pre><pre class="context"> | `defaultRules.rules.kubeApiserver` | Create Api Server default rules| `true` |</pre><pre class="insert">+| `defaultRules.rules.kubeApiserverAvailability` | Create Api Server Availability default rules| `true` |</pre><pre class="context"> | `defaultRules.rules.kubeApiserverError` | Create Api Server Error default rules| `true` |</pre><pre class="context"> | `defaultRules.rules.kubeApiserverSlos` | Create Api Server SLOs default rules| `true` |</pre><pre class="context"> | `defaultRules.rules.kubelet` | Create kubelet default rules | `true` |</pre><pre class="info">@@ -189,6 +193,7 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheusOperator.admissionWebhooks.patch.image.pullPolicy` | Image pull policy for the webhook integration jobs | `IfNotPresent` |</pre><pre class="context"> | `prometheusOperator.admissionWebhooks.patch.image.repository` | Repository to use for the webhook integration jobs | `jettech/kube-webhook-certgen` |</pre><pre class="context"> | `prometheusOperator.admissionWebhooks.patch.image.tag` | Tag to use for the webhook integration jobs | `v1.2.1` |</pre><pre class="insert">+| `prometheusOperator.admissionWebhooks.patch.image.sha` | Sha to use for the webhook integration jobs (optional) | `` |</pre><pre class="context"> | `prometheusOperator.admissionWebhooks.patch.resources` | Resource limits for admission webhook | `{}` |</pre><pre class="context"> | `prometheusOperator.admissionWebhooks.patch.nodeSelector` | Node selector for running admission hook patch jobs | `nil` |</pre><pre class="context"> | `prometheusOperator.admissionWebhooks.patch.podAnnotations` | Annotations for the webhook job pods | `nil` |</pre><pre class="info">@@ -199,6 +204,7 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheusOperator.configReloaderMemory` | Set the prometheus config reloader side-car memory limit. If unset, uses the prometheus-operator project default | `nil` |</pre><pre class="context"> | `prometheusOperator.configmapReloadImage.repository` | Repository for configmapReload image | `docker.io/jimmidyson/configmap-reload` |</pre><pre class="context"> | `prometheusOperator.configmapReloadImage.tag` | Tag for configmapReload image | `v0.3.0` |</pre><pre class="insert">+| `prometheusOperator.configmapReloadImage.sha` | Sha for configmapReload image (optional) | `` |</pre><pre class="context"> | `prometheusOperator.createCustomResource` | Create CRDs. Required if deploying anything besides the operator itself as part of the release. The operator will create / update these on startup. If your Helm version < 2.10 you will have to either create the CRDs first or deploy the operator first, then the rest of the resources. Regardless of value of this, Helm v3+ will install the CRDs if those are not present already. Use `--skip-crds` with `helm install` if you want to skip CRD creation | `true` |</pre><pre class="context"> | `prometheusOperator.namespaces` | Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with `denyNamespaces`. Setting this to an empty object will disable the configuration | `{}` |</pre><pre class="context"> | `prometheusOperator.namespaces.releaseNamespace` | Include the release namespace | `false` |</pre><pre class="info">@@ -209,9 +215,11 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheusOperator.hyperkubeImage.pullPolicy` | Image pull policy for hyperkube image used to perform maintenance tasks | `IfNotPresent` |</pre><pre class="context"> | `prometheusOperator.hyperkubeImage.repository` | Repository for hyperkube image used to perform maintenance tasks | `k8s.gcr.io/hyperkube` |</pre><pre class="context"> | `prometheusOperator.hyperkubeImage.tag` | Tag for hyperkube image used to perform maintenance tasks | `v1.16.12` |</pre><pre class="insert">+| `prometheusOperator.hyperkubeImage.sha` | Sha for hyperkube image used to perform maintenance tasks | `` |</pre><pre class="context"> | `prometheusOperator.image.pullPolicy` | Pull policy for prometheus operator image | `IfNotPresent` |</pre><pre class="context"> | `prometheusOperator.image.repository` | Repository for prometheus operator image | `quay.io/coreos/prometheus-operator` |</pre><pre class="context"> | `prometheusOperator.image.tag` | Tag for prometheus operator image | `v0.38.1` |</pre><pre class="insert">+| `prometheusOperator.image.sha` | Sha for prometheus operator image (optional) | `` |</pre><pre class="context"> | `prometheusOperator.kubeletService.enabled` | If true, the operator will create and maintain a service for scraping kubelets | `true` |</pre><pre class="context"> | `prometheusOperator.kubeletService.namespace` | Namespace to deploy kubelet service | `kube-system` |</pre><pre class="context"> | `prometheusOperator.logFormat` | Operator log output formatting | `"logfmt"` |</pre><pre class="info">@@ -223,6 +231,7 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheusOperator.priorityClassName` | Name of Priority Class to assign pods | `nil` |</pre><pre class="context"> | `prometheusOperator.prometheusConfigReloaderImage.repository` | Repository for config-reloader image | `quay.io/coreos/prometheus-config-reloader` |</pre><pre class="context"> | `prometheusOperator.prometheusConfigReloaderImage.tag` | Tag for config-reloader image | `v0.38.1` |</pre><pre class="insert">+| `prometheusOperator.prometheusConfigReloaderImage.sha` | Sha for config-reloader image (optional) | `` |</pre><pre class="context"> | `prometheusOperator.resources` | Resource limits for prometheus operator | `{}` |</pre><pre class="context"> | `prometheusOperator.securityContext` | SecurityContext for prometheus operator | `{"fsGroup": 65534, "runAsGroup": 65534, "runAsNonRoot": true, "runAsUser": 65534}` |</pre><pre class="context"> | `prometheusOperator.service.annotations` | Annotations to be added to the prometheus operator service | `{}` |</pre><pre class="info">@@ -243,6 +252,7 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheusOperator.tlsProxy.enabled` | Enable a TLS proxy container. Only the `squareup/ghostunnel` command line arguments are currently supported and the secret where the cert is loaded from is expected to be provided by the admission webhook | `true` |</pre><pre class="context"> | `prometheusOperator.tlsProxy.image.repository` | Repository for the TLS proxy container | `squareup/ghostunnel` |</pre><pre class="context"> | `prometheusOperator.tlsProxy.image.tag` | Repository for the TLS proxy container | `v1.5.2` |</pre><pre class="insert">+| `prometheusOperator.tlsProxy.image.sha` | Sha for the TLS proxy container (optional) | `` |</pre><pre class="context"> | `prometheusOperator.tlsProxy.image.pullPolicy` | Image pull policy for the TLS proxy container | `IfNotPresent` |</pre><pre class="context"> | `prometheusOperator.tlsProxy.resources` | Resource requests and limits for the TLS proxy container | `{}` |</pre><pre class="context"> | `prometheusOperator.tolerations` | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `[]` |</pre><pre class="info">@@ -275,7 +285,9 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheus.podSecurityPolicy.allowedCapabilities` | Prometheus Pod Security Policy allowed capabilities | `""` |</pre><pre class="context"> | `prometheus.prometheusSpec.additionalAlertManagerConfigs` | AdditionalAlertManagerConfigs allows for manual configuration of alertmanager jobs in the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#<alertmanager_config>. AlertManager configurations specified are appended to the configurations generated by the Prometheus Operator. As AlertManager configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible AlertManager configs are going to break Prometheus after the upgrade. | `{}` |</pre><pre class="context"> | `prometheus.prometheusSpec.additionalAlertRelabelConfigs` | AdditionalAlertRelabelConfigs allows specifying additional Prometheus alert relabel configurations. Alert relabel configurations specified are appended to the configurations generated by the Prometheus Operator. Alert relabel configurations specified must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs. As alert relabel configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible alert relabel configs are going to break Prometheus after the upgrade. | `[]` |</pre><pre class="delete">-| `prometheus.prometheusSpec.additionalScrapeConfigsExternal` | Enable additional scrape configs that are managed externally to this chart. This option requires a secret in the same namespace as Prometheus with the name, `prometheus-operator-prometheus-scrape-confg` and a key of `additional-scrape-configs.yaml`. Note that the prometheus will fail to provision if the correct secret does not exist. | `false` |</pre><pre class="insert">+| `prometheus.prometheusSpec.additionalScrapeConfigsSecret.enabled` | Enable additional scrape configs that are managed externally to this chart. Note that the prometheus will fail to provision if the correct secret does not exist. | `false` |</pre><pre class="insert">+| `prometheus.prometheusSpec.additionalScrapeConfigsSecret.name` | Name of the secret that Prometheus should use for the additional scrape configuration. | `""` |</pre><pre class="insert">+| `prometheus.prometheusSpec.additionalScrapeConfigsSecret.key` | Name of the key inside the secret specified under `additionalScrapeConfigsSecret.name` to be used for the additional scrape configuration. | `""` |</pre><pre class="context"> | `prometheus.prometheusSpec.additionalScrapeConfigs` | AdditionalScrapeConfigs allows specifying additional Prometheus scrape configurations. Scrape configurations are appended to the configurations generated by the Prometheus Operator. Job configurations must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#<scrape_config>. As scrape configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible scrape configs are going to break Prometheus after the upgrade. | `[]` |</pre><pre class="context"> | `prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations` | additionalPrometheusSecretsAnnotations allows to add annotations to the kubernetes secret. This can be useful when deploying via spinnaker to disable versioning on the secret, strategy.spinnaker.io/versioned: 'false' | `{}` |</pre><pre class="context"> | `prometheus.prometheusSpec.affinity` | Assign custom affinity rules to the prometheus instance https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` |</pre><pre class="info">@@ -291,7 +303,8 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheus.prometheusSpec.externalLabels` | The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager). | `{}` |</pre><pre class="context"> | `prometheus.prometheusSpec.externalUrl` | The external URL the Prometheus instances will be available under. This is necessary to generate correct URLs. This is necessary if Prometheus is not served from root of a DNS name. | `""` |</pre><pre class="context"> | `prometheus.prometheusSpec.image.repository` | Base image to use for a Prometheus deployment. | `quay.io/prometheus/prometheus` |</pre><pre class="delete">-| `prometheus.prometheusSpec.image.tag` | Tag of Prometheus container image to be deployed. | `v2.18.1` |</pre><pre class="insert">+| `prometheus.prometheusSpec.image.tag` | Tag of Prometheus container image to be deployed. | `v2.18.2` |</pre><pre class="insert">+| `prometheus.prometheusSpec.image.sha` | Sha of Prometheus container image to be deployed (optional). | `` |</pre><pre class="context"> | `prometheus.prometheusSpec.listenLocal` | ListenLocal makes the Prometheus server listen on loopback, so that it does not bind against the Pod IP. | `false` |</pre><pre class="context"> | `prometheus.prometheusSpec.logFormat` | Log format for Prometheus to be configured with. | `logfmt` |</pre><pre class="context"> | `prometheus.prometheusSpec.logLevel` | Log level for Prometheus to be configured with. | `info` |</pre><pre class="info">@@ -363,6 +376,13 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `prometheus.servicePerReplica.port` | Port for Prometheus per replica Service to listen on | `9090` |</pre><pre class="context"> | `prometheus.servicePerReplica.targetPort` | Prometheus per replica Service internal port | `9090` |</pre><pre class="context"> | `prometheus.servicePerReplica.type` | Prometheus per replica Service type | `ClusterIP` |</pre><pre class="insert">+| `prometheus.thanosIngress.enabled` | Enable Ingress for Thanos Sidecar * ingress controller needs to support [gRPC](https://thanos.io/quick-tutorial.md/#store-api) | `false` |</pre><pre class="insert">+| `prometheus.thanosIngress.servicePort` | Ingress Service Port for Thanos Sidecar | `10901` |</pre><pre class="insert">+| `prometheus.thanosIngress.paths` | Ingress paths for Thanos Sidecar | `[]` |</pre><pre class="insert">+| `prometheus.thanosIngress.annotations` | Ingress annotations for Thanos Sidecar | `{}` |</pre><pre class="insert">+| `prometheus.thanosIngress.labels` | Ingress labels for Thanos Sidecar | `{}` |</pre><pre class="insert">+| `prometheus.thanosIngress.hosts | Ingress hosts for Thanos Sidecar | `[]` |</pre><pre class="insert">+| `prometheus.thanosIngress.tls | Ingress tls for Thanos Sidecar | `[]` |</pre><pre class="context"> </pre><pre class="context"> ### Alertmanager</pre><pre class="context"> | Parameter | Description | Default |</pre><pre class="info">@@ -374,7 +394,8 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `alertmanager.alertmanagerSpec.containers` | Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to an Alertmanager pod. | `[]` |</pre><pre class="context"> | `alertmanager.alertmanagerSpec.externalUrl` | The external URL the Alertmanager instances will be available under. This is necessary to generate correct URLs. This is necessary if Alertmanager is not served from root of a DNS name. | `""` |</pre><pre class="context"> | `alertmanager.alertmanagerSpec.image.repository` | Base image that is used to deploy pods, without tag. | `quay.io/prometheus/alertmanager` |</pre><pre class="delete">-| `alertmanager.alertmanagerSpec.image.tag` | Tag of Alertmanager container image to be deployed. | `v0.20.0` |</pre><pre class="insert">+| `alertmanager.alertmanagerSpec.image.tag` | Tag of Alertmanager container image to be deployed. | `v0.21.0` |</pre><pre class="insert">+| `alertmanager.alertmanagerSpec.image.sha` | Sha of Alertmanager container image to be deployed (optional). | `` |</pre><pre class="context"> | `alertmanager.alertmanagerSpec.listenLocal` | ListenLocal makes the Alertmanager server listen on loopback, so that it does not bind against the Pod IP. Note this is only for the Alertmanager UI, not the gossip communication. | `false` |</pre><pre class="context"> | `alertmanager.alertmanagerSpec.logFormat` | Log format for Alertmanager to be configured with. | `logfmt` |</pre><pre class="context"> | `alertmanager.alertmanagerSpec.logLevel` | Log level for Alertmanager to be configured with. | `info` |</pre><pre class="info">@@ -393,6 +414,8 @@ The following tables list the configurable parameters of the prometheus-operator</pre><pre class="context"> | `alertmanager.alertmanagerSpec.storage` | Storage is the definition of how storage will be used by the Alertmanager instances. | `{}` |</pre><pre class="context"> | `alertmanager.alertmanagerSpec.tolerations` | If specified, the pod's tolerations. | `[]` |</pre><pre class="context"> | `alertmanager.alertmanagerSpec.useExistingSecret` | Use an existing secret for configuration (all defined config from values.yaml will be ignored) | `false` |</pre><pre class="insert">+| `alertmanager.alertmanagerSpec.volumes` | Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. | |</pre><pre class="insert">+| `alertmanager.alertmanagerSpec.volumeMounts` | VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition. VolumeMounts specified will be appended to other VolumeMounts in the alertmanager container, that are generated as a result of StorageSpec objects. | |</pre><pre class="context"> | `alertmanager.apiVersion` | Api that prometheus will use to communicate with alertmanager. Possible values are v1, v2 | `v2` |</pre><pre class="context"> | `alertmanager.config` | Provide YAML to configure Alertmanager. See https://prometheus.io/docs/alerting/configuration/#configuration-file. The default provided works to suppress the Watchdog alert from `defaultRules.create` | `{"global":{"resolve_timeout":"5m"},"route":{"group_by":["job"],"group_wait":"30s","group_interval":"5m","repeat_interval":"12h","receiver":"null","routes":[{"match":{"alertname":"Watchdog"},"receiver":"null"}]},"receivers":[{"name":"null"}]}` |</pre><pre class="context"> | `alertmanager.enabled` | Deploy alertmanager | `true` |</pre><pre class="info">@@ -468,6 +491,7 @@ For a full list of configurable values please refer to the [Grafana chart](https</pre><pre class="context"> | `grafana.serviceMonitor.relabelings` | The `relabel_configs` for scraping the grafana instance. | `` |</pre><pre class="context"> | `grafana.serviceMonitor.selfMonitor` | Create a `serviceMonitor` to automatically monitor the grafana instance | `true` |</pre><pre class="context"> | `grafana.sidecar.dashboards.enabled` | Enable the Grafana sidecar to automatically load dashboards with a label `{{ grafana.sidecar.dashboards.label }}=1` | `true` |</pre><pre class="insert">+| `grafana.sidecar.dashboards.annotations` | Create annotations on dashboard configmaps | `{}` |</pre><pre class="context"> | `grafana.sidecar.dashboards.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as dashboards | `grafana_dashboard` |</pre><pre class="context"> | `grafana.sidecar.datasources.annotations` | Create annotations on datasource configmaps | `{}` |</pre><pre class="context"> | `grafana.sidecar.datasources.createPrometheusReplicasDatasources` | Create datasource for each Pod of Prometheus StatefulSet i.e. `Prometheus-0`, `Prometheus-1` | `false` |</pre><pre class="info">@@ -570,6 +594,7 @@ For a full list of configurable values please refer to the [Grafana chart](https</pre><pre class="context"> | `kubelet.serviceMonitor.resourceRelabelings` | The `relabel_configs` for scraping cAdvisor. | `[{"sourceLabels":["__metrics_path__"], "targetLabel":"metrics_path"}]` |</pre><pre class="context"> | `kubelet.serviceMonitor.https` | Enable scraping of the kubelet over HTTPS. For more information, see https://github.com/coreos/prometheus-operator/issues/926 | `true` |</pre><pre class="context"> | `kubelet.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` |</pre><pre class="insert">+| `kubelet.serviceMonitor.scrapeTimeout` | Scrape timeout. If not set, the Prometheus default scrape timeout is used | `nil` |</pre><pre class="context"> | `kubelet.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping kubelet. | `` |</pre><pre class="context"> | `kubelet.serviceMonitor.relabelings` | The `relabel_configs` for scraping kubelet. | `[{"sourceLabels":["__metrics_path__"], "targetLabel":"metrics_path"}]` |</pre><pre class="context"> | `nodeExporter.enabled` | Deploy the `prometheus-node-exporter` and scrape it | `true` |</pre></div><h2>stable/prometheus-operator/ci/02-test-without-crds-values.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/ci/02-test-without-crds-values.yaml b/stable/prometheus-operator/ci/02-test-without-crds-values.yaml</pre><pre class="context">index f1dd74f27..3df8ea4a5 100644</pre><pre class="delete">--- a/stable/prometheus-operator/ci/02-test-without-crds-values.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/ci/02-test-without-crds-values.yaml</pre><pre class="info">@@ -4,3 +4,8 @@ prometheusOperator:</pre><pre class="context"> releaseNamespace: true</pre><pre class="context"> additional:</pre><pre class="context"> - kube-system</pre><pre class="insert">+</pre><pre class="insert">+prometheus-node-exporter:</pre><pre class="insert">+ service:</pre><pre class="insert">+ targetPort: 9101</pre><pre class="insert">+ port: 9101</pre></div><h2>stable/prometheus-operator/hack/sync_grafana_dashboards.py</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/hack/sync_grafana_dashboards.py b/stable/prometheus-operator/hack/sync_grafana_dashboards.py</pre><pre class="context">index 3e62f0ea8..d89996359 100755</pre><pre class="delete">--- a/stable/prometheus-operator/hack/sync_grafana_dashboards.py</pre><pre class="insert">+++ b/stable/prometheus-operator/hack/sync_grafana_dashboards.py</pre><pre class="info">@@ -78,8 +78,10 @@ https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack</pre><pre class="context"> apiVersion: v1</pre><pre class="context"> kind: ConfigMap</pre><pre class="context"> metadata:</pre><pre class="delete">- namespace: {{ $.Release.Namespace }}</pre><pre class="insert">+ namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="context"> name: {{ printf "%%s-%%s" (include "prometheus-operator.fullname" $) "%(name)s" | trunc 63 | trimSuffix "-" }}</pre><pre class="insert">+ annotations:</pre><pre class="insert">+{{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}</pre><pre class="context"> labels:</pre><pre class="context"> {{- if $.Values.grafana.sidecar.dashboards.label }}</pre><pre class="context"> {{ $.Values.grafana.sidecar.dashboards.label }}: "1"</pre></div><h2>stable/prometheus-operator/hack/sync_prometheus_rules.py</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/hack/sync_prometheus_rules.py b/stable/prometheus-operator/hack/sync_prometheus_rules.py</pre><pre class="context">index df3bf92d0..b7c40df8b 100755</pre><pre class="delete">--- a/stable/prometheus-operator/hack/sync_prometheus_rules.py</pre><pre class="insert">+++ b/stable/prometheus-operator/hack/sync_prometheus_rules.py</pre><pre class="info">@@ -54,6 +54,7 @@ condition_map = {</pre><pre class="context"> 'general.rules': ' .Values.defaultRules.rules.general',</pre><pre class="context"> 'k8s.rules': ' .Values.defaultRules.rules.k8s',</pre><pre class="context"> 'kube-apiserver.rules': ' .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver',</pre><pre class="insert">+ 'kube-apiserver-availability.rules': ' .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverAvailability',</pre><pre class="context"> 'kube-apiserver-error': ' .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverError',</pre><pre class="context"> 'kube-apiserver-slos': ' .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverSlos',</pre><pre class="context"> 'kube-prometheus-general.rules': ' .Values.defaultRules.rules.kubePrometheusGeneral',</pre><pre class="info">@@ -106,7 +107,7 @@ replacement_map = {</pre><pre class="context"> 'init': '{{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }}'},</pre><pre class="context"> 'namespace="monitoring"': {</pre><pre class="context"> 'replacement': 'namespace="{{ $namespace }}"',</pre><pre class="delete">- 'init': '{{- $namespace := .Release.Namespace }}'},</pre><pre class="insert">+ 'init': '{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}'},</pre><pre class="context"> 'alertmanager-$1': {</pre><pre class="context"> 'replacement': '$1',</pre><pre class="context"> 'init': ''},</pre><pre class="info">@@ -135,7 +136,7 @@ apiVersion: monitoring.coreos.com/v1</pre><pre class="context"> kind: PrometheusRule</pre><pre class="context"> metadata:</pre><pre class="context"> name: {{ printf "%%s-%%s" (include "prometheus-operator.fullname" .) "%(name)s" | trunc 63 | trimSuffix "-" }}</pre><pre class="delete">- namespace: {{ .Release.Namespace }}</pre><pre class="insert">+ namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="context"> labels:</pre><pre class="context"> app: {{ template "prometheus-operator.name" . }}</pre><pre class="context"> {{ include "prometheus-operator.labels" . | indent 4 }}</pre></div><h2>stable/prometheus-operator/templates/alertmanager/alertmanager.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml</pre><pre class="context">index d82b297f6..7bc2465ce 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml</pre><pre class="info">@@ -11,6 +11,9 @@ spec:</pre><pre class="context"> {{- if .Values.alertmanager.alertmanagerSpec.image }}</pre><pre class="context"> baseImage: {{ .Values.alertmanager.alertmanagerSpec.image.repository }}</pre><pre class="context"> version: {{ .Values.alertmanager.alertmanagerSpec.image.tag }}</pre><pre class="insert">+ {{- if .Values.alertmanager.alertmanagerSpec.image.sha }}</pre><pre class="insert">+ sha: {{ .Values.alertmanager.alertmanagerSpec.image.sha }}</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> {{- end }}</pre><pre class="context"> replicas: {{ .Values.alertmanager.alertmanagerSpec.replicas }}</pre><pre class="context"> listenLocal: {{ .Values.alertmanager.alertmanagerSpec.listenLocal }}</pre><pre class="info">@@ -101,7 +104,15 @@ spec:</pre><pre class="context"> priorityClassName: {{.Values.alertmanager.alertmanagerSpec.priorityClassName }}</pre><pre class="context"> {{- end }}</pre><pre class="context"> {{- if .Values.alertmanager.alertmanagerSpec.additionalPeers }}</pre><pre class="delete">- additionalPeers: {{.Values.alertmanager.alertmanagerSpec.additionalPeers }}</pre><pre class="insert">+ additionalPeers:</pre><pre class="insert">+{{ toYaml .Values.alertmanager.alertmanagerSpec.additionalPeers | indent 4 }}</pre><pre class="insert">+{{- end }}</pre><pre class="insert">+{{- if .Values.alertmanager.alertmanagerSpec.volumes }}</pre><pre class="insert">+ volumes: {{.Values.alertmanager.alertmanagerSpec.volumes }}</pre><pre class="insert">+{{- end }}</pre><pre class="insert">+{{- if .Values.alertmanager.alertmanagerSpec.volumeMounts }}</pre><pre class="insert">+ volumeMounts: {{.Values.alertmanager.alertmanagerSpec.volumeMounts }}</pre><pre class="context"> {{- end }}</pre><pre class="context"> portName: {{ .Values.alertmanager.alertmanagerSpec.portName }}</pre><pre class="context"> {{- end }}</pre><pre class="insert">+</pre></div><h2>stable/prometheus-operator/templates/alertmanager/psp.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/alertmanager/psp.yaml b/stable/prometheus-operator/templates/alertmanager/psp.yaml</pre><pre class="context">index 7c9949c2d..9726175ab 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/alertmanager/psp.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/alertmanager/psp.yaml</pre><pre class="info">@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1</pre><pre class="context"> kind: PodSecurityPolicy</pre><pre class="context"> metadata:</pre><pre class="context"> name: {{ template "prometheus-operator.fullname" . }}-alertmanager</pre><pre class="delete">- namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="context"> labels:</pre><pre class="context"> app: {{ template "prometheus-operator.name" . }}-alertmanager</pre><pre class="context"> {{- if .Values.global.rbac.pspAnnotations }}</pre></div><h2>stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml</pre><pre class="context">index 0c56c720d..e0d6b856e 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml</pre><pre class="info">@@ -35,6 +35,9 @@ spec:</pre><pre class="context"> {{- if .Values.kubelet.serviceMonitor.interval }}</pre><pre class="context"> interval: {{ .Values.kubelet.serviceMonitor.interval }}</pre><pre class="context"> {{- end }}</pre><pre class="insert">+ {{- if .Values.kubelet.serviceMonitor.scrapeTimeout }}</pre><pre class="insert">+ scrapeTimeout: {{ .Values.kubelet.serviceMonitor.scrapeTimeout }}</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> honorLabels: true</pre><pre class="context"> tlsConfig:</pre><pre class="context"> caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt</pre></div><h2>stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml</pre><pre class="context">index 7fb8efa85..c4d4cb93d 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml</pre><pre class="info">@@ -10,7 +10,7 @@ items:</pre><pre class="context"> kind: ConfigMap</pre><pre class="context"> metadata:</pre><pre class="context"> name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }}</pre><pre class="delete">- namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="insert">+ namespace: {{ template "prometheus-operator.namespace" $ }}</pre><pre class="context"> labels:</pre><pre class="context"> {{- if $.Values.grafana.sidecar.dashboards.label }}</pre><pre class="context"> {{ $.Values.grafana.sidecar.dashboards.label }}: "1"</pre></div><h2>stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml</pre><pre class="context">index a1313b9a9..8da76caaa 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml</pre><pre class="info">@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1</pre><pre class="context"> kind: ClusterRoleBinding</pre><pre class="context"> metadata:</pre><pre class="context"> name: {{ template "prometheus-operator.fullname" . }}-admission</pre><pre class="delete">- namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="context"> annotations:</pre><pre class="context"> "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade</pre><pre class="context"> "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded</pre></div><h2>stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml</pre><pre class="context">index 3c8ad08fa..093cdbea2 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml</pre><pre class="info">@@ -31,7 +31,11 @@ spec:</pre><pre class="context"> {{- end }}</pre><pre class="context"> containers:</pre><pre class="context"> - name: create</pre><pre class="insert">+ {{- if .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}</pre><pre class="insert">+ image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}</pre><pre class="insert">+ {{- else }}</pre><pre class="context"> image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }}</pre><pre class="context"> args:</pre><pre class="context"> - create</pre></div><h2>stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml</pre><pre class="context">index 0037e135c..ca1788a9e 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml</pre><pre class="info">@@ -31,7 +31,11 @@ spec:</pre><pre class="context"> {{- end }}</pre><pre class="context"> containers:</pre><pre class="context"> - name: patch</pre><pre class="insert">+ {{- if .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}</pre><pre class="insert">+ image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}</pre><pre class="insert">+ {{- else }}</pre><pre class="context"> image: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }}</pre><pre class="context"> args:</pre><pre class="context"> - patch</pre></div><h2>stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml</pre><pre class="context">index 782157802..42ad8828e 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml</pre><pre class="info">@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1</pre><pre class="context"> kind: PodSecurityPolicy</pre><pre class="context"> metadata:</pre><pre class="context"> name: {{ template "prometheus-operator.fullname" . }}-admission</pre><pre class="delete">- namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="context"> annotations:</pre><pre class="context"> "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade</pre><pre class="context"> "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded</pre></div><h2>stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml</pre><pre class="context">index 7329701f1..f104020f3 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml</pre><pre class="info">@@ -24,7 +24,11 @@ spec:</pre><pre class="context"> {{- end }}</pre><pre class="context"> containers:</pre><pre class="context"> - name: kubectl</pre><pre class="insert">+ {{- if .Values.prometheusOperator.hyperkubeImage.sha }}</pre><pre class="insert">+ image: {{ .Values.prometheusOperator.hyperkubeImage.repository }}:{{ .Values.prometheusOperator.hyperkubeImage.tag }}@sha256:{{ .Values.prometheusOperator.hyperkubeImage.sha }}</pre><pre class="insert">+ {{- else }}</pre><pre class="context"> image: "{{ .Values.prometheusOperator.hyperkubeImage.repository }}:{{ .Values.prometheusOperator.hyperkubeImage.tag }}"</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> imagePullPolicy: "{{ .Values.prometheusOperator.hyperkubeImage.pullPolicy }}"</pre><pre class="context"> command:</pre><pre class="context"> - /bin/sh</pre></div><h2>stable/prometheus-operator/templates/prometheus-operator/deployment.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml</pre><pre class="context">index a20bbb3ea..0f81b6c25 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml</pre><pre class="info">@@ -32,7 +32,11 @@ spec:</pre><pre class="context"> {{- end }}</pre><pre class="context"> containers:</pre><pre class="context"> - name: {{ template "prometheus-operator.name" . }}</pre><pre class="insert">+ {{- if .Values.prometheusOperator.image.sha }}</pre><pre class="insert">+ image: "{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}@sha256:{{ .Values.prometheusOperator.image.sha }}"</pre><pre class="insert">+ {{- else }}</pre><pre class="context"> image: "{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}"</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> imagePullPolicy: "{{ .Values.prometheusOperator.image.pullPolicy }}"</pre><pre class="context"> args:</pre><pre class="context"> {{- if semverCompare "< v0.39.0" .Values.prometheusOperator.image.tag }}</pre><pre class="info">@@ -59,8 +63,16 @@ spec:</pre><pre class="context"> {{- end }}</pre><pre class="context"> - --logtostderr=true</pre><pre class="context"> - --localhost=127.0.0.1</pre><pre class="insert">+ {{- if .Values.prometheusOperator.prometheusConfigReloaderImage.sha }}</pre><pre class="insert">+ - --prometheus-config-reloader={{ .Values.prometheusOperator.prometheusConfigReloaderImage.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.tag }}@sha256:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.sha }}</pre><pre class="insert">+ {{- else }}</pre><pre class="context"> - --prometheus-config-reloader={{ .Values.prometheusOperator.prometheusConfigReloaderImage.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloaderImage.tag }}</pre><pre class="insert">+ {{- end }}</pre><pre class="insert">+ {{- if .Values.prometheusOperator.configmapReloadImage.sha }}</pre><pre class="insert">+ - --config-reloader-image={{ .Values.prometheusOperator.configmapReloadImage.repository }}:{{ .Values.prometheusOperator.configmapReloadImage.tag }}@sha256:{{ .Values.prometheusOperator.configmapReloadImage.sha }}</pre><pre class="insert">+ {{- else }}</pre><pre class="context"> - --config-reloader-image={{ .Values.prometheusOperator.configmapReloadImage.repository }}:{{ .Values.prometheusOperator.configmapReloadImage.tag }}</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> - --config-reloader-cpu={{ .Values.prometheusOperator.configReloaderCpu }}</pre><pre class="context"> - --config-reloader-memory={{ .Values.prometheusOperator.configReloaderMemory }}</pre><pre class="context"> ports:</pre><pre class="info">@@ -73,7 +85,11 @@ spec:</pre><pre class="context"> readOnlyRootFilesystem: true</pre><pre class="context"> {{- if .Values.prometheusOperator.tlsProxy.enabled }}</pre><pre class="context"> - name: tls-proxy</pre><pre class="insert">+ {{- if .Values.prometheusOperator.tlsProxy.image.sha }}</pre><pre class="insert">+ image: {{ .Values.prometheusOperator.tlsProxy.image.repository }}:{{ .Values.prometheusOperator.tlsProxy.image.tag }}@sha256:{{ .Values.prometheusOperator.tlsProxy.image.sha }}</pre><pre class="insert">+ {{- else }}</pre><pre class="context"> image: {{ .Values.prometheusOperator.tlsProxy.image.repository }}:{{ .Values.prometheusOperator.tlsProxy.image.tag }}</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> imagePullPolicy: {{ .Values.prometheusOperator.tlsProxy.image.pullPolicy }}</pre><pre class="context"> args:</pre><pre class="context"> - server</pre></div><h2>stable/prometheus-operator/templates/prometheus-operator/psp.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus-operator/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml</pre><pre class="context">index e20204241..307bc312d 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus-operator/psp.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml</pre><pre class="info">@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1</pre><pre class="context"> kind: PodSecurityPolicy</pre><pre class="context"> metadata:</pre><pre class="context"> name: {{ template "prometheus-operator.fullname" . }}-operator</pre><pre class="delete">- namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="context"> labels:</pre><pre class="context"> app: {{ template "prometheus-operator.name" . }}-operator</pre><pre class="context"> {{- if .Values.global.rbac.pspAnnotations }}</pre></div><h2>dev/null</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus/ingressThanosSidecar.yaml b/stable/prometheus-operator/templates/prometheus/ingressThanosSidecar.yaml</pre><pre class="context">new file mode 100644</pre><pre class="context">index 000000000..6bf8ef8c0</pre><pre class="delete">--- /dev/null</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus/ingressThanosSidecar.yaml</pre><pre class="info">@@ -0,0 +1,48 @@</pre><pre class="insert">+{{- if and .Values.prometheus.enabled .Values.prometheus.thanosIngress.enabled }}</pre><pre class="insert">+{{- $serviceName := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }}</pre><pre class="insert">+{{- $thanosPort := .Values.prometheus.thanosIngress.servicePort -}}</pre><pre class="insert">+{{- $routePrefix := list .Values.prometheus.prometheusSpec.routePrefix }}</pre><pre class="insert">+{{- $paths := .Values.prometheus.thanosIngress.paths | default $routePrefix -}}</pre><pre class="insert">+apiVersion: extensions/v1beta1</pre><pre class="insert">+kind: Ingress</pre><pre class="insert">+metadata:</pre><pre class="insert">+{{- if .Values.prometheus.thanosIngress.annotations }}</pre><pre class="insert">+ annotations:</pre><pre class="insert">+{{ toYaml .Values.prometheus.thanosIngress.annotations | indent 4 }}</pre><pre class="insert">+{{- end }}</pre><pre class="insert">+ name: {{ template "prometheus-operator.fullname" . }}-thanos-gateway</pre><pre class="insert">+ labels:</pre><pre class="insert">+ app: {{ template "prometheus-operator.name" . }}-prometheus</pre><pre class="insert">+{{ include "prometheus-operator.labels" . | indent 4 }}</pre><pre class="insert">+{{- if .Values.prometheus.thanosIngress.labels }}</pre><pre class="insert">+{{ toYaml .Values.prometheus.thanosIngress.labels | indent 4 }}</pre><pre class="insert">+{{- end }}</pre><pre class="insert">+spec:</pre><pre class="insert">+ rules:</pre><pre class="insert">+ {{- if .Values.prometheus.thanosIngress.hosts }}</pre><pre class="insert">+ {{- range $host := .Values.prometheus.thanosIngress.hosts }}</pre><pre class="insert">+ - host: {{ tpl $host $ }}</pre><pre class="insert">+ http:</pre><pre class="insert">+ paths:</pre><pre class="insert">+ {{- range $p := $paths }}</pre><pre class="insert">+ - path: {{ tpl $p $ }}</pre><pre class="insert">+ backend:</pre><pre class="insert">+ serviceName: {{ $serviceName }}</pre><pre class="insert">+ servicePort: {{ $thanosPort }}</pre><pre class="insert">+ {{- end -}}</pre><pre class="insert">+ {{- end -}}</pre><pre class="insert">+ {{- else }}</pre><pre class="insert">+ - http:</pre><pre class="insert">+ paths:</pre><pre class="insert">+ {{- range $p := $paths }}</pre><pre class="insert">+ - path: {{ tpl $p $ }}</pre><pre class="insert">+ backend:</pre><pre class="insert">+ serviceName: {{ $serviceName }}</pre><pre class="insert">+ servicePort: {{ $thanosPort }}</pre><pre class="insert">+ {{- end -}}</pre><pre class="insert">+ {{- end -}}</pre><pre class="insert">+ {{- if .Values.prometheus.thanosIngress.tls }}</pre><pre class="insert">+ tls:</pre><pre class="insert">+{{ toYaml .Values.prometheus.thanosIngress.tls | indent 4 }}</pre><pre class="insert">+ {{- end -}}</pre><pre class="insert">+{{- end -}}</pre></div><h2>stable/prometheus-operator/templates/prometheus/prometheus.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml</pre><pre class="context">index 894b346dd..210fd50fe 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml</pre><pre class="info">@@ -34,6 +34,9 @@ spec:</pre><pre class="context"> {{- if .Values.prometheus.prometheusSpec.image }}</pre><pre class="context"> baseImage: {{ .Values.prometheus.prometheusSpec.image.repository }}</pre><pre class="context"> version: {{ .Values.prometheus.prometheusSpec.image.tag }}</pre><pre class="insert">+ {{- if .Values.prometheus.prometheusSpec.image.sha }}</pre><pre class="insert">+ sha: {{ .Values.prometheus.prometheusSpec.image.sha }}</pre><pre class="insert">+ {{- end }}</pre><pre class="context"> {{- end }}</pre><pre class="context"> {{- if .Values.prometheus.prometheusSpec.externalLabels }}</pre><pre class="context"> externalLabels:</pre><pre class="info">@@ -201,11 +204,16 @@ spec:</pre><pre class="context"> imagePullSecrets:</pre><pre class="context"> {{ toYaml .Values.global.imagePullSecrets | indent 4 }}</pre><pre class="context"> {{- end }}</pre><pre class="delete">-{{- if or .Values.prometheus.prometheusSpec.additionalScrapeConfigs .Values.prometheus.prometheusSpec.additionalScrapeConfigsExternal }}</pre><pre class="insert">+{{- if .Values.prometheus.prometheusSpec.additionalScrapeConfigs }}</pre><pre class="context"> additionalScrapeConfigs:</pre><pre class="context"> name: {{ template "prometheus-operator.fullname" . }}-prometheus-scrape-confg</pre><pre class="context"> key: additional-scrape-configs.yaml</pre><pre class="context"> {{- end }}</pre><pre class="insert">+{{- if .Values.prometheus.prometheusSpec.additionalScrapeConfigsSecret.enabled }}</pre><pre class="insert">+ additionalScrapeConfigs:</pre><pre class="insert">+ name: {{ .Values.prometheus.prometheusSpec.additionalScrapeConfigsSecret.name }}</pre><pre class="insert">+ key: {{ .Values.prometheus.prometheusSpec.additionalScrapeConfigsSecret.key }}</pre><pre class="insert">+{{- end }}</pre><pre class="context"> {{- if .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs }}</pre><pre class="context"> additionalAlertManagerConfigs:</pre><pre class="context"> name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-confg</pre></div><h2>stable/prometheus-operator/templates/prometheus/psp.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/templates/prometheus/psp.yaml b/stable/prometheus-operator/templates/prometheus/psp.yaml</pre><pre class="context">index 6a238f88b..4ba198155 100644</pre><pre class="delete">--- a/stable/prometheus-operator/templates/prometheus/psp.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/templates/prometheus/psp.yaml</pre><pre class="info">@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1</pre><pre class="context"> kind: PodSecurityPolicy</pre><pre class="context"> metadata:</pre><pre class="context"> name: {{ template "prometheus-operator.fullname" . }}-prometheus</pre><pre class="delete">- namespace: {{ template "prometheus-operator.namespace" . }}</pre><pre class="context"> labels:</pre><pre class="context"> app: {{ template "prometheus-operator.name" . }}-prometheus</pre><pre class="context"> {{- if .Values.global.rbac.pspAnnotations }}</pre></div><h2>stable/prometheus-operator/values.yaml</h2><div class="file-diff"><pre class="file">diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml</pre><pre class="context">index 068e08094..bcbccb6f5 100644</pre><pre class="delete">--- a/stable/prometheus-operator/values.yaml</pre><pre class="insert">+++ b/stable/prometheus-operator/values.yaml</pre><pre class="info">@@ -34,6 +34,7 @@ defaultRules:</pre><pre class="context"> general: true</pre><pre class="context"> k8s: true</pre><pre class="context"> kubeApiserver: true</pre><pre class="insert">+ kubeApiserverAvailability: true</pre><pre class="context"> kubeApiserverError: true</pre><pre class="context"> kubeApiserverSlos: true</pre><pre class="context"> kubelet: true</pre><pre class="info">@@ -334,7 +335,8 @@ alertmanager:</pre><pre class="context"> ##</pre><pre class="context"> image:</pre><pre class="context"> repository: quay.io/prometheus/alertmanager</pre><pre class="delete">- tag: v0.20.0</pre><pre class="insert">+ tag: v0.21.0</pre><pre class="insert">+ sha: ""</pre><pre class="context"> </pre><pre class="context"> ## If true then the user will be responsible to provide a secret with alertmanager configuration</pre><pre class="context"> ## So when true the config part will be ignored (including templateFiles) and the one in the secret will be used</pre><pre class="info">@@ -528,6 +530,10 @@ grafana:</pre><pre class="context"> dashboards:</pre><pre class="context"> enabled: true</pre><pre class="context"> label: grafana_dashboard</pre><pre class="insert">+</pre><pre class="insert">+ ## Annotations for Grafana dashboard configmaps</pre><pre class="insert">+ ##</pre><pre class="insert">+ annotations: {}</pre><pre class="context"> datasources:</pre><pre class="context"> enabled: true</pre><pre class="context"> defaultDatasourceEnabled: true</pre><pre class="info">@@ -1134,6 +1140,7 @@ prometheusOperator:</pre><pre class="context"> image:</pre><pre class="context"> repository: squareup/ghostunnel</pre><pre class="context"> tag: v1.5.2</pre><pre class="insert">+ sha: ""</pre><pre class="context"> pullPolicy: IfNotPresent</pre><pre class="context"> resources: {}</pre><pre class="context"> </pre><pre class="info">@@ -1151,6 +1158,7 @@ prometheusOperator:</pre><pre class="context"> image:</pre><pre class="context"> repository: jettech/kube-webhook-certgen</pre><pre class="context"> tag: v1.2.1</pre><pre class="insert">+ sha: ""</pre><pre class="context"> pullPolicy: IfNotPresent</pre><pre class="context"> resources: {}</pre><pre class="context"> ## Provide a priority class name to the webhook patching job</pre><pre class="info">@@ -1254,6 +1262,8 @@ prometheusOperator:</pre><pre class="context"> ## Scrape interval. If not set, the Prometheus default scrape interval is used.</pre><pre class="context"> ##</pre><pre class="context"> interval: ""</pre><pre class="insert">+ ## Scrape timeout. If not set, the Prometheus default scrape timeout is used.</pre><pre class="insert">+ scrapeTimeout: ""</pre><pre class="context"> selfMonitor: true</pre><pre class="context"> </pre><pre class="context"> ## metric relabel configs to apply to samples before ingestion.</pre><pre class="info">@@ -1327,6 +1337,7 @@ prometheusOperator:</pre><pre class="context"> image:</pre><pre class="context"> repository: quay.io/coreos/prometheus-operator</pre><pre class="context"> tag: v0.38.1</pre><pre class="insert">+ sha: ""</pre><pre class="context"> pullPolicy: IfNotPresent</pre><pre class="context"> </pre><pre class="context"> ## Configmap-reload image to use for reloading configmaps</pre><pre class="info">@@ -1334,12 +1345,14 @@ prometheusOperator:</pre><pre class="context"> configmapReloadImage:</pre><pre class="context"> repository: docker.io/jimmidyson/configmap-reload</pre><pre class="context"> tag: v0.3.0</pre><pre class="insert">+ sha: ""</pre><pre class="context"> </pre><pre class="context"> ## Prometheus-config-reloader image to use for config and rule reloading</pre><pre class="context"> ##</pre><pre class="context"> prometheusConfigReloaderImage:</pre><pre class="context"> repository: quay.io/coreos/prometheus-config-reloader</pre><pre class="context"> tag: v0.38.1</pre><pre class="insert">+ sha: ""</pre><pre class="context"> </pre><pre class="context"> ## Set the prometheus config reloader side-car CPU limit</pre><pre class="context"> ##</pre><pre class="info">@@ -1354,6 +1367,7 @@ prometheusOperator:</pre><pre class="context"> hyperkubeImage:</pre><pre class="context"> repository: k8s.gcr.io/hyperkube</pre><pre class="context"> tag: v1.16.12</pre><pre class="insert">+ sha: ""</pre><pre class="context"> pullPolicy: IfNotPresent</pre><pre class="context"> </pre><pre class="context"> ## Deploy a Prometheus instance</pre><pre class="info">@@ -1442,6 +1456,30 @@ prometheus:</pre><pre class="context"> minAvailable: 1</pre><pre class="context"> maxUnavailable: ""</pre><pre class="context"> </pre><pre class="insert">+# Ingress exposes thanos sidecar outside the clsuter</pre><pre class="insert">+ thanosIngress:</pre><pre class="insert">+ enabled: false</pre><pre class="insert">+ annotations: {}</pre><pre class="insert">+ labels: {}</pre><pre class="insert">+ servicePort: 10901</pre><pre class="insert">+ ## Hosts must be provided if Ingress is enabled.</pre><pre class="insert">+ ##</pre><pre class="insert">+ hosts: []</pre><pre class="insert">+ # - thanos-gateway.domain.com</pre><pre class="insert">+</pre><pre class="insert">+ ## Paths to use for ingress rules</pre><pre class="insert">+ ##</pre><pre class="insert">+ paths: []</pre><pre class="insert">+ # - /</pre><pre class="insert">+</pre><pre class="insert">+ ## TLS configuration for Alertmanager Ingress</pre><pre class="insert">+ ## Secret must be manually created in the namespace</pre><pre class="insert">+ ##</pre><pre class="insert">+ tls: []</pre><pre class="insert">+ # - secretName: thanos-gateway-tls</pre><pre class="insert">+ # hosts:</pre><pre class="insert">+ # - thanos-gateway.domain.com</pre><pre class="insert">+</pre><pre class="context"> ingress:</pre><pre class="context"> enabled: false</pre><pre class="context"> annotations: {}</pre><pre class="info">@@ -1573,7 +1611,8 @@ prometheus:</pre><pre class="context"> ##</pre><pre class="context"> image:</pre><pre class="context"> repository: quay.io/prometheus/prometheus</pre><pre class="delete">- tag: v2.18.1</pre><pre class="insert">+ tag: v2.18.2</pre><pre class="insert">+ sha: ""</pre><pre class="context"> </pre><pre class="context"> ## Tolerations for use with node taints</pre><pre class="context"> ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/</pre><pre class="info">@@ -1859,6 +1898,14 @@ prometheus:</pre><pre class="context"> # - regex: (kubernetes_io_hostname|failure_domain_beta_kubernetes_io_region|beta_kubernetes_io_os|beta_kubernetes_io_arch|beta_kubernetes_io_instance_type|failure_domain_beta_kubernetes_io_zone)</pre><pre class="context"> # action: labeldrop</pre><pre class="context"> </pre><pre class="insert">+ ## If additional scrape configurations are already deployed in a single secret file you can use this section.</pre><pre class="insert">+ ## Expected values are the secret name and key</pre><pre class="insert">+ ## Cannot be used with additionalScrapeConfigs</pre><pre class="insert">+ additionalScrapeConfigsSecret: {}</pre><pre class="insert">+ # enabled: false</pre><pre class="insert">+ # name:</pre><pre class="insert">+ # key:</pre><pre class="insert">+</pre><pre class="context"> ## additionalPrometheusSecretsAnnotations allows to add annotations to the kubernetes secret. This can be useful</pre><pre class="context"> ## when deploying via spinnaker to disable versioning on the secret, strategy.spinnaker.io/versioned: 'false'</pre><pre class="context"> additionalPrometheusSecretsAnnotations: {}</pre><pre class="info">@@ -1921,18 +1968,6 @@ prometheus:</pre><pre class="context"> ## (permissions, dir tree) on mounted volumes before starting prometheus</pre><pre class="context"> initContainers: []</pre><pre class="context"> </pre><pre class="delete">- ## Enable additional scrape configs that are managed externally to this chart. Note that the prometheus</pre><pre class="delete">- ## will fail to provision if the correct secret does not exist.</pre><pre class="delete">- ## This option requires that you are maintaining a secret in the same namespace as Prometheus with</pre><pre class="delete">- ## a name of 'prometheus-operator-prometheus-scrape-confg' and a key of 'additional-scrape-configs.yaml' that</pre><pre class="delete">- ## contains a list of scrape_config's. The name of the secret may vary if you utilize the "fullnameOverride".</pre><pre class="delete">- ## This feature cannot be used in conjunction with the additionalScrapeConfigs attribute (the helm-generated</pre><pre class="delete">- ## secret will overwrite your self-maintained secret).</pre><pre class="delete">- ##</pre><pre class="delete">- ## scrape_config docs: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config</pre><pre class="delete">- ## explanation of "confg" typo: https://github.com/helm/charts/issues/13368</pre><pre class="delete">- additionalScrapeConfigsExternal: false</pre><pre class="delete">-</pre><pre class="context"> ## PortName to use for Prometheus.</pre><pre class="context"> ##</pre><pre class="context"> portName: "web"</pre></div></div></body></html> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment