Separate out plugins into 2 variables
This commit is contained in:
parent
ac18f6cf8b
commit
6ed65d762b
3 changed files with 18 additions and 2 deletions
|
@ -56,6 +56,20 @@ kube_apiserver_admission_control:
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
- ResourceQuota
|
- ResourceQuota
|
||||||
|
|
||||||
|
# 1.10+ admission plugins
|
||||||
|
kube_apiserver_enable_admission_plugins:
|
||||||
|
- NamespaceLifecycle
|
||||||
|
- LimitRanger
|
||||||
|
- ServiceAccount
|
||||||
|
- DefaultStorageClass
|
||||||
|
- DefaultTolerationSeconds
|
||||||
|
- MutatingAdmissionWebhook
|
||||||
|
- ValidatingAdmissionWebhook
|
||||||
|
- ResourceQuota
|
||||||
|
|
||||||
|
# 1.10+ list of disabled admission plugins
|
||||||
|
kube_apiserver_disable_admission_plugins: []
|
||||||
|
|
||||||
# extra runtime config
|
# extra runtime config
|
||||||
kube_api_runtime_config:
|
kube_api_runtime_config:
|
||||||
- admissionregistration.k8s.io/v1alpha1
|
- admissionregistration.k8s.io/v1alpha1
|
||||||
|
|
|
@ -37,7 +37,8 @@ apiServerExtraArgs:
|
||||||
{% if kube_version | version_compare('v1.10', '<') %}
|
{% if kube_version | version_compare('v1.10', '<') %}
|
||||||
admission-control: {{ kube_apiserver_admission_control | join(',') }}
|
admission-control: {{ kube_apiserver_admission_control | join(',') }}
|
||||||
{% else %}
|
{% else %}
|
||||||
enable-admission-plugins: {{ kube_apiserver_admission_control | join(',') }}
|
enable-admission-plugins: {{ kube_apiserver_enable_admission_plugins | join(',') }}
|
||||||
|
disable-admission-plugins: {{ kube_apiserver_disable_admission_plugins | join(',') }}
|
||||||
{% endif %}
|
{% 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', '>=') %}
|
||||||
|
|
|
@ -48,7 +48,8 @@ spec:
|
||||||
{% if kube_version | version_compare('v1.10', '<') %}
|
{% if kube_version | version_compare('v1.10', '<') %}
|
||||||
- --admission-control={{ kube_apiserver_admission_control | join(',') }}
|
- --admission-control={{ kube_apiserver_admission_control | join(',') }}
|
||||||
{% else %}
|
{% else %}
|
||||||
- --enable-admission-plugins={{ kube_apiserver_admission_control | join(',') }}
|
- --enable-admission-plugins={{ kube_apiserver_enable_admission_plugins | join(',') }}
|
||||||
|
- --disable-admission-plugins={{ kube_apiserver_disable_admission_plugins | join(',') }}
|
||||||
{% endif %}
|
{% 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 }}
|
||||||
|
|
Loading…
Reference in a new issue