From 45adc03cfbf900aaea0b73d7e9ce97c6b2c76cb5 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet <dgrisonn@redhat.com> Date: Tue, 17 Aug 2021 18:00:46 +0200 Subject: [PATCH] jsonnet: update prometheus-adapter to v0.9.0 Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com> --- jsonnet/kube-prometheus/main.libsonnet | 2 +- jsonnet/kube-prometheus/versions.json | 2 +- manifests/prometheus-adapter-apiService.yaml | 2 +- manifests/prometheus-adapter-clusterRole.yaml | 2 +- ...ometheus-adapter-clusterRoleAggregatedMetricsReader.yaml | 2 +- manifests/prometheus-adapter-clusterRoleBinding.yaml | 2 +- .../prometheus-adapter-clusterRoleBindingDelegator.yaml | 2 +- .../prometheus-adapter-clusterRoleServerResources.yaml | 2 +- manifests/prometheus-adapter-configMap.yaml | 2 +- manifests/prometheus-adapter-deployment.yaml | 6 +++--- manifests/prometheus-adapter-podDisruptionBudget.yaml | 2 +- manifests/prometheus-adapter-roleBindingAuthReader.yaml | 2 +- manifests/prometheus-adapter-service.yaml | 2 +- manifests/prometheus-adapter-serviceAccount.yaml | 2 +- manifests/prometheus-adapter-serviceMonitor.yaml | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index 6d2a3995..877619b2 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: '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, 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 ded8b862..60946073 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -5,7 +5,7 @@ "kubeStateMetrics": "2.1.1", "nodeExporter": "1.2.2", "prometheus": "2.29.1", - "prometheusAdapter": "0.8.4", + "prometheusAdapter": "0.9.0", "prometheusOperator": "0.49.0", "kubeRbacProxy": "0.11.0", "configmapReload": "0.5.0" diff --git a/manifests/prometheus-adapter-apiService.yaml b/manifests/prometheus-adapter-apiService.yaml index ab5af8fb..ea4476dc 100644 --- a/manifests/prometheus-adapter-apiService.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: v1beta1.metrics.k8s.io spec: group: metrics.k8s.io diff --git a/manifests/prometheus-adapter-clusterRole.yaml b/manifests/prometheus-adapter-clusterRole.yaml index d011b3c6..091d9818 100644 --- a/manifests/prometheus-adapter-clusterRole.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: prometheus-adapter rules: - apiGroups: diff --git a/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml b/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml index 03e76925..4dc8e7a3 100644 --- a/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.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/prometheus-adapter-clusterRoleBinding.yaml b/manifests/prometheus-adapter-clusterRoleBinding.yaml index 52c8df93..dc8bfbb1 100644 --- a/manifests/prometheus-adapter-clusterRoleBinding.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: prometheus-adapter roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml b/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml index d77d743e..86e7517d 100644 --- a/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: resource-metrics:system:auth-delegator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-adapter-clusterRoleServerResources.yaml b/manifests/prometheus-adapter-clusterRoleServerResources.yaml index f4fb9c38..655efb9b 100644 --- a/manifests/prometheus-adapter-clusterRoleServerResources.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: resource-metrics-server-resources rules: - apiGroups: diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml index bd6de899..b5329689 100644 --- a/manifests/prometheus-adapter-configMap.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: adapter-config namespace: monitoring diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml index fa51694d..e6c97afc 100644 --- a/manifests/prometheus-adapter-deployment.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.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.8.4 + app.kubernetes.io/version: 0.9.0 spec: containers: - args: @@ -36,7 +36,7 @@ spec: - --prometheus-url=http://prometheus-k8s.monitoring.svc.cluster.local: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: directxman12/k8s-prometheus-adapter:v0.8.4 + image: k8s.gcr.io/prometheus-adapter/prometheus-adapter:v0.9.0 name: prometheus-adapter ports: - containerPort: 6443 diff --git a/manifests/prometheus-adapter-podDisruptionBudget.yaml b/manifests/prometheus-adapter-podDisruptionBudget.yaml index cbb4a8a8..639eefd4 100644 --- a/manifests/prometheus-adapter-podDisruptionBudget.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheus-adapter-roleBindingAuthReader.yaml b/manifests/prometheus-adapter-roleBindingAuthReader.yaml index ddc119ef..3bdf4ad9 100644 --- a/manifests/prometheus-adapter-roleBindingAuthReader.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: resource-metrics-auth-reader namespace: kube-system roleRef: diff --git a/manifests/prometheus-adapter-service.yaml b/manifests/prometheus-adapter-service.yaml index 7e711d5e..be8c44b6 100644 --- a/manifests/prometheus-adapter-service.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheus-adapter-serviceAccount.yaml b/manifests/prometheus-adapter-serviceAccount.yaml index 74404d5d..2ddbe460 100644 --- a/manifests/prometheus-adapter-serviceAccount.yaml +++ b/manifests/prometheus-adapter-serviceAccount.yaml @@ -5,6 +5,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.8.4 + app.kubernetes.io/version: 0.9.0 name: prometheus-adapter namespace: monitoring diff --git a/manifests/prometheus-adapter-serviceMonitor.yaml b/manifests/prometheus-adapter-serviceMonitor.yaml index 5d8bd2c3..a7515852 100644 --- a/manifests/prometheus-adapter-serviceMonitor.yaml +++ b/manifests/prometheus-adapter-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.8.4 + app.kubernetes.io/version: 0.9.0 name: prometheus-adapter namespace: monitoring spec: -- GitLab