From e002e139757835c7946a03997373f281d8e077f7 Mon Sep 17 00:00:00 2001 From: Dmitri Fedotov Date: Fri, 16 Feb 2024 12:38:32 +0200 Subject: [PATCH] add kubeadm image repo override --- charts/seed/templates/kubeadm.yaml | 6 +++--- charts/seed/values.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/seed/templates/kubeadm.yaml b/charts/seed/templates/kubeadm.yaml index fbdeb8e145..96c7c9c408 100644 --- a/charts/seed/templates/kubeadm.yaml +++ b/charts/seed/templates/kubeadm.yaml @@ -188,7 +188,7 @@ data: timeoutForControlPlane: 4m0s apiVersion: kubeadm.k8s.io/v1beta3 certificatesDir: /etc/kubernetes/pki - clusterName: "{{ .Values.shortName }}" + clusterName: "{{ .Values.name }}" controlPlaneEndpoint: "{{ .Values.api.apiserverHost }}" controllerManager: extraArgs: @@ -197,7 +197,7 @@ data: etcd: local: dataDir: /var/lib/etcd - imageRepository: registry.k8s.io + imageRepository: {{ .Values.kubeadmImageRepository }} kind: ClusterConfiguration kubernetesVersion: {{ .Capabilities.KubeVersion.Version }} networking: @@ -230,7 +230,7 @@ data: cgroupDriver: systemd clusterDNS: - {{ .Values.dns.address }} - clusterDomain: cluster.local + clusterDomain: {{ .Values.dns.domain }} containerRuntimeEndpoint: "" cpuManagerReconcilePeriod: 0s evictionPressureTransitionPeriod: 0s diff --git a/charts/seed/values.yaml b/charts/seed/values.yaml index df058f0a9c..e52ccf4e86 100644 --- a/charts/seed/values.yaml +++ b/charts/seed/values.yaml @@ -40,6 +40,7 @@ version: {} # kubernetes: 1.10.11 clusterAdminUser: TCC_D038720_01 +kubeadmImageRepository: keppel.global.cloud.sap/ccloud-registry-k8s-io-mirror # tlsCaCert: # serviceCIDR