From cd7924f8c9c11dbdcb597d90669f9d95f7ebce07 Mon Sep 17 00:00:00 2001 From: Vasilis Remmas Date: Fri, 1 Feb 2019 00:31:43 +0100 Subject: [PATCH] Add oidc prefixes to kubeadm templates (#4159) --- .../master/templates/kubeadm-config.v1alpha1.yaml.j2 | 6 ++++++ .../master/templates/kubeadm-config.v1alpha2.yaml.j2 | 6 ++++++ .../master/templates/kubeadm-config.v1alpha3.yaml.j2 | 6 ++++++ .../master/templates/kubeadm-config.v1beta1.yaml.j2 | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 0957824d9..8240472b8 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 +++ b/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 diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index 1743d03aa..2ecd017ff 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 +++ b/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 diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index 086bb1a54..89719d08d 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 +++ b/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 diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index a34268ae2..045a13e0c 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/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