Skip to content

Commit

Permalink
Merge pull request #2338 from rhobs/automated-updates-master-versions…
Browse files Browse the repository at this point in the history
…-generate

MON-3851: Bump openshift/thanos to v0.35.0
  • Loading branch information
openshift-merge-bot[bot] committed May 7, 2024
2 parents ac5f674 + 7cabe50 commit 6c9136a
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Documentation/deps-versions.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
| OCP Version | alertmanager | kubeRbacProxy | kubeStateMetrics | kubernetesMetricsServer | monitoringPlugin | nodeExporter | promLabelProxy | prometheus | prometheusAdapter | prometheusOperator | thanos |
|--------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------|-----------------------------------------------------------------------|--------------------------------------------------------------------------|---------------------------------------------------------------------|---------------------------------------------------------------------------------|------------------------------------------------------------------------------|-----------------------------------------------------------------|
| release-4.17 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.17) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.17) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.17) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.17) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.17) | [1.8.0](https://github.com/openshift/node_exporter/blob/release-4.17) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.17) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.17) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.17) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.17) | [0.34.1](https://github.com/openshift/thanos/blob/release-4.17) |
| release-4.16 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.16) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.16) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.16) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.16) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.16) | [1.8.0](https://github.com/openshift/node_exporter/blob/release-4.16) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.16) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.16) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.16) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.16) | [0.34.1](https://github.com/openshift/thanos/blob/release-4.16) |
| release-4.17 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.17) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.17) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.17) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.17) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.17) | [1.8.0](https://github.com/openshift/node_exporter/blob/release-4.17) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.17) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.17) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.17) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.17) | [0.35.0](https://github.com/openshift/thanos/blob/release-4.17) |
| release-4.16 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.16) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.16) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.16) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.16) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.16) | [1.8.0](https://github.com/openshift/node_exporter/blob/release-4.16) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.16) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.16) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.16) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.16) | [0.35.0](https://github.com/openshift/thanos/blob/release-4.16) |
| release-4.15 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.15) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.15) | [2.10.1](https://github.com/openshift/kube-state-metrics/blob/release-4.15) | [0.6.4](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.15) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.15) | [1.7.0](https://github.com/openshift/node_exporter/blob/release-4.15) | [0.7.0](https://github.com/openshift/prom-label-proxy/blob/release-4.15) | [2.48.0](https://github.com/openshift/prometheus/blob/release-4.15) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.15) | [0.70.0](https://github.com/openshift/prometheus-operator/blob/release-4.15) | [0.32.5](https://github.com/openshift/thanos/blob/release-4.15) |
| release-4.14 | [0.25.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.14) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.14) | [2.9.2](https://github.com/openshift/kube-state-metrics/blob/release-4.14) | [0.6.4](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.14) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.14) | [1.6.1](https://github.com/openshift/node_exporter/blob/release-4.14) | [0.7.0](https://github.com/openshift/prom-label-proxy/blob/release-4.14) | [2.46.0](https://github.com/openshift/prometheus/blob/release-4.14) | [0.10.0](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.14) | [0.67.1](https://github.com/openshift/prometheus-operator/blob/release-4.14) | [0.30.2](https://github.com/openshift/thanos/blob/release-4.14) |
| release-4.13 | [0.25.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.13) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.13) | [2.8.1](https://github.com/openshift/kube-state-metrics/blob/release-4.13) | N/A | N/A | [1.5.0](https://github.com/openshift/node_exporter/blob/release-4.13) | [0.6.0](https://github.com/openshift/prom-label-proxy/blob/release-4.13) | [2.42.0](https://github.com/openshift/prometheus/blob/release-4.13) | [0.10.0](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.13) | [0.63.0](https://github.com/openshift/prometheus-operator/blob/release-4.13) | [0.30.2](https://github.com/openshift/thanos/blob/release-4.13) |
Expand Down
4 changes: 2 additions & 2 deletions assets/prometheus-k8s/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@ spec:
openshift.io/cluster-monitoring: "true"
serviceMonitorSelector: {}
thanos:
image: quay.io/thanos/thanos:v0.34.1
image: quay.io/thanos/thanos:v0.35.0
resources:
requests:
cpu: 1m
memory: 100Mi
version: 0.34.1
version: 0.35.0
version: 2.51.2
volumes:
- configMap:
Expand Down
4 changes: 2 additions & 2 deletions assets/prometheus-user-workload/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,10 @@ spec:
- "false"
serviceMonitorSelector: {}
thanos:
image: quay.io/thanos/thanos:v0.34.1
image: quay.io/thanos/thanos:v0.35.0
resources:
requests:
cpu: 1m
memory: 100Mi
version: 0.34.1
version: 0.35.0
version: 2.51.2
2 changes: 1 addition & 1 deletion assets/thanos-querier/cluster-role-binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
rules:
- apiGroups:
Expand Down
6 changes: 3 additions & 3 deletions assets/thanos-querier/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand All @@ -32,7 +32,7 @@ spec:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
spec:
affinity:
podAntiAffinity:
Expand Down Expand Up @@ -67,7 +67,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.hostIP
image: quay.io/thanos/thanos:v0.34.1
image: quay.io/thanos/thanos:v0.35.0
imagePullPolicy: IfNotPresent
name: thanos-query
ports:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/grpc-tls-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier-grpc-tls
namespace: openshift-monitoring
type: Opaque
2 changes: 1 addition & 1 deletion assets/thanos-querier/kube-rbac-proxy-metric-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier-kube-rbac-proxy-metrics
namespace: openshift-monitoring
stringData:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/kube-rbac-proxy-rules-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier-kube-rbac-proxy-rules
namespace: openshift-monitoring
stringData:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/kube-rbac-proxy-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier-kube-rbac-proxy
namespace: openshift-monitoring
stringData:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/kube-rbac-proxy-web-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier-kube-rbac-proxy-web
namespace: openshift-monitoring
stringData:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/pod-disruption-budget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier-pdb
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/prometheus-rule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/route.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
namespace: openshift-monitoring
2 changes: 1 addition & 1 deletion assets/thanos-querier/service-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-ruler/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-rule
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-ruler
namespace: openshift-user-workload-monitoring
2 changes: 1 addition & 1 deletion assets/thanos-ruler/service-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-rule
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-ruler
namespace: openshift-user-workload-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-ruler/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
app.kubernetes.io/managed-by: cluster-monitoring-operator
app.kubernetes.io/name: thanos-rule
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.34.1
app.kubernetes.io/version: 0.35.0
name: thanos-ruler
namespace: openshift-user-workload-monitoring
spec:
Expand Down
4 changes: 2 additions & 2 deletions assets/thanos-ruler/thanos-ruler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ spec:
caFile: /etc/tls/grpc/ca.crt
certFile: /etc/tls/grpc/server.crt
keyFile: /etc/tls/grpc/server.key
image: quay.io/thanos/thanos:v0.34.1
image: quay.io/thanos/thanos:v0.35.0
listenLocal: true
podMetadata:
annotations:
Expand Down Expand Up @@ -140,7 +140,7 @@ spec:
seccompProfile:
type: RuntimeDefault
serviceAccountName: thanos-ruler
version: 0.34.1
version: 0.35.0
volumes:
- configmap:
items:
Expand Down
2 changes: 1 addition & 1 deletion jsonnet/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ versions:
prometheus: 2.51.2
prometheusAdapter: 0.11.2
prometheusOperator: 0.73.2
thanos: 0.34.1
thanos: 0.35.0

0 comments on commit 6c9136a

Please sign in to comment.