From 0a073679c6fd06c1d11812f2efd7be77092f78ca Mon Sep 17 00:00:00 2001 From: Joao Marcal Date: Tue, 6 Sep 2022 16:30:55 +0200 Subject: [PATCH] Updates Prometheus Adapater version to 0.10.0 (#1865) Updates Prometheus Adapater image to official image documented in kubernetes-sigs/prometheus-adapter/README.md --- jsonnet/kube-prometheus/main.libsonnet | 2 +- jsonnet/kube-prometheus/versions.json | 2 +- manifests/prometheusAdapter-apiService.yaml | 2 +- manifests/prometheusAdapter-clusterRole.yaml | 2 +- ...rometheusAdapter-clusterRoleAggregatedMetricsReader.yaml | 2 +- manifests/prometheusAdapter-clusterRoleBinding.yaml | 2 +- .../prometheusAdapter-clusterRoleBindingDelegator.yaml | 2 +- manifests/prometheusAdapter-clusterRoleServerResources.yaml | 2 +- manifests/prometheusAdapter-configMap.yaml | 2 +- manifests/prometheusAdapter-deployment.yaml | 6 +++--- manifests/prometheusAdapter-networkPolicy.yaml | 2 +- manifests/prometheusAdapter-podDisruptionBudget.yaml | 2 +- manifests/prometheusAdapter-roleBindingAuthReader.yaml | 2 +- manifests/prometheusAdapter-service.yaml | 2 +- manifests/prometheusAdapter-serviceAccount.yaml | 2 +- manifests/prometheusAdapter-serviceMonitor.yaml | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index 3349c8f6e9..52266de87e 100644 --- a/jsonnet/kube-prometheus/main.libsonnet +++ b/jsonnet/kube-prometheus/main.libsonnet @@ -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, nodeExporter: 'quay.io/prometheus/node-exporter:v' + $.values.common.versions.nodeExporter, prometheus: 'quay.io/prometheus/prometheus:v' + $.values.common.versions.prometheus, - prometheusAdapter: 'k8s.gcr.io/prometheus-adapter/prometheus-adapter:v' + $.values.common.versions.prometheusAdapter, + prometheusAdapter: 'registry.k8s.io/prometheus-adapter/prometheus-adapter:v' + $.values.common.versions.prometheusAdapter, 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, kubeRbacProxy: 'quay.io/brancz/kube-rbac-proxy:v' + $.values.common.versions.kubeRbacProxy, diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 0f16aac835..45809398cb 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -5,7 +5,7 @@ "kubeStateMetrics": "2.6.0", "nodeExporter": "1.3.1", "prometheus": "2.38.0", - "prometheusAdapter": "0.9.1", + "prometheusAdapter": "0.10.0", "prometheusOperator": "0.59.0", "kubeRbacProxy": "0.13.0", "configmapReload": "0.5.0", diff --git a/manifests/prometheusAdapter-apiService.yaml b/manifests/prometheusAdapter-apiService.yaml index 80a7ef910c..bf17b251df 100644 --- a/manifests/prometheusAdapter-apiService.yaml +++ b/manifests/prometheusAdapter-apiService.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: v1beta1.metrics.k8s.io spec: group: metrics.k8s.io diff --git a/manifests/prometheusAdapter-clusterRole.yaml b/manifests/prometheusAdapter-clusterRole.yaml index d9d4f1f918..57e4925384 100644 --- a/manifests/prometheusAdapter-clusterRole.yaml +++ b/manifests/prometheusAdapter-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring rules: diff --git a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml index 89799af1bc..b1f31754d3 100644 --- a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml +++ b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" rbac.authorization.k8s.io/aggregate-to-view: "true" diff --git a/manifests/prometheusAdapter-clusterRoleBinding.yaml b/manifests/prometheusAdapter-clusterRoleBinding.yaml index 2b08418538..749fc66a54 100644 --- a/manifests/prometheusAdapter-clusterRoleBinding.yaml +++ b/manifests/prometheusAdapter-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring roleRef: diff --git a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml index f1df9067d5..eb8fc9e7d2 100644 --- a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml +++ b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: resource-metrics:system:auth-delegator namespace: monitoring roleRef: diff --git a/manifests/prometheusAdapter-clusterRoleServerResources.yaml b/manifests/prometheusAdapter-clusterRoleServerResources.yaml index ff7dcb6be8..73d78b06f5 100644 --- a/manifests/prometheusAdapter-clusterRoleServerResources.yaml +++ b/manifests/prometheusAdapter-clusterRoleServerResources.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: resource-metrics-server-resources namespace: monitoring rules: diff --git a/manifests/prometheusAdapter-configMap.yaml b/manifests/prometheusAdapter-configMap.yaml index a33457ae30..a1690bb6ff 100644 --- a/manifests/prometheusAdapter-configMap.yaml +++ b/manifests/prometheusAdapter-configMap.yaml @@ -64,6 +64,6 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: adapter-config namespace: monitoring diff --git a/manifests/prometheusAdapter-deployment.yaml b/manifests/prometheusAdapter-deployment.yaml index 003c6e45ef..fcfdf35629 100644 --- a/manifests/prometheusAdapter-deployment.yaml +++ b/manifests/prometheusAdapter-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring spec: @@ -25,7 +25,7 @@ spec: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 spec: automountServiceAccountToken: true containers: @@ -37,7 +37,7 @@ spec: - --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/ - --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 - image: k8s.gcr.io/prometheus-adapter/prometheus-adapter:v0.9.1 + image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.10.0 livenessProbe: failureThreshold: 5 httpGet: diff --git a/manifests/prometheusAdapter-networkPolicy.yaml b/manifests/prometheusAdapter-networkPolicy.yaml index d4636dff3f..29a11fd536 100644 --- a/manifests/prometheusAdapter-networkPolicy.yaml +++ b/manifests/prometheusAdapter-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheusAdapter-podDisruptionBudget.yaml b/manifests/prometheusAdapter-podDisruptionBudget.yaml index 31c20b9e32..033fcaafe6 100644 --- a/manifests/prometheusAdapter-podDisruptionBudget.yaml +++ b/manifests/prometheusAdapter-podDisruptionBudget.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheusAdapter-roleBindingAuthReader.yaml b/manifests/prometheusAdapter-roleBindingAuthReader.yaml index 6a8a6d847a..5d0d9036d0 100644 --- a/manifests/prometheusAdapter-roleBindingAuthReader.yaml +++ b/manifests/prometheusAdapter-roleBindingAuthReader.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: resource-metrics-auth-reader namespace: kube-system roleRef: diff --git a/manifests/prometheusAdapter-service.yaml b/manifests/prometheusAdapter-service.yaml index 747718bf7f..c984828641 100644 --- a/manifests/prometheusAdapter-service.yaml +++ b/manifests/prometheusAdapter-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheusAdapter-serviceAccount.yaml b/manifests/prometheusAdapter-serviceAccount.yaml index ea607f3af3..bb1058b7b0 100644 --- a/manifests/prometheusAdapter-serviceAccount.yaml +++ b/manifests/prometheusAdapter-serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring diff --git a/manifests/prometheusAdapter-serviceMonitor.yaml b/manifests/prometheusAdapter-serviceMonitor.yaml index 1e4c4772b1..d8941459e8 100644 --- a/manifests/prometheusAdapter-serviceMonitor.yaml +++ b/manifests/prometheusAdapter-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: metrics-adapter app.kubernetes.io/name: prometheus-adapter app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.9.1 + app.kubernetes.io/version: 0.10.0 name: prometheus-adapter namespace: monitoring spec: