Skip to content
This repository has been archived by the owner on Jan 5, 2022. It is now read-only.

Commit

Permalink
Remove ability to set multiple authorized keys for "core" user
Browse files Browse the repository at this point in the history
* poseidon#145
* Additional users can be easily added upstream
  • Loading branch information
bendrucker committed Apr 10, 2018
1 parent 4a54dd6 commit 0091040
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion aws/container-linux/kubernetes/bastion.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ data "template_file" "bastion_config" {
template = "${file("${path.module}/cl/bastion.yaml.tmpl")}"

vars = {
ssh_authorized_keys_list = "[ ${join(", ", var.ssh_authorized_keys)} ]"
ssh_authorized_key = "${var.ssh_authorized_key}"
}
}

Expand Down
3 changes: 2 additions & 1 deletion aws/container-linux/kubernetes/cl/bastion.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
passwd:
users:
- name: core
ssh_authorized_keys: ${ssh_authorized_keys_list}
ssh_authorized_keys:
- "${ssh_authorized_key}"
3 changes: 2 additions & 1 deletion aws/container-linux/kubernetes/cl/controller.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,5 @@ storage:
passwd:
users:
- name: core
ssh_authorized_keys: ${ssh_authorized_keys_list}
ssh_authorized_keys:
- "${ssh_authorized_key}"
8 changes: 4 additions & 4 deletions aws/container-linux/kubernetes/controllers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ data "template_file" "controller_config" {
# etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,...
etcd_initial_cluster = "${join(",", formatlist("%s=https://%s:2380", null_resource.repeat.*.triggers.name, null_resource.repeat.*.triggers.domain))}"

kubeconfig = "${indent(10, module.bootkube.kubeconfig)}"
ssh_authorized_keys_list = "[ ${join(", ", var.ssh_authorized_keys)} ]"
k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}"
cluster_domain_suffix = "${var.cluster_domain_suffix}"
kubeconfig = "${indent(10, module.bootkube.kubeconfig)}"
ssh_authorized_key = "${var.ssh_authorized_key}"
k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}"
cluster_domain_suffix = "${var.cluster_domain_suffix}"
}
}

Expand Down

0 comments on commit 0091040

Please sign in to comment.