You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

25 lines
682 B

Explicitely set etcd endpoint in kubeadm-images.yaml (#4063) Currently, the task `container_download | download images for kubeadm config images` fetches etcd image even though it's not required (etcd is bootstrapped by kubespray, not kubeadm). `kubeadm-images.yaml` is only a subset of `kubeadm-config.yaml`, therefore ``kubeadm config images pull` will try to get all this list (including etcd) ``` # kubeadm config images list --config /etc/kubernetes/kubeadm-images.yaml k8s.gcr.io/kube-apiserver:v1.13.2 k8s.gcr.io/kube-controller-manager:v1.13.2 k8s.gcr.io/kube-scheduler:v1.13.2 k8s.gcr.io/kube-proxy:v1.13.2 k8s.gcr.io/pause:3.1 k8s.gcr.io/etcd:3.2.24 k8s.gcr.io/coredns:1.2.6 ``` When using the `kubeadm-config.yaml` though, it doesn't list etcd image: ``` # kubeadm config images list --config /etc/kubernetes/kubeadm-config.yaml k8s.gcr.io/kube-apiserver:v1.13.2 k8s.gcr.io/kube-controller-manager:v1.13.2 k8s.gcr.io/kube-scheduler:v1.13.2 k8s.gcr.io/kube-proxy:v1.13.2 k8s.gcr.io/pause:3.1 k8s.gcr.io/coredns:1.2.6 ``` This change just adds the etcd endpoints in the `kubeadm-images.yaml` to give a hint to kubeadm it doesn't need etcd image for its boostrapping as etcd is "external". I confess it is a ugly hack, a better way would be to use a single `kubeadm-config.yaml` for both tasks, but they are triggered by different roles (`kubeadm-images.yaml` is used by download, `kubeadm-config.yaml` by kubernetes/master) at different steps and I didn't want to refactor too many things to prevent breakage. This is specially useful for offline installation where a whitelist of container images is mirrored on a local private container registry. `k8s.gcr.io/etcd` and `quay.io/coreos/etcd` are two different repositories hosting the same images but using *different tags*! * coreos/etcd:v3.2.24 * k8s.gcr.io/etcd:3.2.24 (note the missing 'v' in the tag name)
5 years ago
Explicitely set etcd endpoint in kubeadm-images.yaml (#4063) Currently, the task `container_download | download images for kubeadm config images` fetches etcd image even though it's not required (etcd is bootstrapped by kubespray, not kubeadm). `kubeadm-images.yaml` is only a subset of `kubeadm-config.yaml`, therefore ``kubeadm config images pull` will try to get all this list (including etcd) ``` # kubeadm config images list --config /etc/kubernetes/kubeadm-images.yaml k8s.gcr.io/kube-apiserver:v1.13.2 k8s.gcr.io/kube-controller-manager:v1.13.2 k8s.gcr.io/kube-scheduler:v1.13.2 k8s.gcr.io/kube-proxy:v1.13.2 k8s.gcr.io/pause:3.1 k8s.gcr.io/etcd:3.2.24 k8s.gcr.io/coredns:1.2.6 ``` When using the `kubeadm-config.yaml` though, it doesn't list etcd image: ``` # kubeadm config images list --config /etc/kubernetes/kubeadm-config.yaml k8s.gcr.io/kube-apiserver:v1.13.2 k8s.gcr.io/kube-controller-manager:v1.13.2 k8s.gcr.io/kube-scheduler:v1.13.2 k8s.gcr.io/kube-proxy:v1.13.2 k8s.gcr.io/pause:3.1 k8s.gcr.io/coredns:1.2.6 ``` This change just adds the etcd endpoints in the `kubeadm-images.yaml` to give a hint to kubeadm it doesn't need etcd image for its boostrapping as etcd is "external". I confess it is a ugly hack, a better way would be to use a single `kubeadm-config.yaml` for both tasks, but they are triggered by different roles (`kubeadm-images.yaml` is used by download, `kubeadm-config.yaml` by kubernetes/master) at different steps and I didn't want to refactor too many things to prevent breakage. This is specially useful for offline installation where a whitelist of container images is mirrored on a local private container registry. `k8s.gcr.io/etcd` and `quay.io/coreos/etcd` are two different repositories hosting the same images but using *different tags*! * coreos/etcd:v3.2.24 * k8s.gcr.io/etcd:3.2.24 (note the missing 'v' in the tag name)
5 years ago
  1. apiVersion: kubeadm.k8s.io/v1beta1
  2. kind: InitConfiguration
  3. nodeRegistration:
  4. criSocket: {{ cri_socket }}
  5. ---
  6. apiVersion: kubeadm.k8s.io/v1beta1
  7. kind: ClusterConfiguration
  8. imageRepository: {{ kube_image_repo }}
  9. kubernetesVersion: {{ kube_version }}
  10. etcd:
  11. {% if etcd_kubeadm_enabled %}
  12. local:
  13. imageRepository: "{{ etcd_image_repo | regex_replace("/etcd$","") }}"
  14. imageTag: "{{ etcd_image_tag }}"
  15. {% else %}
  16. external:
  17. endpoints:
  18. {% for endpoint in etcd_access_addresses.split(',') %}
  19. - {{ endpoint }}
  20. {% endfor %}
  21. {% endif %}
  22. dns:
  23. type: CoreDNS
  24. imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}
  25. imageTag: {{ coredns_image_tag }}