From f73206f9ed6965a02231b042faa99864e30a96ad Mon Sep 17 00:00:00 2001
From: Olivier Lemasle <o.lemasle@gmail.com>
Date: Mon, 7 Nov 2022 12:10:20 +0100
Subject: [PATCH] Switch ksm registry to registry.k8s.io (#1914)
Kubernetes has switched registry from k8s.gcr.io to registry.k8s.io
in https://github.com/kubernetes/kubernetes/pull/109938.
kube-state-metrics also did the switch in
https://github.com/kubernetes/kube-state-metrics/pull/1750.
This commit also updates the registry in a kubeadm configuration
example.
---
docs/kube-prometheus-on-kubeadm.md | 2 +-
jsonnet/kube-prometheus/main.libsonnet | 2 +-
manifests/kubeStateMetrics-deployment.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/kube-prometheus-on-kubeadm.md b/docs/kube-prometheus-on-kubeadm.md
index 7e050a26..86a1f72c 100644
--- a/docs/kube-prometheus-on-kubeadm.md
+++ b/docs/kube-prometheus-on-kubeadm.md
@@ -43,7 +43,7 @@ kubernetesVersion: "v1.23.1"
networking:
dnsDomain: "cluster.local"
serviceSubnet: "10.96.0.0/12"
-imageRepository: "k8s.gcr.io"
+imageRepository: "registry.k8s.io"
```
Notice the `.scheduler.extraArgs` and `.controllerManager.extraArgs`. This exposes the `kube-controller-manager` and `kube-scheduler` services to the rest of the cluster. If you have kubernetes core components as pods in the kube-system namespace, ensure that the `kube-prometheus-exporter-kube-scheduler` and `kube-prometheus-exporter-kube-controller-manager` services' `spec.selector` values match those of pods.
diff --git a/jsonnet/kube-prometheus/main.libsonnet b/jsonnet/kube-prometheus/main.libsonnet
index 52266de8..3405c8f3 100644
--- a/jsonnet/kube-prometheus/main.libsonnet
+++ b/jsonnet/kube-prometheus/main.libsonnet
@@ -40,7 +40,7 @@ local utils = import './lib/utils.libsonnet';
alertmanager: 'quay.io/prometheus/alertmanager:v' + $.values.common.versions.alertmanager,
blackboxExporter: 'quay.io/prometheus/blackbox-exporter:v' + $.values.common.versions.blackboxExporter,
grafana: 'grafana/grafana:' + $.values.common.versions.grafana,
- kubeStateMetrics: 'k8s.gcr.io/kube-state-metrics/kube-state-metrics:v' + $.values.common.versions.kubeStateMetrics,
+ kubeStateMetrics: 'registry.k8s.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: 'registry.k8s.io/prometheus-adapter/prometheus-adapter:v' + $.values.common.versions.prometheusAdapter,
diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml
index f9c52036..bf908add 100644
--- a/manifests/kubeStateMetrics-deployment.yaml
+++ b/manifests/kubeStateMetrics-deployment.yaml
@@ -32,7 +32,7 @@ spec:
- --port=8081
- --telemetry-host=127.0.0.1
- --telemetry-port=8082
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.6.0
+ image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.6.0
name: kube-state-metrics
resources:
limits:
--
GitLab