mirror of
https://github.com/prometheus-operator/kube-prometheus.git
synced 2025-10-25 14:11:02 +02:00
Merge pull request #1334 from dgrisonnet/prometheus-adapter-v0.9.0
Update prometheus-adapter to v0.9.0
This commit is contained in:
commit
35397089d1
@ -43,7 +43,7 @@ local utils = import './lib/utils.libsonnet';
|
|||||||
kubeStateMetrics: 'k8s.gcr.io/kube-state-metrics/kube-state-metrics:v' + $.values.common.versions.kubeStateMetrics,
|
kubeStateMetrics: 'k8s.gcr.io/kube-state-metrics/kube-state-metrics:v' + $.values.common.versions.kubeStateMetrics,
|
||||||
nodeExporter: 'quay.io/prometheus/node-exporter:v' + $.values.common.versions.nodeExporter,
|
nodeExporter: 'quay.io/prometheus/node-exporter:v' + $.values.common.versions.nodeExporter,
|
||||||
prometheus: 'quay.io/prometheus/prometheus:v' + $.values.common.versions.prometheus,
|
prometheus: 'quay.io/prometheus/prometheus:v' + $.values.common.versions.prometheus,
|
||||||
prometheusAdapter: 'directxman12/k8s-prometheus-adapter:v' + $.values.common.versions.prometheusAdapter,
|
prometheusAdapter: 'k8s.gcr.io/prometheus-adapter/prometheus-adapter:v' + $.values.common.versions.prometheusAdapter,
|
||||||
prometheusOperator: 'quay.io/prometheus-operator/prometheus-operator:v' + $.values.common.versions.prometheusOperator,
|
prometheusOperator: 'quay.io/prometheus-operator/prometheus-operator:v' + $.values.common.versions.prometheusOperator,
|
||||||
prometheusOperatorReloader: 'quay.io/prometheus-operator/prometheus-config-reloader:v' + $.values.common.versions.prometheusOperator,
|
prometheusOperatorReloader: 'quay.io/prometheus-operator/prometheus-config-reloader:v' + $.values.common.versions.prometheusOperator,
|
||||||
kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy,
|
kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy,
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
"kubeStateMetrics": "2.1.1",
|
"kubeStateMetrics": "2.1.1",
|
||||||
"nodeExporter": "1.2.2",
|
"nodeExporter": "1.2.2",
|
||||||
"prometheus": "2.29.1",
|
"prometheus": "2.29.1",
|
||||||
"prometheusAdapter": "0.8.4",
|
"prometheusAdapter": "0.9.0",
|
||||||
"prometheusOperator": "0.49.0",
|
"prometheusOperator": "0.49.0",
|
||||||
"kubeRbacProxy": "0.11.0",
|
"kubeRbacProxy": "0.11.0",
|
||||||
"configmapReload": "0.5.0"
|
"configmapReload": "0.5.0"
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: v1beta1.metrics.k8s.io
|
name: v1beta1.metrics.k8s.io
|
||||||
spec:
|
spec:
|
||||||
group: metrics.k8s.io
|
group: metrics.k8s.io
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
rbac.authorization.k8s.io/aggregate-to-admin: "true"
|
rbac.authorization.k8s.io/aggregate-to-admin: "true"
|
||||||
rbac.authorization.k8s.io/aggregate-to-edit: "true"
|
rbac.authorization.k8s.io/aggregate-to-edit: "true"
|
||||||
rbac.authorization.k8s.io/aggregate-to-view: "true"
|
rbac.authorization.k8s.io/aggregate-to-view: "true"
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: resource-metrics:system:auth-delegator
|
name: resource-metrics:system:auth-delegator
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: resource-metrics-server-resources
|
name: resource-metrics-server-resources
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|||||||
@ -64,6 +64,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: adapter-config
|
name: adapter-config
|
||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
spec:
|
spec:
|
||||||
@ -25,7 +25,7 @@ spec:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
@ -36,7 +36,7 @@ spec:
|
|||||||
- --prometheus-url=http://prometheus-k8s.monitoring.svc.cluster.local:9090/
|
- --prometheus-url=http://prometheus-k8s.monitoring.svc.cluster.local:9090/
|
||||||
- --secure-port=6443
|
- --secure-port=6443
|
||||||
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
|
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
|
||||||
image: directxman12/k8s-prometheus-adapter:v0.8.4
|
image: k8s.gcr.io/prometheus-adapter/prometheus-adapter:v0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 6443
|
- containerPort: 6443
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: resource-metrics-auth-reader
|
name: resource-metrics-auth-reader
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
@ -5,6 +5,6 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
app.kubernetes.io/component: metrics-adapter
|
app.kubernetes.io/component: metrics-adapter
|
||||||
app.kubernetes.io/name: prometheus-adapter
|
app.kubernetes.io/name: prometheus-adapter
|
||||||
app.kubernetes.io/part-of: kube-prometheus
|
app.kubernetes.io/part-of: kube-prometheus
|
||||||
app.kubernetes.io/version: 0.8.4
|
app.kubernetes.io/version: 0.9.0
|
||||||
name: prometheus-adapter
|
name: prometheus-adapter
|
||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user