External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-11 11:27:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add support for k8s v1.17.0-rc.1, remove hyperkube (#5378)

Browse Source 
Change-Id: I3fff04f0211cd9c2e8235acaf51c3aa98abc8bb7
This commit is contained in:
Matthew Mosesohn
2019-11-28 16:41:03 +03:00
committed by Kubernetes Prow Robot
parent f779cb93d6
commit 18cee65c4b
9 changed files with 127 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/master/tasks/main.yml
View File

@@ -19,7 +19,7 @@
- name: Install | Copy kubectl binary from download dir
synchronize:
src: "{{ local_release_dir }}/hyperkube-{{ kube_version }}-{{ image_arch }}"
src: "{{ local_release_dir }}/kubectl-{{ kube_version }}-{{ image_arch }}"
dest: "{{ bin_dir }}/kubectl"
compress: no
perms: yes
@@ -28,7 +28,6 @@
changed_when: false
delegate_to: "{{ inventory_hostname }}"
tags:
- hyperkube
- kubectl
- upgrade
@@ -38,7 +37,6 @@
mode: "0755"
state: file
tags:
- hyperkube
- kubectl
- upgrade

1
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View File

@@ -91,7 +91,6 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku
{% endif %}
certificatesDir: {{ kube_cert_dir }}
imageRepository: {{ kube_image_repo }}
useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
apiServer:
extraArgs:
{% if kube_api_anonymous_auth is defined %}

1
roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
View File

@@ -94,7 +94,6 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku
{% endif %}
certificatesDir: {{ kube_cert_dir }}
imageRepository: {{ kube_image_repo }}
useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
apiServer:
extraArgs:
{% if kube_api_anonymous_auth is defined %}