External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-08 09:57:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add oidc prefixes to kubeadm templates (#4462)

Browse Source
This commit is contained in:
Daniel Werdermann
2019-04-09 10:07:06 +02:00
committed by Kubernetes Prow Robot
parent 3901480bc1
commit 447605ca0e
3 changed files with 18 additions and 0 deletions
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_encrypt_secret_data %} {% if kube_encrypt_secret_data %}
experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.yaml experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.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_encrypt_secret_data %} {% if kube_encrypt_secret_data %}
experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.yaml experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.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_encrypt_secret_data %} {% if kube_encrypt_secret_data %}
experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.yaml experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.yaml