From 9e23f3a86df7efa17ceea116a393587b403a0540 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 26 Jun 2017 16:01:32 -0700 Subject: [PATCH] examples: Fix LOCKSMITHD_ENDPOINT protocol to be https * Fix auto-update issue introduced in 6f02107 which occurs when self-hosted etcd is used and locksmithd cannot auth * See #590 --- .../terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl | 2 +- .../terraform/modules/profiles/cl/bootkube-worker.yaml.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl b/examples/terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl index f05439e6..1b4f5b61 100644 --- a/examples/terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl +++ b/examples/terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl @@ -36,7 +36,7 @@ systemd: Environment="LOCKSMITHD_ETCD_CERTFILE=/etc/ssl/etcd/etcd-client.crt" Environment="LOCKSMITHD_ETCD_KEYFILE=/etc/ssl/etcd/etcd-client.key" {{ if eq .etcd_on_host "false" -}} - Environment="LOCKSMITHD_ENDPOINT=http://{{.k8s_etcd_service_ip}}:2379" + Environment="LOCKSMITHD_ENDPOINT=https://{{.k8s_etcd_service_ip}}:2379" {{ else }} Environment="LOCKSMITHD_ENDPOINT={{.etcd_endpoints}}" {{ end }} diff --git a/examples/terraform/modules/profiles/cl/bootkube-worker.yaml.tmpl b/examples/terraform/modules/profiles/cl/bootkube-worker.yaml.tmpl index cfdf70e8..b99f98f6 100644 --- a/examples/terraform/modules/profiles/cl/bootkube-worker.yaml.tmpl +++ b/examples/terraform/modules/profiles/cl/bootkube-worker.yaml.tmpl @@ -13,7 +13,7 @@ systemd: Environment="LOCKSMITHD_ETCD_CERTFILE=/etc/ssl/etcd/etcd-client.crt" Environment="LOCKSMITHD_ETCD_KEYFILE=/etc/ssl/etcd/etcd-client.key" {{ if eq .etcd_on_host "false" -}} - Environment="LOCKSMITHD_ENDPOINT=http://{{.k8s_etcd_service_ip}}:2379" + Environment="LOCKSMITHD_ENDPOINT=https://{{.k8s_etcd_service_ip}}:2379" {{ else }} Environment="LOCKSMITHD_ENDPOINT={{.etcd_endpoints}}" {{ end }}