Browse Source

Add oidc prefixes to kubeadm templates (#4159)

pull/4164/head
Vasilis Remmas 6 years ago
committed by Kubernetes Prow Robot
parent
commit
cd7924f8c9
4 changed files with 24 additions and 0 deletions
  1. 6
      roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
  2. 6
      roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
  3. 6
      roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
  4. 6
      roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2

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

@ -98,6 +98,12 @@ apiServerExtraArgs:
{% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% 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 %}
{% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml

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

@ -83,6 +83,12 @@ apiServerExtraArgs:
{% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% 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 %}
{% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml

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

@ -93,6 +93,12 @@ apiServerExtraArgs:
{% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% 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 %}
{% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml

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

@ -90,6 +90,12 @@ apiServer:
{% if kube_oidc_groups_claim is defined %}
oidc-groups-claim: {{ kube_oidc_groups_claim }}
{% 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 %}
{% if kube_webhook_token_auth|default(false) %}
authentication-token-webhook-config-file: {{ kube_config_dir }}/webhook-token-auth-config.yaml

Loading…
Cancel
Save