Skip to content

Commit

Permalink
Change absolute path in state to use relative path
Browse files Browse the repository at this point in the history
  • Loading branch information
dedene committed Dec 6, 2018
1 parent cd6fc8b commit 7eba269
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions assets.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Self-hosted Kubernetes bootstrap-manifests
resource "template_dir" "bootstrap-manifests" {
source_dir = "${path.module}/resources/bootstrap-manifests"
source_dir = "bootkube/resources/bootstrap-manifests"
destination_dir = "${var.asset_dir}/bootstrap-manifests"

vars {
Expand All @@ -20,7 +20,7 @@ resource "template_dir" "bootstrap-manifests" {

# Self-hosted Kubernetes manifests
resource "template_dir" "manifests" {
source_dir = "${path.module}/resources/manifests"
source_dir = "bootkube/resources/manifests"
destination_dir = "${var.asset_dir}/manifests"

vars {
Expand Down Expand Up @@ -66,7 +66,7 @@ resource "local_file" "user-kubeconfig" {
}

data "template_file" "kubeconfig" {
template = "${file("${path.module}/resources/kubeconfig")}"
template = "${file("bootkube/resources/kubeconfig")}"

vars {
ca_cert = "${base64encode(var.ca_certificate == "" ? join(" ", tls_self_signed_cert.kube-ca.*.cert_pem) : var.ca_certificate)}"
Expand All @@ -77,7 +77,7 @@ data "template_file" "kubeconfig" {
}

data "template_file" "user-kubeconfig" {
template = "${file("${path.module}/resources/user-kubeconfig")}"
template = "${file("bootkube/resources/user-kubeconfig")}"

vars {
name = "${var.cluster_name}"
Expand Down
6 changes: 3 additions & 3 deletions conditional.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

resource "template_dir" "flannel-manifests" {
count = "${var.networking == "flannel" ? 1 : 0}"
source_dir = "${path.module}/resources/flannel"
source_dir = "bootkube/resources/flannel"
destination_dir = "${var.asset_dir}/manifests-networking"

vars {
Expand All @@ -15,7 +15,7 @@ resource "template_dir" "flannel-manifests" {

resource "template_dir" "calico-manifests" {
count = "${var.networking == "calico" ? 1 : 0}"
source_dir = "${path.module}/resources/calico"
source_dir = "bootkube/resources/calico"
destination_dir = "${var.asset_dir}/manifests-networking"

vars {
Expand All @@ -30,7 +30,7 @@ resource "template_dir" "calico-manifests" {

resource "template_dir" "weave-manifests" {
count = "${var.networking == "weave" ? 1 : 0}"
source_dir = "${path.module}/resources/weave"
source_dir = "bootkube/resources/weave"
destination_dir = "${var.asset_dir}/manifests-networking"

vars {
Expand Down

0 comments on commit 7eba269

Please sign in to comment.