C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove hyperkube from codebase (#6965)

Browse source
This commit is contained in:
Florian Ruynat 2020-12-02 22:50:59 +01:00 committed by GitHub
parent 68b96bdf1a
commit db4e942b0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/ansible.md
View file

@ -116,7 +116,6 @@ The following tags are defined in playbooks:
| facts | Gathering facts and misc check results | facts | Gathering facts and misc check results
| flannel | Network plugin flannel | flannel | Network plugin flannel
| gce | Cloud-provider GCP | gce | Cloud-provider GCP
| hyperkube | Manipulations with K8s hyperkube image
| k8s-pre-upgrade | Upgrading K8s cluster | k8s-pre-upgrade | Upgrading K8s cluster
| k8s-secrets | Configuring K8s certs/keys | k8s-secrets | Configuring K8s certs/keys
| kube-apiserver | Configuring static pod kube-apiserver | kube-apiserver | Configuring static pod kube-apiserver

2
docs/vars.md
View file

@ -22,7 +22,7 @@ Some variables of note include:
* *ipip* - Enables Calico ipip encapsulation by default * *ipip* - Enables Calico ipip encapsulation by default
* *kube_network_plugin* - Sets k8s network plugin (default Calico) * *kube_network_plugin* - Sets k8s network plugin (default Calico)
* *kube_proxy_mode* - Changes k8s proxy mode to iptables mode * *kube_proxy_mode* - Changes k8s proxy mode to iptables mode
* *kube_version* - Specify a given Kubernetes hyperkube version * *kube_version* - Specify a given Kubernetes version
* *searchdomains* - Array of DNS domains to search when looking up hostnames * *searchdomains* - Array of DNS domains to search when looking up hostnames
* *nameservers* - Array of nameservers to use for DNS lookup * *nameservers* - Array of nameservers to use for DNS lookup
* *preinstall_selinux_state* - Set selinux state, permitted values are permissive and disabled. * *preinstall_selinux_state* - Set selinux state, permitted values are permissive and disabled.

1
roles/download/templates/kubeadm-images.yaml.j2
View file

@ -7,7 +7,6 @@ apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration kind: ClusterConfiguration
imageRepository: {{ kube_image_repo }} imageRepository: {{ kube_image_repo }}
kubernetesVersion: {{ kube_version }} kubernetesVersion: {{ kube_version }}
useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
etcd: etcd:
{% if etcd_kubeadm_enabled %} {% if etcd_kubeadm_enabled %}
local: local:

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

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

3
roles/kubespray-defaults/defaults/main.yaml
View file

@ -20,9 +20,6 @@ kube_version: v1.19.3
## The minimum version working ## The minimum version working
kube_version_min_required: v1.17.0 kube_version_min_required: v1.17.0
# use HyperKube image to control plane containers
kubeadm_use_hyperkube_image: False
## Kube Proxy mode One of ['iptables','ipvs'] ## Kube Proxy mode One of ['iptables','ipvs']
kube_proxy_mode: ipvs kube_proxy_mode: ipvs

1
roles/reset/tasks/main.yml
View file

@ -251,7 +251,6 @@
- "{{ bin_dir }}/kubernetes-scripts" - "{{ bin_dir }}/kubernetes-scripts"
- "{{ bin_dir }}/kubectl" - "{{ bin_dir }}/kubectl"
- "{{ bin_dir }}/kubeadm" - "{{ bin_dir }}/kubeadm"
- "{{ bin_dir }}/hyperkube"
- "{{ bin_dir }}/helm" - "{{ bin_dir }}/helm"
- "{{ bin_dir }}/calicoctl" - "{{ bin_dir }}/calicoctl"
- "{{ bin_dir }}/calicoctl.sh" - "{{ bin_dir }}/calicoctl.sh"