Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use gcloud module in ACM #442

Merged
merged 6 commits into from
Mar 19, 2020
Merged

Use gcloud module in ACM #442

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2dd6f7
Merge pull request #10 from terraform-google-modules/master
bharathkkb Jan 28, 2020
fb4377c
Merge pull request #11 from terraform-google-modules/master
bharathkkb Feb 3, 2020
8da063d
Merge pull request #12 from terraform-google-modules/master
bharathkkb Feb 20, 2020
3a82ba5
fix acm provisioner errors
bharathkkb Feb 21, 2020
9f997ee
use gcloud module
bharathkkb Mar 15, 2020
e787af8
fix tests for #454
bharathkkb Mar 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 21 additions & 4 deletions modules/acm/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,21 @@ resource "null_resource" "acm_operator_config" {
}

resource "null_resource" "acm_operator" {

triggers = {
cluster_endpoint = local.cluster_endpoint
token = local.token
cluster_ca_certificate = local.cluster_ca_certificate
operator_path = local.operator_path
}

provisioner "local-exec" {
command = "${path.module}/scripts/kubectl_wrapper.sh ${local.cluster_endpoint} ${local.token} ${local.cluster_ca_certificate} kubectl apply -f ${local.operator_path}"
}

provisioner "local-exec" {
when = destroy
command = "${path.module}/scripts/kubectl_wrapper.sh ${local.cluster_endpoint} ${local.token} ${local.cluster_ca_certificate} kubectl delete -f ${local.operator_path}"
command = "${path.module}/scripts/kubectl_wrapper.sh ${self.triggers.cluster_endpoint} ${self.triggers.token} ${self.triggers.cluster_ca_certificate} kubectl delete -f ${self.triggers.operator_path}"
}

depends_on = [
Expand All @@ -71,13 +79,19 @@ resource "null_resource" "acm_operator" {
resource "null_resource" "git_creds_secret" {
count = var.create_ssh_key ? 1 : 0

triggers = {
cluster_endpoint = local.cluster_endpoint
token = local.token
cluster_ca_certificate = local.cluster_ca_certificate
}

provisioner "local-exec" {
command = "${path.module}/scripts/kubectl_wrapper.sh ${local.cluster_endpoint} ${local.token} ${local.cluster_ca_certificate} kubectl create secret generic git-creds -n=config-management-system --from-literal=ssh='${local.private_key}'"
}

provisioner "local-exec" {
when = destroy
command = "${path.module}/scripts/kubectl_wrapper.sh ${local.cluster_endpoint} ${local.token} ${local.cluster_ca_certificate} kubectl delete secret git-creds -n=config-management-system"
command = "${path.module}/scripts/kubectl_wrapper.sh ${self.triggers.cluster_endpoint} ${self.triggers.token} ${self.triggers.cluster_ca_certificate} kubectl delete secret git-creds -n=config-management-system"
}

depends_on = [
Expand All @@ -101,7 +115,10 @@ data "template_file" "acm_config" {

resource "null_resource" "acm_config" {
triggers = {
config = data.template_file.acm_config.rendered
config = data.template_file.acm_config.rendered
cluster_endpoint = local.cluster_endpoint
token = local.token
cluster_ca_certificate = local.cluster_ca_certificate
}

provisioner "local-exec" {
Expand All @@ -110,7 +127,7 @@ resource "null_resource" "acm_config" {

provisioner "local-exec" {
when = destroy
command = "echo '${data.template_file.acm_config.rendered}' | ${path.module}/scripts/kubectl_wrapper.sh ${local.cluster_endpoint} ${local.token} ${local.cluster_ca_certificate} kubectl delete -f -"
command = "echo '${self.triggers.config}' | ${path.module}/scripts/kubectl_wrapper.sh ${self.triggers.cluster_endpoint} ${self.triggers.token} ${self.triggers.cluster_ca_certificate} kubectl delete -f -"
}

depends_on = [
Expand Down