Skip to content

Commit

Permalink
Merge pull request #1297 from arajkumar/bump-thanos-to-v0.22.0
Browse files Browse the repository at this point in the history
Bug 1973576: Bump thanos to v0.22.0
  • Loading branch information
openshift-merge-robot committed Jul 27, 2021
2 parents e302364 + f67569d commit 1a178fc
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions assets/prometheus-k8s/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,10 @@ spec:
openshift.io/cluster-monitoring: "true"
serviceMonitorSelector: {}
thanos:
image: quay.io/thanos/thanos:v0.20.2
image: quay.io/thanos/thanos:v0.22.0
resources:
requests:
cpu: 1m
memory: 100Mi
version: 0.20.2
version: 0.22.0
version: 2.26.1
4 changes: 2 additions & 2 deletions assets/prometheus-user-workload/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ spec:
- "true"
serviceMonitorSelector: {}
thanos:
image: quay.io/thanos/thanos:v0.20.2
image: quay.io/thanos/thanos:v0.22.0
resources:
requests:
cpu: 1m
memory: 100Mi
version: 0.20.2
version: 0.22.0
version: 2.26.1
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 @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.0
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand All @@ -26,7 +26,7 @@ spec:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.0
spec:
affinity:
podAntiAffinity:
Expand Down Expand Up @@ -60,7 +60,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.hostIP
image: quay.io/thanos/thanos:v0.20.2
image: quay.io/thanos/thanos:v0.22.0
name: thanos-query
ports:
- containerPort: 9090
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 @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.0
name: thanos-querier-grpc-tls
namespace: openshift-monitoring
type: Opaque
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 @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.0
name: thanos-querier-kube-rbac-proxy
namespace: openshift-monitoring
stringData:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/oauth-cookie-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.0
name: thanos-querier-oauth-cookie
namespace: openshift-monitoring
type: Opaque
2 changes: 1 addition & 1 deletion assets/thanos-querier/oauth-htpasswd-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.0
name: thanos-querier-oauth-htpasswd
namespace: openshift-monitoring
type: Opaque
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 @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.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 @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: query-layer
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/version: 0.20.2
app.kubernetes.io/version: 0.22.0
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-ruler/thanos-ruler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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.20.2
image: quay.io/thanos/thanos:v0.22.0
listenLocal: true
podMetadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion jsonnet/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"prometheusOperator": "0.49.0",
"promLabelProxy": "0.3.0",
"kubeRbacProxy": "0.9.0",
"thanos": "0.20.2"
"thanos": "0.22.0"
}

0 comments on commit 1a178fc

Please sign in to comment.