Skip to content

Commit 314353f

Browse files
Merge pull request #1018 from dgrisonnet/pin-release-4.7
Bug 1829723: Update and pin jsonnet dependencies for release 4.7
2 parents 08919e2 + 2c8e805 commit 314353f

34 files changed

+652
-397
lines changed

Diff for: CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
- [#983](https://github.com/openshift/cluster-monitoring-operator/pull/983) Remove deprecated user workload configuration
1414
- [#995](https://github.com/openshift/cluster-monitoring-operator/pull/995) Add logLevel config field to Thanos Query.
1515
- [#993](https://github.com/openshift/cluster-monitoring-operator/pull/993) Add metrics + alerts for Thanos sidecars.
16+
- [#1013](https://github.com/openshift/cluster-monitoring-operator/pull/1013) [#1018](https://github.com/openshift/cluster-monitoring-operator/pull/1018) Bump and pin jsonnet dependencies:
17+
- prometheus-operator v0.44.1
18+
- Thanos: v0.17.2
19+
- kube-prometheus: release-0.7
1620

1721
## 4.6
1822

Diff for: assets/alertmanager/alertmanager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
- --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
6969
- --logtostderr=true
7070
- --v=10
71-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
71+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
7272
name: kube-rbac-proxy
7373
ports:
7474
- containerPort: 9092
@@ -87,7 +87,7 @@ spec:
8787
- --insecure-listen-address=127.0.0.1:9096
8888
- --upstream=http://127.0.0.1:9093
8989
- --label=namespace
90-
image: quay.io/coreos/prom-label-proxy:v0.1.0
90+
image: quay.io/coreos/prom-label-proxy:v0.2.0
9191
name: prom-label-proxy
9292
resources:
9393
requests:

Diff for: assets/grafana/dashboard-definitions.yaml

+187-109
Large diffs are not rendered by default.

Diff for: assets/grafana/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- args:
2323
- -config=/etc/grafana/grafana.ini
2424
env: []
25-
image: grafana/grafana:7.3.4
25+
image: grafana/grafana:v7.3.5
2626
name: grafana
2727
ports:
2828
- containerPort: 3001

Diff for: assets/kube-state-metrics/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- --upstream=http://127.0.0.1:8081/
4343
- --tls-cert-file=/etc/tls/private/tls.crt
4444
- --tls-private-key-file=/etc/tls/private/tls.key
45-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
45+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
4646
name: kube-rbac-proxy-main
4747
ports:
4848
- containerPort: 8443
@@ -64,7 +64,7 @@ spec:
6464
- --upstream=http://127.0.0.1:8082/
6565
- --tls-cert-file=/etc/tls/private/tls.crt
6666
- --tls-private-key-file=/etc/tls/private/tls.key
67-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
67+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
6868
name: kube-rbac-proxy-self
6969
ports:
7070
- containerPort: 9443

Diff for: assets/node-exporter/daemonset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
valueFrom:
6464
fieldRef:
6565
fieldPath: status.podIP
66-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
66+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
6767
name: kube-rbac-proxy
6868
ports:
6969
- containerPort: 9100

Diff for: assets/openshift-state-metrics/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
- --upstream=http://127.0.0.1:8081/
2424
- --tls-cert-file=/etc/tls/private/tls.crt
2525
- --tls-private-key-file=/etc/tls/private/tls.key
26-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
26+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
2727
name: kube-rbac-proxy-main
2828
ports:
2929
- containerPort: 8443
@@ -43,7 +43,7 @@ spec:
4343
- --upstream=http://127.0.0.1:8082/
4444
- --tls-cert-file=/etc/tls/private/tls.crt
4545
- --tls-private-key-file=/etc/tls/private/tls.key
46-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
46+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
4747
name: kube-rbac-proxy-self
4848
ports:
4949
- containerPort: 9443

Diff for: assets/prometheus-adapter/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- --metrics-relist-interval=1m
2626
- --prometheus-url=https://prometheus-k8s.openshift-monitoring.svc:9091
2727
- --secure-port=6443
28-
image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.4.1
28+
image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.8.2
2929
name: prometheus-adapter
3030
ports:
3131
- containerPort: 6443

Diff for: assets/prometheus-k8s/prometheus.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ spec:
8585
- --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
8686
- --logtostderr=true
8787
- --v=10
88-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
88+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
8989
name: kube-rbac-proxy
9090
ports:
9191
- containerPort: 9092
@@ -104,7 +104,7 @@ spec:
104104
- --insecure-listen-address=127.0.0.1:9095
105105
- --upstream=http://127.0.0.1:9090
106106
- --label=namespace
107-
image: quay.io/coreos/prom-label-proxy:v0.1.0
107+
image: quay.io/coreos/prom-label-proxy:v0.2.0
108108
name: prom-label-proxy
109109
resources:
110110
requests:
@@ -124,7 +124,7 @@ spec:
124124
valueFrom:
125125
fieldRef:
126126
fieldPath: status.podIP
127-
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
127+
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
128128
name: kube-rbac-proxy-thanos
129129
ports:
130130
- containerPort: 10902
@@ -159,7 +159,7 @@ spec:
159159
requests:
160160
cpu: 1m
161161
memory: 10Mi
162-
image: openshift/prometheus:v2.20.0
162+
image: openshift/prometheus:v2.23.0
163163
listenLocal: true
164164
nodeSelector:
165165
kubernetes.io/os: linux
@@ -190,10 +190,10 @@ spec:
190190
serviceMonitorNamespaceSelector: {}
191191
serviceMonitorSelector: {}
192192
thanos:
193-
image: quay.io/openshift/origin-thanos:v0.15.0
193+
image: quay.io/openshift/origin-thanos:v0.17.2
194194
resources:
195195
requests:
196196
cpu: 1m
197197
memory: 100Mi
198-
version: v0.15.0
199-
version: v2.20.0
198+
version: v0.17.2
199+
version: v2.23.0

0 commit comments

Comments
 (0)