Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • github-mirror/prometheus-operator/kube-prometheus
1 result
Show changes
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
...@@ -23,19 +23,19 @@ spec: ...@@ -23,19 +23,19 @@ spec:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
spec: spec:
automountServiceAccountToken: true automountServiceAccountToken: true
containers: containers:
- args: - args:
- --kubelet-service=kube-system/kubelet - --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.0 - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.80.1
- --kubelet-endpoints=true - --kubelet-endpoints=true
- --kubelet-endpointslice=false - --kubelet-endpointslice=false
env: env:
- name: GOGC - name: GOGC
value: "30" value: "30"
image: quay.io/prometheus-operator/prometheus-operator:v0.80.0 image: quay.io/prometheus-operator/prometheus-operator:v0.80.1
name: prometheus-operator name: prometheus-operator
ports: ports:
- containerPort: 8080 - containerPort: 8080
...@@ -57,7 +57,7 @@ spec: ...@@ -57,7 +57,7 @@ spec:
- --secure-listen-address=:8443 - --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8080/ - --upstream=http://127.0.0.1:8080/
image: quay.io/brancz/kube-rbac-proxy:v0.18.2 image: quay.io/brancz/kube-rbac-proxy:v0.19.0
name: kube-rbac-proxy name: kube-rbac-proxy
ports: ports:
- containerPort: 8443 - containerPort: 8443
......
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
prometheus: k8s prometheus: k8s
role: alert-rules role: alert-rules
name: prometheus-operator-rules name: prometheus-operator-rules
......
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
......
...@@ -6,6 +6,6 @@ metadata: ...@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
...@@ -5,7 +5,7 @@ metadata: ...@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
name: prometheus-operator name: prometheus-operator
namespace: monitoring namespace: monitoring
spec: spec:
...@@ -21,4 +21,4 @@ spec: ...@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.80.0 app.kubernetes.io/version: 0.80.1
...@@ -5298,6 +5298,15 @@ spec: ...@@ -5298,6 +5298,15 @@ spec:
ServiceAccountName is the name of the ServiceAccount to use to run the ServiceAccountName is the name of the ServiceAccount to use to run the
Prometheus Pods. Prometheus Pods.
type: string type: string
serviceName:
description: |-
The name of the service name used by the underlying StatefulSet(s) as the governing service.
If defined, the Service must be created before the Alertmanager resource in the same namespace and it must define a selector that matches the pod labels.
If empty, the operator will create and manage a headless service named `alertmanager-operated` for Alermanager resources.
When deploying multiple Alertmanager resources in the same namespace, it is recommended to specify a different value for each.
See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
minLength: 1
type: string
sha: sha:
description: |- description: |-
SHA of Alertmanager container image to be deployed. Defaults to the value of `version`. SHA of Alertmanager container image to be deployed. Defaults to the value of `version`.
......
...@@ -8617,7 +8617,7 @@ spec: ...@@ -8617,7 +8617,7 @@ spec:
type: string type: string
shards: shards:
description: |- description: |-
Number of shards to distribute scraped targets onto. Number of shards to distribute the scraped targets onto.
   
`spec.replicas` multiplied by `spec.shards` is the total number of Pods `spec.replicas` multiplied by `spec.shards` is the total number of Pods
being created. being created.
...@@ -8627,11 +8627,11 @@ spec: ...@@ -8627,11 +8627,11 @@ spec:
Note that scaling down shards will not reshard data onto the remaining Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or instances. To query globally, use either
remote write data to a central location. * Thanos sidecar + querier for query federation and Thanos Ruler for rules.
Alerting and recording rules * Remote-write to send metrics to a central location.
   
By default, the sharding is performed on: By default, the sharding of targets is performed on:
* The `__address__` target's metadata label for PodMonitor, * The `__address__` target's metadata label for PodMonitor,
ServiceMonitor and ScrapeConfig resources. ServiceMonitor and ScrapeConfig resources.
* The `__param_target__` label for Probe resources. * The `__param_target__` label for Probe resources.
......
...@@ -7007,7 +7007,7 @@ spec: ...@@ -7007,7 +7007,7 @@ spec:
type: string type: string
shards: shards:
description: |- description: |-
Number of shards to distribute scraped targets onto. Number of shards to distribute the scraped targets onto.
   
`spec.replicas` multiplied by `spec.shards` is the total number of Pods `spec.replicas` multiplied by `spec.shards` is the total number of Pods
being created. being created.
...@@ -7017,11 +7017,11 @@ spec: ...@@ -7017,11 +7017,11 @@ spec:
Note that scaling down shards will not reshard data onto the remaining Note that scaling down shards will not reshard data onto the remaining
instances, it must be manually moved. Increasing shards will not reshard instances, it must be manually moved. Increasing shards will not reshard
data either but it will continue to be available from the same data either but it will continue to be available from the same
instances. To query globally, use Thanos sidecar and Thanos querier or instances. To query globally, use either
remote write data to a central location. * Thanos sidecar + querier for query federation and Thanos Ruler for rules.
Alerting and recording rules * Remote-write to send metrics to a central location.
   
By default, the sharding is performed on: By default, the sharding of targets is performed on:
* The `__address__` target's metadata label for PodMonitor, * The `__address__` target's metadata label for PodMonitor,
ServiceMonitor and ScrapeConfig resources. ServiceMonitor and ScrapeConfig resources.
* The `__param_target__` label for Probe resources. * The `__param_target__` label for Probe resources.
......
...@@ -4754,6 +4754,15 @@ spec: ...@@ -4754,6 +4754,15 @@ spec:
ServiceAccountName is the name of the ServiceAccount to use to run the ServiceAccountName is the name of the ServiceAccount to use to run the
Thanos Ruler Pods. Thanos Ruler Pods.
type: string type: string
serviceName:
description: |-
The name of the service name used by the underlying StatefulSet(s) as the governing service.
If defined, the Service must be created before the ThanosRuler resource in the same namespace and it must define a selector that matches the pod labels.
If empty, the operator will create and manage a headless service named `thanos-ruler-operated` for ThanosRuler resources.
When deploying multiple ThanosRuler resources in the same namespace, it is recommended to specify a different value for each.
See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
minLength: 1
type: string
storage: storage:
description: Storage spec to specify how storage shall be used. description: Storage spec to specify how storage shall be used.
properties: properties:
......