Browse Source
Revert "Remove insecure-port and insecure-bind-address when possible"
pull/3288/head
Chad Swenson
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
0 additions and
12 deletions
-
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
-
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
-
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
|
|
|
@ -45,12 +45,8 @@ authorizationModes: |
|
|
|
selfHosted: false |
|
|
|
apiServerExtraArgs: |
|
|
|
bind-address: {{ kube_apiserver_bind_address }} |
|
|
|
{% if kube_apiserver_insecure_port|string != "0" %} |
|
|
|
insecure-bind-address: {{ kube_apiserver_insecure_bind_address }} |
|
|
|
{% endif %} |
|
|
|
{% if kube_apiserver_insecure_port|string != "0" or kube_version | version_compare('v1.10', '<') %} |
|
|
|
insecure-port: "{{ kube_apiserver_insecure_port }}" |
|
|
|
{% endif %} |
|
|
|
{% if kube_version | version_compare('v1.10', '<') %} |
|
|
|
admission-control: {{ kube_apiserver_admission_control | join(',') }} |
|
|
|
{% else %} |
|
|
|
|
|
|
|
@ -37,12 +37,8 @@ authorizationModes: |
|
|
|
{% endfor %} |
|
|
|
apiServerExtraArgs: |
|
|
|
bind-address: {{ kube_apiserver_bind_address }} |
|
|
|
{% if kube_apiserver_insecure_port|string != "0" %} |
|
|
|
insecure-bind-address: {{ kube_apiserver_insecure_bind_address }} |
|
|
|
{% endif %} |
|
|
|
{% if kube_apiserver_insecure_port|string != "0" or kube_version | version_compare('v1.10', '<') %} |
|
|
|
insecure-port: "{{ kube_apiserver_insecure_port }}" |
|
|
|
{% endif %} |
|
|
|
{% if kube_version | version_compare('v1.10', '<') %} |
|
|
|
admission-control: {{ kube_apiserver_admission_control | join(',') }} |
|
|
|
{% else %} |
|
|
|
|
|
|
|
@ -46,9 +46,7 @@ spec: |
|
|
|
- --etcd-cafile={{ etcd_cert_dir }}/ca.pem |
|
|
|
- --etcd-certfile={{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem |
|
|
|
- --etcd-keyfile={{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem |
|
|
|
{% if kube_apiserver_insecure_port|string != "0" %} |
|
|
|
- --insecure-bind-address={{ kube_apiserver_insecure_bind_address }} |
|
|
|
{% endif %} |
|
|
|
- --bind-address={{ kube_apiserver_bind_address }} |
|
|
|
- --apiserver-count={{ kube_apiserver_count }} |
|
|
|
{% if kube_version | version_compare('v1.9', '>=') %} |
|
|
|
@ -102,9 +100,7 @@ spec: |
|
|
|
{% endif %} |
|
|
|
{% endif %} |
|
|
|
- --secure-port={{ kube_apiserver_port }} |
|
|
|
{% if kube_apiserver_insecure_port|string != "0" or kube_version | version_compare('v1.10', '<') %} |
|
|
|
- --insecure-port={{ kube_apiserver_insecure_port }} |
|
|
|
{% endif %} |
|
|
|
- --storage-backend={{ kube_apiserver_storage_backend }} |
|
|
|
{% if kube_api_runtime_config is defined %} |
|
|
|
{% for conf in kube_api_runtime_config %} |
|
|
|
|
