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

Add oidc prefixes to kubeadm templates (#4159)

Browse source
This commit is contained in:
Vasilis Remmas 2019-02-01 00:31:43 +01:00 committed by Kubernetes Prow Robot
parent 7f93a5a0f5
commit cd7924f8c9
4 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
View file

@ -98,6 +98,12 @@ apiServerExtraArgs:
{% if kube_oidc_groups_claim is defined %} {% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }} oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% endif %} {% endif %}
{% if kube_oidc_username_prefix is defined %}
oidc-username-prefix: {{ kube_oidc_username_prefix }}
{% endif %}
{% if kube_oidc_groups_prefix is defined %}
oidc-groups-prefix: {{ kube_oidc_groups_prefix }}
{% endif %}
{% endif %} {% endif %}
{% if kube_webhook_token_auth|default(false) %} {% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml

6
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View file

@ -83,6 +83,12 @@ apiServerExtraArgs:
{% if kube_oidc_groups_claim is defined %} {% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }} oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% endif %} {% endif %}
{% if kube_oidc_username_prefix is defined %}
oidc-username-prefix: {{ kube_oidc_username_prefix }}
{% endif %}
{% if kube_oidc_groups_prefix is defined %}
oidc-groups-prefix: {{ kube_oidc_groups_prefix }}
{% endif %}
{% endif %} {% endif %}
{% if kube_webhook_token_auth|default(false) %} {% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml

6
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View file

@ -93,6 +93,12 @@ apiServerExtraArgs:
{% if kube_oidc_groups_claim is defined %} {% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }} oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% endif %} {% endif %}
{% if kube_oidc_username_prefix is defined %}
oidc-username-prefix: {{ kube_oidc_username_prefix }}
{% endif %}
{% if kube_oidc_groups_prefix is defined %}
oidc-groups-prefix: {{ kube_oidc_groups_prefix }}
{% endif %}
{% endif %} {% endif %}
{% if kube_webhook_token_auth|default(false) %} {% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml

6
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View file

@ -90,6 +90,12 @@ apiServer:
{% if kube_oidc_groups_claim is defined %} {% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }} oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% endif %} {% endif %}
{% if kube_oidc_username_prefix is defined %}
oidc-username-prefix: {{ kube_oidc_username_prefix }}
{% endif %}
{% if kube_oidc_groups_prefix is defined %}
oidc-groups-prefix: {{ kube_oidc_groups_prefix }}
{% endif %}
{% endif %} {% endif %}
{% if kube_webhook_token_auth|default(false) %} {% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml