From 447605ca0e0282ab3ccd1af3f2f8e713bd9532f8 Mon Sep 17 00:00:00 2001 From: Daniel Werdermann Date: Tue, 9 Apr 2019 10:07:06 +0200 Subject: [PATCH] Add oidc prefixes to kubeadm templates (#4462) --- .../master/templates/kubeadm-config.v1alpha1.yaml.j2 | 6 ++++++ .../master/templates/kubeadm-config.v1alpha2.yaml.j2 | 6 ++++++ .../master/templates/kubeadm-config.v1alpha3.yaml.j2 | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 1866be550..0c4b4eccb 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_encrypt_secret_data %} experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.yaml diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index 158b3811b..d4d52e82d 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_encrypt_secret_data %} experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.yaml diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index 155b4fe54..40af8b46c 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_encrypt_secret_data %} experimental-encryption-provider-config: {{ kube_config_dir }}/ssl/secrets_encryption.yaml