epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for admission controllers in 1.10 and above

Browse Source
This commit is contained in:
Robert Everson
2018-08-02 11:10:40 -07:00
parent e71f261935
commit ac18f6cf8b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,11 @@ apiServerExtraArgs:
bind-address: {{ kube_apiserver_bind_address }} bind-address: {{ kube_apiserver_bind_address }}
insecure-bind-address: {{ kube_apiserver_insecure_bind_address }} insecure-bind-address: {{ kube_apiserver_insecure_bind_address }}
insecure-port: "{{ kube_apiserver_insecure_port }}" insecure-port: "{{ kube_apiserver_insecure_port }}"
{% if kube_version | version_compare('v1.10', '<') %}
admission-control: {{ kube_apiserver_admission_control | join(',') }} admission-control: {{ kube_apiserver_admission_control | join(',') }}
{% else %}
enable-admission-plugins: {{ kube_apiserver_admission_control | join(',') }}
{% endif %}
apiserver-count: "{{ kube_apiserver_count }}" apiserver-count: "{{ kube_apiserver_count }}"
{% if kube_version | version_compare('v1.9', '>=') %} {% if kube_version | version_compare('v1.9', '>=') %}
endpoint-reconciler-type: lease endpoint-reconciler-type: lease

4
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View File

@@ -45,7 +45,11 @@ spec:
{% if kube_version | version_compare('v1.9', '>=') %} {% if kube_version | version_compare('v1.9', '>=') %}
- --endpoint-reconciler-type=lease - --endpoint-reconciler-type=lease
{% endif %} {% endif %}
{% if kube_version | version_compare('v1.10', '<') %}
- --admission-control={{ kube_apiserver_admission_control | join(',') }} - --admission-control={{ kube_apiserver_admission_control | join(',') }}
{% else %}
- --enable-admission-plugins={{ kube_apiserver_admission_control | join(',') }}
{% endif %}
- --service-cluster-ip-range={{ kube_service_addresses }} - --service-cluster-ip-range={{ kube_service_addresses }}
- --service-node-port-range={{ kube_apiserver_node_port_range }} - --service-node-port-range={{ kube_apiserver_node_port_range }}
- --client-ca-file={{ kube_cert_dir }}/ca.pem - --client-ca-file={{ kube_cert_dir }}/ca.pem