nemo
/
nebula
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

asset copy fixes

This commit is contained in:
Nemo 2019-01-27 04:16:32 +05:30
parent a3dec142ad
commit 0956877ac7
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kubernetes.tf
View File

@ -46,14 +46,19 @@ module "bootkube-start" {
asset-dir = "${path.root}/k8s" asset-dir = "${path.root}/k8s"
assets = { 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}" kubeconfig-kubelet = "${module.bootkube.kubeconfig-kubelet}"
etcd_ca_cert = "${module.bootkube.etcd_ca_cert}"
etcd_client_cert = "${module.bootkube.etcd_client_cert}" # etcd_ca_cert = "${module.bootkube.etcd_ca_cert}"
etcd_client_key = "${module.bootkube.etcd_client_key}" # etcd_client_cert = "${module.bootkube.etcd_client_cert}"
etcd_server_cert = "${module.bootkube.etcd_server_cert}" # etcd_client_key = "${module.bootkube.etcd_client_key}"
etcd_server_key = "${module.bootkube.etcd_server_key}" # etcd_server_cert = "${module.bootkube.etcd_server_cert}"
etcd_peer_cert = "${module.bootkube.etcd_peer_cert}" # etcd_server_key = "${module.bootkube.etcd_server_key}"
etcd_peer_key = "${module.bootkube.etcd_peer_key}" # etcd_peer_cert = "${module.bootkube.etcd_peer_cert}"
# etcd_peer_key = "${module.bootkube.etcd_peer_key}"
} }
providers = { providers = {

20
modules/bootkube/main.tf
View File

@ -10,16 +10,16 @@ resource "docker_container" "bootkube" {
# bootstrap manifests # bootstrap manifests
upload { upload {
content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-apiserver.yaml")}" content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-apiserver.yaml")}"
file = "/home/.bootkube/bootstra-manifests/bootstrap-apiserver.yaml" file = "/home/.bootkube/bootstrap-manifests/bootstrap-apiserver.yaml"
} }
upload { upload {
content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-controller-manager.yaml")}" content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-controller-manager.yaml")}"
file = "/home/.bootkube/bootstra-manifests/bootstrap-controller-manager.yaml" file = "/home/.bootkube/bootstrap-manifests/bootstrap-controller-manager.yaml"
} }
upload { upload {
content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-scheduler.yaml")}" content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-scheduler.yaml")}"
file = "/home/.bootkube/bootstra-manifests/bootstrap-scheduler.yaml" file = "/home/.bootkube/bootstrap-manifests/bootstrap-scheduler.yaml"
} }
# Cluster Networking # Cluster Networking
upload { upload {
@ -39,7 +39,7 @@ resource "docker_container" "bootkube" {
file = "/home/.bootkube/manifests-networking/daemonset.yaml" file = "/home/.bootkube/manifests-networking/daemonset.yaml"
} }
upload { 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" file = "/home/.bootkube/manifests-networking/service-account.yaml"
} }
# TLS # TLS
@ -82,6 +82,12 @@ resource "docker_container" "bootkube" {
content = "${var.assets["kubeconfig-kubelet"]}" content = "${var.assets["kubeconfig-kubelet"]}"
file = "/home/.bootkube/auth/kubeconfig-kubelet" file = "/home/.bootkube/auth/kubeconfig-kubelet"
} }
# TODO: Move to a module read instead of file
# auth/kubeconfig
upload {
file = "/home/.bootkube/auth/kubeconfig"
content = "${file("${var.asset-dir}/auth/kubeconfig")}"
}
# Manifests Directory # Manifests Directory
upload { upload {
file = "/home/.bootkube/manifests/kube-apiserver-role-binding.yaml" file = "/home/.bootkube/manifests/kube-apiserver-role-binding.yaml"