From c62fcb2d9244324ee57a895fcc7569fbb4dce69e Mon Sep 17 00:00:00 2001 From: Ayoub Mrini Date: Thu, 25 May 2023 12:07:13 +0200 Subject: [PATCH] Fix versions CI job by using the latest versions downstream. The versions in jsonnet/versions.yaml are only used as metadata (added as Kube labels) CMO is already using the appropriate versions from downstream. Signed-off-by: Ayoub Mrini --- assets/alertmanager-user-workload/alertmanager.yaml | 6 +++--- assets/alertmanager/alertmanager.yaml | 4 ++-- assets/kube-state-metrics/deployment.yaml | 4 ++-- assets/node-exporter/daemonset.yaml | 2 +- assets/openshift-state-metrics/deployment.yaml | 4 ++-- assets/prometheus-k8s/prometheus.yaml | 8 ++++---- .../deployment.yaml | 2 +- assets/prometheus-operator/deployment.yaml | 2 +- assets/prometheus-user-workload/prometheus.yaml | 10 +++++----- assets/telemeter-client/deployment.yaml | 2 +- assets/thanos-querier/cluster-role-binding.yaml | 2 +- assets/thanos-querier/cluster-role.yaml | 2 +- assets/thanos-querier/deployment.yaml | 12 ++++++------ assets/thanos-querier/grpc-tls-secret.yaml | 2 +- .../thanos-querier/kube-rbac-proxy-rules-secret.yaml | 2 +- assets/thanos-querier/kube-rbac-proxy-secret.yaml | 2 +- assets/thanos-querier/oauth-cookie-secret.yaml | 2 +- assets/thanos-querier/pod-disruption-budget.yaml | 2 +- assets/thanos-querier/prometheus-rule.yaml | 2 +- assets/thanos-querier/route.yaml | 2 +- assets/thanos-querier/service-account.yaml | 2 +- assets/thanos-querier/service-monitor.yaml | 2 +- assets/thanos-querier/service.yaml | 2 +- assets/thanos-ruler/service-account.yaml | 2 +- assets/thanos-ruler/service-monitor.yaml | 2 +- assets/thanos-ruler/service.yaml | 2 +- assets/thanos-ruler/thanos-ruler.yaml | 2 +- jsonnet/versions.yaml | 4 ++-- 28 files changed, 46 insertions(+), 46 deletions(-) diff --git a/assets/alertmanager-user-workload/alertmanager.yaml b/assets/alertmanager-user-workload/alertmanager.yaml index 3539f2530d..103f0b8021 100644 --- a/assets/alertmanager-user-workload/alertmanager.yaml +++ b/assets/alertmanager-user-workload/alertmanager.yaml @@ -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 @@ -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 @@ -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 diff --git a/assets/alertmanager/alertmanager.yaml b/assets/alertmanager/alertmanager.yaml index 008d0008c4..fb094853fb 100644 --- a/assets/alertmanager/alertmanager.yaml +++ b/assets/alertmanager/alertmanager.yaml @@ -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 @@ -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 diff --git a/assets/kube-state-metrics/deployment.yaml b/assets/kube-state-metrics/deployment.yaml index 0d72bf6ca4..bff8803697 100644 --- a/assets/kube-state-metrics/deployment.yaml +++ b/assets/kube-state-metrics/deployment.yaml @@ -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 @@ -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 diff --git a/assets/node-exporter/daemonset.yaml b/assets/node-exporter/daemonset.yaml index 87cde7d0d0..59cb1bb9eb 100644 --- a/assets/node-exporter/daemonset.yaml +++ b/assets/node-exporter/daemonset.yaml @@ -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 diff --git a/assets/openshift-state-metrics/deployment.yaml b/assets/openshift-state-metrics/deployment.yaml index 1232318dd6..c4637e7a86 100644 --- a/assets/openshift-state-metrics/deployment.yaml +++ b/assets/openshift-state-metrics/deployment.yaml @@ -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 @@ -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 diff --git a/assets/prometheus-k8s/prometheus.yaml b/assets/prometheus-k8s/prometheus.yaml index 4261189e92..2832573161 100644 --- a/assets/prometheus-k8s/prometheus.yaml +++ b/assets/prometheus-k8s/prometheus.yaml @@ -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 @@ -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 @@ -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 diff --git a/assets/prometheus-operator-user-workload/deployment.yaml b/assets/prometheus-operator-user-workload/deployment.yaml index 359838605d..fa5e21c6f1 100644 --- a/assets/prometheus-operator-user-workload/deployment.yaml +++ b/assets/prometheus-operator-user-workload/deployment.yaml @@ -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 diff --git a/assets/prometheus-operator/deployment.yaml b/assets/prometheus-operator/deployment.yaml index d9b09cdcf0..8660d9eb16 100644 --- a/assets/prometheus-operator/deployment.yaml +++ b/assets/prometheus-operator/deployment.yaml @@ -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 diff --git a/assets/prometheus-user-workload/prometheus.yaml b/assets/prometheus-user-workload/prometheus.yaml index ea9cdbfd97..839dfcb40a 100644 --- a/assets/prometheus-user-workload/prometheus.yaml +++ b/assets/prometheus-user-workload/prometheus.yaml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/assets/telemeter-client/deployment.yaml b/assets/telemeter-client/deployment.yaml index 8e3a28bdf1..091fa7f5f0 100644 --- a/assets/telemeter-client/deployment.yaml +++ b/assets/telemeter-client/deployment.yaml @@ -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 diff --git a/assets/thanos-querier/cluster-role-binding.yaml b/assets/thanos-querier/cluster-role-binding.yaml index ef4ab6fc70..81a5266a80 100644 --- a/assets/thanos-querier/cluster-role-binding.yaml +++ b/assets/thanos-querier/cluster-role-binding.yaml @@ -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 diff --git a/assets/thanos-querier/cluster-role.yaml b/assets/thanos-querier/cluster-role.yaml index ef9be08427..0f6895c61f 100644 --- a/assets/thanos-querier/cluster-role.yaml +++ b/assets/thanos-querier/cluster-role.yaml @@ -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: diff --git a/assets/thanos-querier/deployment.yaml b/assets/thanos-querier/deployment.yaml index e24fcc90e3..dd0e9ac324 100644 --- a/assets/thanos-querier/deployment.yaml +++ b/assets/thanos-querier/deployment.yaml @@ -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: @@ -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: @@ -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: @@ -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 @@ -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 @@ -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 diff --git a/assets/thanos-querier/grpc-tls-secret.yaml b/assets/thanos-querier/grpc-tls-secret.yaml index 5ca7233f0d..80abd33a1d 100644 --- a/assets/thanos-querier/grpc-tls-secret.yaml +++ b/assets/thanos-querier/grpc-tls-secret.yaml @@ -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 diff --git a/assets/thanos-querier/kube-rbac-proxy-rules-secret.yaml b/assets/thanos-querier/kube-rbac-proxy-rules-secret.yaml index b247ed1ec0..828dc43d02 100644 --- a/assets/thanos-querier/kube-rbac-proxy-rules-secret.yaml +++ b/assets/thanos-querier/kube-rbac-proxy-rules-secret.yaml @@ -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: diff --git a/assets/thanos-querier/kube-rbac-proxy-secret.yaml b/assets/thanos-querier/kube-rbac-proxy-secret.yaml index f4b6724def..b922e394f1 100644 --- a/assets/thanos-querier/kube-rbac-proxy-secret.yaml +++ b/assets/thanos-querier/kube-rbac-proxy-secret.yaml @@ -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: diff --git a/assets/thanos-querier/oauth-cookie-secret.yaml b/assets/thanos-querier/oauth-cookie-secret.yaml index 4d8c2eb46f..7d30a3e55b 100644 --- a/assets/thanos-querier/oauth-cookie-secret.yaml +++ b/assets/thanos-querier/oauth-cookie-secret.yaml @@ -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 diff --git a/assets/thanos-querier/pod-disruption-budget.yaml b/assets/thanos-querier/pod-disruption-budget.yaml index c39ddf74a1..ed0ac6d728 100644 --- a/assets/thanos-querier/pod-disruption-budget.yaml +++ b/assets/thanos-querier/pod-disruption-budget.yaml @@ -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: diff --git a/assets/thanos-querier/prometheus-rule.yaml b/assets/thanos-querier/prometheus-rule.yaml index 5438422b88..3d7fafb231 100644 --- a/assets/thanos-querier/prometheus-rule.yaml +++ b/assets/thanos-querier/prometheus-rule.yaml @@ -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: diff --git a/assets/thanos-querier/route.yaml b/assets/thanos-querier/route.yaml index 6d45183d6c..b31bb54927 100644 --- a/assets/thanos-querier/route.yaml +++ b/assets/thanos-querier/route.yaml @@ -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: diff --git a/assets/thanos-querier/service-account.yaml b/assets/thanos-querier/service-account.yaml index 0d34f12b91..41a55fd37f 100644 --- a/assets/thanos-querier/service-account.yaml +++ b/assets/thanos-querier/service-account.yaml @@ -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 diff --git a/assets/thanos-querier/service-monitor.yaml b/assets/thanos-querier/service-monitor.yaml index 07aed419fc..d99e084375 100644 --- a/assets/thanos-querier/service-monitor.yaml +++ b/assets/thanos-querier/service-monitor.yaml @@ -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: diff --git a/assets/thanos-querier/service.yaml b/assets/thanos-querier/service.yaml index 85d13e3124..d232f0aea4 100644 --- a/assets/thanos-querier/service.yaml +++ b/assets/thanos-querier/service.yaml @@ -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: diff --git a/assets/thanos-ruler/service-account.yaml b/assets/thanos-ruler/service-account.yaml index d2ec7db45f..ff059b7ce6 100644 --- a/assets/thanos-ruler/service-account.yaml +++ b/assets/thanos-ruler/service-account.yaml @@ -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 diff --git a/assets/thanos-ruler/service-monitor.yaml b/assets/thanos-ruler/service-monitor.yaml index 750465306f..e92ba96c84 100644 --- a/assets/thanos-ruler/service-monitor.yaml +++ b/assets/thanos-ruler/service-monitor.yaml @@ -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: diff --git a/assets/thanos-ruler/service.yaml b/assets/thanos-ruler/service.yaml index c9ca0b393a..5eea8d29f4 100644 --- a/assets/thanos-ruler/service.yaml +++ b/assets/thanos-ruler/service.yaml @@ -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: diff --git a/assets/thanos-ruler/thanos-ruler.yaml b/assets/thanos-ruler/thanos-ruler.yaml index de53e42a28..bdbf308b6d 100644 --- a/assets/thanos-ruler/thanos-ruler.yaml +++ b/assets/thanos-ruler/thanos-ruler.yaml @@ -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: diff --git a/jsonnet/versions.yaml b/jsonnet/versions.yaml index 30f7a11d20..50c03c3341 100644 --- a/jsonnet/versions.yaml +++ b/jsonnet/versions.yaml @@ -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