Skip to content

Commit

Permalink
feat(ACM): fix bug when not using ssh secret type for ACM submodule (
Browse files Browse the repository at this point in the history
…#679)

* Add enabled flag to git-creds creation

* change to true/false

* fix ssh

* terraform format

* create key regardless to avoid interpolation error

* change enabled condition and add inline expression

* move to module

* format
  • Loading branch information
cloud-pharaoh committed Sep 23, 2020
1 parent dffb047 commit 716867c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions modules/k8s-operator-crd-support/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,18 @@ resource "tls_private_key" "k8sop_creds" {
}

module "k8sop_creds_secret" {
source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper"
version = "~> 2.0.2"
source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper"
version = "~> 2.0.2"

enabled = var.create_ssh_key == true || var.ssh_auth_key != null ? "true" : "false"
module_depends_on = [module.k8s_operator.wait]
skip_download = var.skip_gcloud_download
cluster_name = var.cluster_name
cluster_location = var.location
project_id = var.project_id
service_account_key_file = var.service_account_key_file

kubectl_create_command = "kubectl create secret generic ${var.operator_credential_name} -n=${var.operator_credential_namespace} --from-literal=${local.k8sop_creds_secret_key}='${local.private_key}'"
kubectl_create_command = local.private_key != null ? "kubectl create secret generic ${var.operator_credential_name} -n=${var.operator_credential_namespace} --from-literal=${local.k8sop_creds_secret_key}='${local.private_key}'" : ""
kubectl_destroy_command = "kubectl delete secret ${var.operator_credential_name} -n=${var.operator_credential_namespace}"
}

Expand Down

0 comments on commit 716867c

Please sign in to comment.