Skip to content

Commit f0d8fd8

Browse files
committed
feat: add support for custom kubeadm pull image repository
Signed-off-by: Ho Kim <[email protected]>
1 parent 4ad9f9b commit f0d8fd8

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

roles/download/templates/kubeadm-images.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ nodeRegistration:
55
---
66
apiVersion: kubeadm.k8s.io/{{ kubeadm_config_api_version }}
77
kind: ClusterConfiguration
8-
imageRepository: {{ kube_image_repo }}
8+
imageRepository: {{ kubeadm_image_repo }}
99
kubernetesVersion: v{{ kube_version }}
1010
etcd:
1111
{% if etcd_deployment_type == "kubeadm" %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ controlPlaneEndpoint: "{{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.p
111111
controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}"
112112
{% endif %}
113113
certificatesDir: {{ kube_cert_dir }}
114-
imageRepository: {{ kube_image_repo }}
114+
imageRepository: {{ kubeadm_image_repo }}
115115
apiServer:
116116
extraArgs:
117117
{% if kube_apiserver_etcd_compaction_interval is defined %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ controlPlaneEndpoint: "{{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.p
128128
controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}"
129129
{% endif %}
130130
certificatesDir: {{ kube_cert_dir }}
131-
imageRepository: {{ kube_image_repo }}
131+
imageRepository: {{ kubeadm_image_repo }}
132132
apiServer:
133133
extraArgs:
134134
{% if kube_apiserver_etcd_compaction_interval is defined %}

roles/kubespray-defaults/defaults/main/download.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ skopeo_binary_checksum: "{{ skopeo_binary_checksums[image_arch][skopeo_version]
226226
# Also provide the address of your own private registry.
227227
# And use --insecure-registry options for docker
228228
kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy"
229+
kubeadm_image_repo: "{{ kube_image_repo }}"
229230
etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd"
230231
etcd_image_tag: "v{{ etcd_version }}"
231232
flannel_image_repo: "{{ docker_image_repo }}/flannel/flannel"

0 commit comments

Comments
 (0)