Skip to content

Commit 66e3403

Browse files
test fixture produced an error for the path of kubectl being .// removed the extra slash to fix
1 parent 12b67f3 commit 66e3403

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
.kitchen.local.yml
88
Gemfile.lock
99
terraform.tfstate.d/
10-
kubeconfig
11-
config-map-aws-auth.yaml
1210
eks-admin-cluster-role-binding.yaml
1311
eks-admin-service-account.yaml
1412
.idea/
13+
config-map-aws-auth*.yaml
14+
kubeconfig_*

aws_auth.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
resource "local_file" "config_map_aws_auth" {
22
content = "${data.template_file.config_map_aws_auth.rendered}"
3-
filename = "${var.config_output_path}/config-map-aws-auth_${var.cluster_name}.yaml"
3+
filename = "${var.config_output_path}config-map-aws-auth_${var.cluster_name}.yaml"
44
count = "${var.manage_aws_auth ? 1 : 0}"
55
}
66

77
resource "null_resource" "update_config_map_aws_auth" {
88
provisioner "local-exec" {
9-
command = "kubectl apply -f ${var.config_output_path}/config-map-aws-auth_${var.cluster_name}.yaml --kubeconfig ${var.config_output_path}/kubeconfig_${var.cluster_name}"
9+
command = "kubectl apply -f ${var.config_output_path}config-map-aws-auth_${var.cluster_name}.yaml --kubeconfig ${var.config_output_path}kubeconfig_${var.cluster_name}"
1010
}
1111

1212
triggers {

kubectl.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "local_file" "kubeconfig" {
22
content = "${data.template_file.kubeconfig.rendered}"
3-
filename = "${var.config_output_path}/kubeconfig_${var.cluster_name}"
3+
filename = "${var.config_output_path}kubeconfig_${var.cluster_name}"
44
count = "${var.write_kubeconfig ? 1 : 0}"
55
}

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variable "cluster_version" {
1818
}
1919

2020
variable "config_output_path" {
21-
description = "Determines where config files are placed if using configure_kubectl_session and you want config files to land outside the current working directory."
21+
description = "Determines where config files are placed if using configure_kubectl_session and you want config files to land outside the current working directory. Should end in a forward slash / ."
2222
default = "./"
2323
}
2424

0 commit comments

Comments
 (0)