epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 22:04:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: add support for custom kubeadm pull image repository (#12128)

Browse Source 
Signed-off-by: Ho Kim <ho.kim@ulagbulag.io>
This commit is contained in:
Ho Kim
2025-08-14 10:03:06 +09:00
committed by GitHub
parent 155c1c1531
commit 707616178e
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/download/templates/kubeadm-images.yaml.j2
View File

@@ -5,7 +5,7 @@ nodeRegistration:
--- ---
apiVersion: kubeadm.k8s.io/{{ kubeadm_config_api_version }} apiVersion: kubeadm.k8s.io/{{ kubeadm_config_api_version }}
kind: ClusterConfiguration kind: ClusterConfiguration
imageRepository: {{ kube_image_repo }} imageRepository: {{ kubeadm_image_repo }}
kubernetesVersion: v{{ kube_version }} kubernetesVersion: v{{ kube_version }}
etcd: etcd:
{% if etcd_deployment_type == "kubeadm" %} {% if etcd_deployment_type == "kubeadm" %}

2
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
View File

@@ -103,7 +103,7 @@ controlPlaneEndpoint: "{{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.p
controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}" controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}"
{% endif %} {% endif %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}
imageRepository: {{ kube_image_repo }} imageRepository: {{ kubeadm_image_repo }}
apiServer: apiServer:
extraArgs: extraArgs:
etcd-compaction-interval: "{{ kube_apiserver_etcd_compaction_interval }}" etcd-compaction-interval: "{{ kube_apiserver_etcd_compaction_interval }}"

2
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
View File

@@ -122,7 +122,7 @@ controlPlaneEndpoint: "{{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.p
controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}" controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}"
{% endif %} {% endif %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}
imageRepository: {{ kube_image_repo }} imageRepository: {{ kubeadm_image_repo }}
apiServer: apiServer:
extraArgs: extraArgs:
- name: etcd-compaction-interval - name: etcd-compaction-interval

1
roles/kubespray_defaults/defaults/main/download.yml
View File

@@ -88,6 +88,7 @@ docker_containerd_version: 1.6.32
# gcr and kubernetes image repo define # gcr and kubernetes image repo define
gcr_image_repo: "gcr.io" gcr_image_repo: "gcr.io"
kube_image_repo: "registry.k8s.io" kube_image_repo: "registry.k8s.io"
kubeadm_image_repo: "{{ kube_image_repo }}"
# docker image repo define # docker image repo define
docker_image_repo: "docker.io" docker_image_repo: "docker.io"