Skip to content

Commit 85b7490

Browse files
committed
Remove --auth-anonymous if kube_api_anonymous_auth is undefined.
Remove --auth-anonymous if kube_api_anonymous_auth in undefined, to avoid compatibility errors with other arguments of the kube-apiserver, such as --authentication-config when anonymous field is configured.
1 parent ede92b0 commit 85b7490

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ apiServer:
109109
etcd-compaction-interval: "{{ kube_apiserver_etcd_compaction_interval }}"
110110
default-not-ready-toleration-seconds: "{{ kube_apiserver_pod_eviction_not_ready_timeout_seconds }}"
111111
default-unreachable-toleration-seconds: "{{ kube_apiserver_pod_eviction_unreachable_timeout_seconds }}"
112+
{% if kube_api_anonymous_auth is defined %}
113+
{# TODO: rework once suppport for structured auth lands #}
112114
anonymous-auth: "{{ kube_api_anonymous_auth }}"
115+
{% endif %}
113116
{% if kube_apiserver_use_authorization_config_file %}
114117
authorization-config: "{{ kube_config_dir }}/apiserver-authorization-config-{{ kube_apiserver_authorization_config_api_version }}.yaml"
115118
{% else %}

roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,11 @@ apiServer:
131131
value: "{{ kube_apiserver_pod_eviction_not_ready_timeout_seconds }}"
132132
- name: default-unreachable-toleration-seconds
133133
value: "{{ kube_apiserver_pod_eviction_unreachable_timeout_seconds }}"
134+
{% if kube_api_anonymous_auth is defined %}
135+
{# TODO: rework once suppport for structured auth lands #}
134136
- name: anonymous-auth
135137
value: "{{ kube_api_anonymous_auth }}"
138+
{% endif %}
136139
{% if kube_apiserver_use_authorization_config_file %}
137140
- name: authorization-config
138141
value: "{{ kube_config_dir }}/apiserver-authorization-config-{{ kube_apiserver_authorization_config_api_version }}.yaml"

roles/kubespray_defaults/defaults/main/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ping_access_ip: true
1111

1212
# Setting this value to false will fail
1313
# For details, read this comment https://github.com/kubernetes-sigs/kubespray/pull/11016#issuecomment-2004985001
14+
# if kube_api_anonymous_auth: "{{ undef() }}", remove --anonymous-auth argument
1415
kube_api_anonymous_auth: true
1516

1617
# Default value, but will be set to true automatically if detected

0 commit comments

Comments
 (0)