Browse Source
feat: add support for custom kubeadm pull image repository (#12128)
Signed-off-by: Ho Kim <ho.kim@ulagbulag.io>
pull/12460/head
Ho Kim
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
4 additions and
3 deletions
-
roles/download/templates/kubeadm-images.yaml.j2
-
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
-
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2
-
roles/kubespray_defaults/defaults/main/download.yml
|
|
@ -5,7 +5,7 @@ nodeRegistration: |
|
|
|
--- |
|
|
|
apiVersion: kubeadm.k8s.io/{{ kubeadm_config_api_version }} |
|
|
|
kind: ClusterConfiguration |
|
|
|
imageRepository: {{ kube_image_repo }} |
|
|
|
imageRepository: {{ kubeadm_image_repo }} |
|
|
|
kubernetesVersion: v{{ kube_version }} |
|
|
|
etcd: |
|
|
|
{% if etcd_deployment_type == "kubeadm" %} |
|
|
|
|
|
@ -103,7 +103,7 @@ controlPlaneEndpoint: "{{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.p |
|
|
|
controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}" |
|
|
|
{% endif %} |
|
|
|
certificatesDir: {{ kube_cert_dir }} |
|
|
|
imageRepository: {{ kube_image_repo }} |
|
|
|
imageRepository: {{ kubeadm_image_repo }} |
|
|
|
apiServer: |
|
|
|
extraArgs: |
|
|
|
etcd-compaction-interval: "{{ kube_apiserver_etcd_compaction_interval }}" |
|
|
|
|
|
@ -122,7 +122,7 @@ controlPlaneEndpoint: "{{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.p |
|
|
|
controlPlaneEndpoint: "{{ main_ip | ansible.utils.ipwrap }}:{{ kube_apiserver_port }}" |
|
|
|
{% endif %} |
|
|
|
certificatesDir: {{ kube_cert_dir }} |
|
|
|
imageRepository: {{ kube_image_repo }} |
|
|
|
imageRepository: {{ kubeadm_image_repo }} |
|
|
|
apiServer: |
|
|
|
extraArgs: |
|
|
|
- name: etcd-compaction-interval |
|
|
|
|
|
@ -88,6 +88,7 @@ docker_containerd_version: 1.6.32 |
|
|
|
# gcr and kubernetes image repo define |
|
|
|
gcr_image_repo: "gcr.io" |
|
|
|
kube_image_repo: "registry.k8s.io" |
|
|
|
kubeadm_image_repo: "{{ kube_image_repo }}" |
|
|
|
|
|
|
|
# docker image repo define |
|
|
|
docker_image_repo: "docker.io" |
|
|
|