From 251a14519fdce7abc38370c3cdde4425c3386972 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 4 Nov 2017 11:44:03 -0700 Subject: [PATCH] Fix typo in internal template variable name * ssh_authorized_keys should be ssh_authorized_key to match the user facing variable which only allows a single SSH authorized key --- .../kubernetes/controllers/cl/controller.yaml.tmpl | 2 +- .../container-linux/kubernetes/controllers/controllers.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl index 79fb9846..fe6ebc16 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -147,4 +147,4 @@ passwd: users: - name: core ssh_authorized_keys: - - "${ssh_authorized_keys}" + - "${ssh_authorized_key}" diff --git a/google-cloud/container-linux/kubernetes/controllers/controllers.tf b/google-cloud/container-linux/kubernetes/controllers/controllers.tf index 2d7c9c27..bb45e2cd 100644 --- a/google-cloud/container-linux/kubernetes/controllers/controllers.tf +++ b/google-cloud/container-linux/kubernetes/controllers/controllers.tf @@ -23,7 +23,7 @@ data "template_file" "controller_config" { vars = { k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" - ssh_authorized_keys = "${var.ssh_authorized_key}" + ssh_authorized_key = "${var.ssh_authorized_key}" kubeconfig_ca_cert = "${var.kubeconfig_ca_cert}" kubeconfig_kubelet_cert = "${var.kubeconfig_kubelet_cert}" kubeconfig_kubelet_key = "${var.kubeconfig_kubelet_key}"