Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1829723: Update and pin jsonnet dependencies for release 4.7 #1018

Merged
merged 4 commits into from Dec 11, 2020
Merged

Bug 1829723: Update and pin jsonnet dependencies for release 4.7 #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
225f510
jsonnet: update jsonnet dependencies
dgrisonnet Dec 10, 2020
f3d93bd
jsonnet/thanos-querier: fix after kube-thanos 1.16
dgrisonnet Dec 11, 2020
31873e0
assets,manifests: regenerate
dgrisonnet Dec 11, 2020
2c8e805
CHANGELOG.md: update changelog
dgrisonnet Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -13,6 +13,10 @@
- [#983](https://github.com/openshift/cluster-monitoring-operator/pull/983) Remove deprecated user workload configuration
- [#995](https://github.com/openshift/cluster-monitoring-operator/pull/995) Add logLevel config field to Thanos Query.
- [#993](https://github.com/openshift/cluster-monitoring-operator/pull/993) Add metrics + alerts for Thanos sidecars.
- [#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:
- prometheus-operator v0.44.1
- Thanos: v0.17.2
- kube-prometheus: release-0.7

## 4.6

Expand Down
4 changes: 2 additions & 2 deletions assets/alertmanager/alertmanager.yaml
View file
Open in desktop
Expand Up @@ -68,7 +68,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
- --v=10
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
ports:
- containerPort: 9092
Expand All @@ -87,7 +87,7 @@ spec:
- --insecure-listen-address=127.0.0.1:9096
- --upstream=http://127.0.0.1:9093
- --label=namespace
image: quay.io/coreos/prom-label-proxy:v0.1.0
image: quay.io/coreos/prom-label-proxy:v0.2.0
name: prom-label-proxy
resources:
requests:
Expand Down
296 changes: 187 additions & 109 deletions assets/grafana/dashboard-definitions.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/grafana/deployment.yaml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ spec:
- args:
- -config=/etc/grafana/grafana.ini
env: []
image: grafana/grafana:7.3.4
image: grafana/grafana:v7.3.5
name: grafana
ports:
- containerPort: 3001
Expand Down
4 changes: 2 additions & 2 deletions assets/kube-state-metrics/deployment.yaml
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ spec:
- --upstream=http://127.0.0.1:8081/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
Expand All @@ -64,7 +64,7 @@ spec:
- --upstream=http://127.0.0.1:8082/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
Expand Down
2 changes: 1 addition & 1 deletion assets/node-exporter/daemonset.yaml
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
ports:
- containerPort: 9100
Expand Down
4 changes: 2 additions & 2 deletions assets/openshift-state-metrics/deployment.yaml
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ spec:
- --upstream=http://127.0.0.1:8081/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
Expand All @@ -43,7 +43,7 @@ spec:
- --upstream=http://127.0.0.1:8082/
- --tls-cert-file=/etc/tls/private/tls.crt
- --tls-private-key-file=/etc/tls/private/tls.key
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-adapter/deployment.yaml
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ spec:
- --metrics-relist-interval=1m
- --prometheus-url=https://prometheus-k8s.openshift-monitoring.svc:9091
- --secure-port=6443
image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.4.1
image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.8.2
name: prometheus-adapter
ports:
- containerPort: 6443
Expand Down
14 changes: 7 additions & 7 deletions assets/prometheus-k8s/prometheus.yaml
View file
Open in desktop
Expand Up @@ -85,7 +85,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
- --v=10
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy
ports:
- containerPort: 9092
Expand All @@ -104,7 +104,7 @@ spec:
- --insecure-listen-address=127.0.0.1:9095
- --upstream=http://127.0.0.1:9090
- --label=namespace
image: quay.io/coreos/prom-label-proxy:v0.1.0
image: quay.io/coreos/prom-label-proxy:v0.2.0
name: prom-label-proxy
resources:
requests:
Expand All @@ -124,7 +124,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay.io/coreos/kube-rbac-proxy:v0.6.0
image: quay.io/coreos/kube-rbac-proxy:v0.8.0
name: kube-rbac-proxy-thanos
ports:
- containerPort: 10902
Expand Down Expand Up @@ -159,7 +159,7 @@ spec:
requests:
cpu: 1m
memory: 10Mi
image: openshift/prometheus:v2.20.0
image: openshift/prometheus:v2.23.0
listenLocal: true
nodeSelector:
kubernetes.io/os: linux
Expand Down Expand Up @@ -190,10 +190,10 @@ spec:
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
thanos:
image: quay.io/openshift/origin-thanos:v0.15.0
image: quay.io/openshift/origin-thanos:v0.17.2
resources:
requests:
cpu: 1m
memory: 100Mi
version: v0.15.0
version: v2.20.0
version: v0.17.2
version: v2.23.0