diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet index 3349c8f6e9951573f15695891cc0770a46c0b792..52266de87ec90c0ba0cce2d7d5963fa518bb09e7 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 0f16aac835eee479c0d1213cf7b479da109ca977..45809398cb1ed404e19af97eda44a39a59c06c64 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 80a7ef910c32f98323f7778736c4dfa9ce9bc3d0..bf17b251dfd2cba775f8e24bc0d7696452fa305d 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 d9d4f1f91840539a5e90b27409df5d245e3eb0fe..57e49253841df68c046563e9d8588bf0586ce4f3 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 89799af1bca78d9f952ef555cac729e03e8c2c55..b1f31754d357a52f1bde84446ad5caaba7992b4e 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 2b08418538c48893f84a1106a123a5c4f6776bc5..749fc66a544d7d6740a1229934579c869415afd7 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 f1df9067d5c43c196999dd2deb9bdcd00fc67d5b..eb8fc9e7d2f604d05fe5e1a22ea560b344d492d2 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 ff7dcb6be8fd965e952aec61c4bcdd5c7698bb5d..73d78b06f570e00d78a3738ed8560ff8f7fe9581 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 a33457ae30cf803c6219d7d6bc6796b480c33aa0..a1690bb6ff715327200bc8e4b2901272d04979b4 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 003c6e45ef1442a214d8b3648d8e623de41f0235..fcfdf356290eebcfe391d456c3c3a7bcea9eaae5 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 d4636dff3f00f155bbc6beec30ce9cdddc1aea71..29a11fd536d36a850bc3c9ebce4453df567d00a8 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 31c20b9e3215c0bccf261a942222507dad6d4ec6..033fcaafe60d22e4a6602c8c8bb3b0b8f5858fc8 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 6a8a6d847a8f09aa6870085916e23fc76ceece62..5d0d9036d0c7a79241dcfe6b6a767dac0e89c4a6 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 747718bf7f0004ab531e623f6f05e21f9c156216..c9848286411f97b7fa1d67e13ddad9726c0d370c 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 ea607f3af39c40105812b7ba2f124ea5f91af6ea..bb1058b7b0c2af970e5f284fe6357b4a67a1fe84 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 1e4c4772b18bb16b165879293a0fd4626403e97d..d8941459e81bf8a07e419657c3c50ab060eeea62 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: