Skip to content

Commit

Permalink
Synchronize version of thanos as it was downgraded and the sync bot i…
Browse files Browse the repository at this point in the history
…s disabled

Synchronize version of kubeRbacProxy

Signed-off-by: Ayoub Mrini <amrini@redhat.com>
  • Loading branch information
machine424 committed May 25, 2023
1 parent df2483b commit 246d611
Show file tree
Hide file tree
Showing 28 changed files with 46 additions and 46 deletions.
6 changes: 3 additions & 3 deletions assets/alertmanager-user-workload/alertmanager.yaml
Expand Up @@ -30,7 +30,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --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
- --logtostderr=true
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: alertmanager-proxy
ports:
- containerPort: 9095
Expand All @@ -56,7 +56,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --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
- --logtostderr=true
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: tenancy-proxy
ports:
- containerPort: 9092
Expand Down Expand Up @@ -86,7 +86,7 @@ spec:
- --client-ca-file=/etc/tls/client/client-ca.crt
- --logtostderr=true
- --allow-paths=/metrics
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-metric
ports:
- containerPort: 9097
Expand Down
4 changes: 2 additions & 2 deletions assets/alertmanager/alertmanager.yaml
Expand Up @@ -72,7 +72,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --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
- --logtostderr=true
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy
ports:
- containerPort: 9092
Expand All @@ -97,7 +97,7 @@ spec:
- --client-ca-file=/etc/tls/client/client-ca.crt
- --logtostderr=true
- --allow-paths=/metrics
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-metric
ports:
- containerPort: 9097
Expand Down
4 changes: 2 additions & 2 deletions assets/kube-state-metrics/deployment.yaml
Expand Up @@ -73,7 +73,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --client-ca-file=/etc/tls/client/client-ca.crt
- --config-file=/etc/kube-rbac-policy/config.yaml
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
Expand Down Expand Up @@ -103,7 +103,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --client-ca-file=/etc/tls/client/client-ca.crt
- --config-file=/etc/kube-rbac-policy/config.yaml
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
Expand Down
2 changes: 1 addition & 1 deletion assets/node-exporter/daemonset.yaml
Expand Up @@ -76,7 +76,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy
ports:
- containerPort: 9100
Expand Down
4 changes: 2 additions & 2 deletions assets/openshift-state-metrics/deployment.yaml
Expand Up @@ -34,7 +34,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --config-file=/etc/kube-rbac-policy/config.yaml
- --client-ca-file=/etc/tls/client/client-ca.crt
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
Expand Down Expand Up @@ -62,7 +62,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --config-file=/etc/kube-rbac-policy/config.yaml
- --client-ca-file=/etc/tls/client/client-ca.crt
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
Expand Down
8 changes: 4 additions & 4 deletions assets/prometheus-k8s/prometheus.yaml
Expand Up @@ -89,7 +89,7 @@ spec:
- --client-ca-file=/etc/tls/client/client-ca.crt
- --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
- --logtostderr=true
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy
ports:
- containerPort: 9092
Expand Down Expand Up @@ -122,7 +122,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-thanos
ports:
- containerPort: 10902
Expand Down Expand Up @@ -205,10 +205,10 @@ spec:
openshift.io/cluster-monitoring: "true"
serviceMonitorSelector: {}
thanos:
image: quay.io/thanos/thanos:v0.31.0
image: quay.io/thanos/thanos:v0.30.2
resources:
requests:
cpu: 1m
memory: 100Mi
version: 0.31.0
version: 0.30.2
version: 2.43.0
2 changes: 1 addition & 1 deletion assets/prometheus-operator-user-workload/deployment.yaml
Expand Up @@ -63,7 +63,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --config-file=/etc/kube-rbac-policy/config.yaml
- --client-ca-file=/etc/tls/client/client-ca.crt
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy
ports:
- containerPort: 8443
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-operator/deployment.yaml
Expand Up @@ -64,7 +64,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --client-ca-file=/etc/tls/client/client-ca.crt
- --config-file=/etc/kube-rbac-policy/config.yaml
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy
ports:
- containerPort: 8443
Expand Down
10 changes: 5 additions & 5 deletions assets/prometheus-user-workload/prometheus.yaml
Expand Up @@ -48,7 +48,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --client-ca-file=/etc/tls/client/client-ca.crt
- --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
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-federate
ports:
- containerPort: 9092
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
- --tls-private-key-file=/etc/tls/private/tls.key
- --client-ca-file=/etc/tls/client/client-ca.crt
- --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
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-metrics
ports:
- containerPort: 9091
Expand Down Expand Up @@ -118,7 +118,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-thanos
ports:
- containerPort: 10902
Expand Down Expand Up @@ -247,10 +247,10 @@ spec:
- "false"
serviceMonitorSelector: {}
thanos:
image: quay.io/thanos/thanos:v0.31.0
image: quay.io/thanos/thanos:v0.30.2
resources:
requests:
cpu: 1m
memory: 100Mi
version: 0.31.0
version: 0.30.2
version: 2.43.0
2 changes: 1 addition & 1 deletion assets/telemeter-client/deployment.yaml
Expand Up @@ -88,7 +88,7 @@ spec:
- --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
- --config-file=/etc/kube-rbac-policy/config.yaml
- --client-ca-file=/etc/tls/client/client-ca.crt
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy
ports:
- containerPort: 8443
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/cluster-role-binding.yaml
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/cluster-role.yaml
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
rules:
- apiGroups:
Expand Down
12 changes: 6 additions & 6 deletions assets/thanos-querier/deployment.yaml
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.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand All @@ -31,7 +31,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.31.0
app.kubernetes.io/version: 0.30.2
spec:
affinity:
podAntiAffinity:
Expand Down Expand Up @@ -66,7 +66,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.hostIP
image: quay.io/thanos/thanos:v0.31.0
image: quay.io/thanos/thanos:v0.30.2
imagePullPolicy: IfNotPresent
name: thanos-query
ports:
Expand Down Expand Up @@ -148,7 +148,7 @@ spec:
- --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
- --logtostderr=true
- --allow-paths=/api/v1/query,/api/v1/query_range,/api/v1/labels,/api/v1/label/*/values,/api/v1/series
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy
ports:
- containerPort: 9092
Expand Down Expand Up @@ -195,7 +195,7 @@ spec:
- --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
- --logtostderr=true
- --allow-paths=/api/v1/rules
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-rules
ports:
- containerPort: 9093
Expand Down Expand Up @@ -225,7 +225,7 @@ spec:
- --client-ca-file=/etc/tls/client/client-ca.crt
- --logtostderr=true
- --allow-paths=/metrics
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
image: quay.io/brancz/kube-rbac-proxy:v0.14.1
name: kube-rbac-proxy-metrics
ports:
- containerPort: 9094
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/grpc-tls-secret.yaml
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
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
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
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
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
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
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier-oauth-cookie
namespace: openshift-monitoring
type: Opaque
2 changes: 1 addition & 1 deletion assets/thanos-querier/pod-disruption-budget.yaml
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier-pdb
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/prometheus-rule.yaml
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/route.yaml
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/service-account.yaml
Expand Up @@ -8,6 +8,6 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
namespace: openshift-monitoring
2 changes: 1 addition & 1 deletion assets/thanos-querier/service-monitor.yaml
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-querier/service.yaml
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/instance: thanos-querier
app.kubernetes.io/name: thanos-query
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-querier
namespace: openshift-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-ruler/service-account.yaml
Expand Up @@ -8,6 +8,6 @@ metadata:
app.kubernetes.io/instance: thanos-ruler
app.kubernetes.io/name: thanos-rule
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-ruler
namespace: openshift-user-workload-monitoring
2 changes: 1 addition & 1 deletion assets/thanos-ruler/service-monitor.yaml
Expand Up @@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: thanos-ruler
app.kubernetes.io/name: thanos-rule
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-ruler
namespace: openshift-user-workload-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-ruler/service.yaml
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/instance: thanos-ruler
app.kubernetes.io/name: thanos-rule
app.kubernetes.io/part-of: openshift-monitoring
app.kubernetes.io/version: 0.31.0
app.kubernetes.io/version: 0.30.2
name: thanos-ruler
namespace: openshift-user-workload-monitoring
spec:
Expand Down
2 changes: 1 addition & 1 deletion assets/thanos-ruler/thanos-ruler.yaml
Expand Up @@ -113,7 +113,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.31.0
image: quay.io/thanos/thanos:v0.30.2
listenLocal: true
podMetadata:
annotations:
Expand Down
4 changes: 2 additions & 2 deletions jsonnet/versions.yaml
Expand Up @@ -14,11 +14,11 @@ repos:
thanos: openshift/thanos
versions:
alertmanager: 0.25.0
kubeRbacProxy: 0.14.0
kubeRbacProxy: 0.14.1
kubeStateMetrics: 2.8.2
nodeExporter: 1.5.0
promLabelProxy: 0.6.0
prometheus: 2.43.0
prometheusAdapter: 0.10.0
prometheusOperator: 0.63.0
thanos: 0.31.0
thanos: 0.30.2

0 comments on commit 246d611

Please sign in to comment.