From 7cdf1fd3882bf26534b0699fda2516f404bacab0 Mon Sep 17 00:00:00 2001 From: Abdulaziz AlMalki Date: Tue, 9 Apr 2019 15:23:06 +0300 Subject: [PATCH] quote values for kube_oidc_groups_prefix and kube_oidc_username_prefix values to accept colon, e.g oidc: (#4305) This will fix error: error converting YAML to JSON: yaml: line 36: mapping values are not allowed in this context Signed-off-by: Abdulaziz AlMalki --- .../master/templates/kubeadm-config.v1alpha1.yaml.j2 | 4 ++-- .../master/templates/kubeadm-config.v1alpha2.yaml.j2 | 4 ++-- .../master/templates/kubeadm-config.v1alpha3.yaml.j2 | 4 ++-- .../master/templates/kubeadm-config.v1beta1.yaml.j2 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index e4dd7cbdc..ec157e980 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 @@ -99,10 +99,10 @@ apiServerExtraArgs: oidc-groups-claim: {{ kube_oidc_groups_claim }} {% endif %} {% if kube_oidc_username_prefix is defined %} - oidc-username-prefix: {{ kube_oidc_username_prefix }} + oidc-username-prefix: "{{ kube_oidc_username_prefix }}" {% endif %} {% if kube_oidc_groups_prefix is defined %} - oidc-groups-prefix: {{ kube_oidc_groups_prefix }} + oidc-groups-prefix: "{{ kube_oidc_groups_prefix }}" {% endif %} {% endif %} {% if kube_webhook_token_auth|default(false) %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index 5663e8a7c..6f9cd4458 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 @@ -84,10 +84,10 @@ apiServerExtraArgs: oidc-groups-claim: {{ kube_oidc_groups_claim }} {% endif %} {% if kube_oidc_username_prefix is defined %} - oidc-username-prefix: {{ kube_oidc_username_prefix }} + oidc-username-prefix: "{{ kube_oidc_username_prefix }}" {% endif %} {% if kube_oidc_groups_prefix is defined %} - oidc-groups-prefix: {{ kube_oidc_groups_prefix }} + oidc-groups-prefix: "{{ kube_oidc_groups_prefix }}" {% endif %} {% endif %} {% if kube_webhook_token_auth|default(false) %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index 43ae27e5b..6dc736651 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 @@ -94,10 +94,10 @@ apiServerExtraArgs: oidc-groups-claim: {{ kube_oidc_groups_claim }} {% endif %} {% if kube_oidc_username_prefix is defined %} - oidc-username-prefix: {{ kube_oidc_username_prefix }} + oidc-username-prefix: "{{ kube_oidc_username_prefix }}" {% endif %} {% if kube_oidc_groups_prefix is defined %} - oidc-groups-prefix: {{ kube_oidc_groups_prefix }} + oidc-groups-prefix: "{{ kube_oidc_groups_prefix }}" {% endif %} {% endif %} {% if kube_webhook_token_auth|default(false) %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index eec4f32f7..0243ce382 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -91,10 +91,10 @@ apiServer: oidc-groups-claim: {{ kube_oidc_groups_claim }} {% endif %} {% if kube_oidc_username_prefix is defined %} - oidc-username-prefix: {{ kube_oidc_username_prefix }} + oidc-username-prefix: "{{ kube_oidc_username_prefix }}" {% endif %} {% if kube_oidc_groups_prefix is defined %} - oidc-groups-prefix: {{ kube_oidc_groups_prefix }} + oidc-groups-prefix: "{{ kube_oidc_groups_prefix }}" {% endif %} {% endif %} {% if kube_webhook_token_auth|default(false) %}