From bc30ea758206eb38121467df39ee1feaad117a3d Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Thu, 23 Mar 2017 00:25:01 +0300 Subject: [PATCH] replace non-breakable space with regular space Non-brekable space is 0xc2 0xa0 byte sequence in UTF-8. To find one: $ git grep -I -P '\xc2\xa0' To replace with regular space: $ git grep -l -I -P '\xc2\xa0' | xargs sed -i 's/\xc2\xa0/ /g' This commit doesn't include changes that will overlap with commit f1c59a91a1. --- docs/roadmap.md | 4 ++-- .../master/templates/manifests/kube-apiserver.manifest.j2 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/roadmap.md b/docs/roadmap.md index 4d718e94f..72899b016 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -5,7 +5,7 @@ Kargo's roadmap - Propose kubeadm as an option in order to setup the kubernetes cluster. That would probably improve deployment speed and certs management [#553](https://github.com/kubespray/kargo/issues/553) -### Self deployment (pull-mode) [#320](https://github.com/kubespray/kargo/issues/320) +### Self deployment (pull-mode) [#320](https://github.com/kubespray/kargo/issues/320) - the playbook would install and configure docker/rkt and the etcd cluster - the following data would be inserted into etcd: certs,tokens,users,inventory,group_vars. - a "kubespray" container would be deployed (kargo-cli, ansible-playbook, kpm) @@ -18,7 +18,7 @@ That would probably improve deployment speed and certs management [#553](https:/ - [ ] On Azure autoscaling, create loadbalancer [#297](https://github.com/kubespray/kargo/issues/297) - [ ] On GCE be able to create a loadbalancer automatically (IAM ?) [#280](https://github.com/kubespray/kargo/issues/280) - [x] **TLS boostrap** support for kubelet [#234](https://github.com/kubespray/kargo/issues/234) - (related issues: https://github.com/kubernetes/kubernetes/pull/20439
+ (related issues: https://github.com/kubernetes/kubernetes/pull/20439
https://github.com/kubernetes/kubernetes/issues/18112) ### Tests diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index 600ade340..d3057a840 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -46,13 +46,13 @@ spec: {% if kube_oidc_auth|default(false) and kube_oidc_url is defined and kube_oidc_client_id is defined %} - --oidc-issuer-url={{ kube_oidc_url }} - --oidc-client-id={{ kube_oidc_client_id }} -{% if kube_oidc_ca_file is defined %} +{% if kube_oidc_ca_file is defined %} - --oidc-ca-file={{ kube_oidc_ca_file }} {% endif %} -{% if kube_oidc_username_claim is defined %} +{% if kube_oidc_username_claim is defined %} - --oidc-username-claim={{ kube_oidc_username_claim }} {% endif %} -{% if kube_oidc_groups_claim is defined %} +{% if kube_oidc_groups_claim is defined %} - --oidc-groups-claim={{ kube_oidc_groups_claim }} {% endif %} {% endif %}