diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 0957824d913cc8c311d44e2c901f6e3302f191fb..8240472b88a4c01895391740034711f56b591920 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 1743d03aa723995c1b7e113145543dc4a8a7691d..2ecd017ff369e143aa3d84df0b5e5352ec8c7caf 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 086bb1a54d38db4f99363a2e2a0526b4996d7330..89719d08db8910ffe8a00b8af1121f09d9857001 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 a34268ae22286882afe00e8430d24a73bda47b6b..045a13e0c4a4d6a6e67a25890368e60e38c3380d 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