asset copy fixes
Diff
kubernetes.tf | 19 ++++++++++++++++---
modules/bootkube/main.tf | 20 +++++++++++++++++---
2 files changed, 25 insertions(+), 14 deletions(-)
@@ -46,14 +46,19 @@
asset-dir = "${path.root}/k8s"
assets = {
kubeconfig = "${module.bootkube.kubeconfig-kubelet}"
ca_cert = "${base64decode(module.bootkube.ca_cert)}"
kubelet_cert = "${base64decode(module.bootkube.kubelet_cert)}"
kubelet_key = "${base64decode(module.bootkube.kubelet_key)}"
kubeconfig-kubelet = "${module.bootkube.kubeconfig-kubelet}"
etcd_ca_cert = "${module.bootkube.etcd_ca_cert}"
etcd_client_cert = "${module.bootkube.etcd_client_cert}"
etcd_client_key = "${module.bootkube.etcd_client_key}"
etcd_server_cert = "${module.bootkube.etcd_server_cert}"
etcd_server_key = "${module.bootkube.etcd_server_key}"
etcd_peer_cert = "${module.bootkube.etcd_peer_cert}"
etcd_peer_key = "${module.bootkube.etcd_peer_key}"
}
providers = {
@@ -10,16 +10,16 @@
upload {
content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-apiserver.yaml")}"
file = "/home/.bootkube/bootstra-manifests/bootstrap-apiserver.yaml"
content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-apiserver.yaml")}"
file = "/home/.bootkube/bootstrap-manifests/bootstrap-apiserver.yaml"
}
upload {
content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-controller-manager.yaml")}"
file = "/home/.bootkube/bootstra-manifests/bootstrap-controller-manager.yaml"
content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-controller-manager.yaml")}"
file = "/home/.bootkube/bootstrap-manifests/bootstrap-controller-manager.yaml"
}
upload {
content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-scheduler.yaml")}"
file = "/home/.bootkube/bootstra-manifests/bootstrap-scheduler.yaml"
content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-scheduler.yaml")}"
file = "/home/.bootkube/bootstrap-manifests/bootstrap-scheduler.yaml"
}
upload {
@@ -39,7 +39,7 @@
file = "/home/.bootkube/manifests-networking/daemonset.yaml"
}
upload {
content = "${file("${var.asset-dir}/manifests-networkingservice-account.yaml")}"
content = "${file("${var.asset-dir}/manifests-networking/service-account.yaml")}"
file = "/home/.bootkube/manifests-networking/service-account.yaml"
}
@@ -81,6 +81,12 @@
upload {
content = "${var.assets["kubeconfig-kubelet"]}"
file = "/home/.bootkube/auth/kubeconfig-kubelet"
}
upload {
file = "/home/.bootkube/auth/kubeconfig"
content = "${file("${var.asset-dir}/auth/kubeconfig")}"
}
upload {