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

refactor: use gcloud module for scripts, closes #401 #404

Merged
merged 12 commits into from
Jun 18, 2020
Merged

refactor: use gcloud module for scripts, closes #401 #404

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
07bc06a
closes #401: uses gcloud module for wait-for-cluster and delete-defau…
marshallford Jan 16, 2020
e221106
swaps jq call in delete-default-resource script for kubectl jsonpath
marshallford Jan 16, 2020
6de9948
fixes tf dependency graph for dns: depend on gcloud module outputs.wait
marshallford Jan 21, 2020
96f8add
fixes dependency graph for both dns and cluster
marshallford Jan 24, 2020
83470c1
wait_for_cluster: depend on cluster master version and pool names
marshallford Jan 27, 2020
c50b105
google_container_node_pool does not export any values to depend on
marshallford Jan 28, 2020
218432c
wait_for_cluster: depend on node pools
marshallford Feb 12, 2020
254c76a
gcloud module v0.5.0
marshallford Feb 12, 2020
01994a3
gcloud module version bump, try a new pattern for implicit dependency
marshallford Jun 13, 2020
844766c
gcloud_delete_default_kube_dns_configmap module_depends_on
marshallford Jun 13, 2020
35c6183
surface gcloud module options: upgrade, gcloud_sdk_version, skip_down…
marshallford Jun 13, 2020
5d34f39
removes gcloud_sdk_version var
marshallford Jun 14, 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
35 changes: 14 additions & 21 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,25 +529,18 @@ resource "google_container_node_pool" "pools" {
}
}

resource "null_resource" "wait_for_cluster" {
count = var.skip_provisioners ? 0 : 1

triggers = {
project_id = var.project_id
name = var.name
}

provisioner "local-exec" {
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

provisioner "local-exec" {
when = destroy
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

depends_on = [
google_container_cluster.primary,
google_container_node_pool.pools,
]
module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.0.1"
enabled = var.skip_provisioners

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
26 changes: 11 additions & 15 deletions autogen/main/dns.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,14 @@
/******************************************
Delete default kube-dns configmap
*****************************************/
resource "null_resource" "delete_default_kube_dns_configmap" {
count = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners ? 1 : 0

provisioner "local-exec" {
command = "${path.module}/scripts/kubectl_wrapper.sh https://${local.cluster_endpoint} ${data.google_client_config.default.access_token} ${local.cluster_ca_certificate} ${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"
}

depends_on = [
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
]
module "gcloud_delete_default_kube_dns_configmap" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.0.1"
enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners
additional_components = ["kubectl"]
marshallford marked this conversation as resolved.
Show resolved Hide resolved

create_cmd_entrypoint = "${path.module}/scripts/kubectl_wrapper.sh"
create_cmd_body = "https://${local.cluster_endpoint} ${data.google_client_config.default.access_token} ${local.cluster_ca_certificate} ${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"
}

/******************************************
Expand All @@ -55,7 +51,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand All @@ -82,7 +78,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand Down Expand Up @@ -112,7 +108,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand Down
2 changes: 1 addition & 1 deletion autogen/main/scripts/delete-default-resource.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RESOURCE_LIST=$(kubectl -n "${RESOURCE_NAMESPACE}" get "${RESOURCE_TYPE}" || exi

# Delete requested resource
if [[ $RESOURCE_LIST = *"${RESOURCE_NAME}"* ]]; then
RESOURCE_MAINTAINED_LABEL=$(kubectl -n "${RESOURCE_NAMESPACE}" get "${RESOURCE_TYPE}" -o json "${RESOURCE_NAME}" | jq -r '.metadata.labels."maintained_by"')
RESOURCE_MAINTAINED_LABEL=$(kubectl -n "${RESOURCE_NAMESPACE}" get "${RESOURCE_TYPE}" "${RESOURCE_NAME}" -o=jsonpath='{.metadata.labels.maintained_by}')
if [[ $RESOURCE_MAINTAINED_LABEL = "terraform" ]]; then
echo "Terraform maintained ${RESOURCE_NAME} ${RESOURCE_TYPE} appears to have already been created in ${RESOURCE_NAMESPACE} namespace"
else
Expand Down
11 changes: 4 additions & 7 deletions autogen/main/scripts/wait-for-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,9 @@ CLUSTER_NAME=$2

echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."

current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")

while [[ "$current_status" == "RECONCILING" ]]; do
printf "."
sleep 5
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
done
while
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
[[ "${current_status}" == "RECONCILING" ]]
do printf ".";sleep 5; done

echo "Cluster is ready!"
35 changes: 14 additions & 21 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,25 +249,18 @@ resource "google_container_node_pool" "pools" {
}
}

resource "null_resource" "wait_for_cluster" {
count = var.skip_provisioners ? 0 : 1

triggers = {
project_id = var.project_id
name = var.name
}

provisioner "local-exec" {
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

provisioner "local-exec" {
when = destroy
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

depends_on = [
google_container_cluster.primary,
google_container_node_pool.pools,
]
module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.0.1"
enabled = var.skip_provisioners

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
26 changes: 11 additions & 15 deletions dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,14 @@
/******************************************
Delete default kube-dns configmap
*****************************************/
resource "null_resource" "delete_default_kube_dns_configmap" {
count = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners ? 1 : 0

provisioner "local-exec" {
command = "${path.module}/scripts/kubectl_wrapper.sh https://${local.cluster_endpoint} ${data.google_client_config.default.access_token} ${local.cluster_ca_certificate} ${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"
}

depends_on = [
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
]
module "gcloud_delete_default_kube_dns_configmap" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.0.1"
enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners
additional_components = ["kubectl"]

create_cmd_entrypoint = "${path.module}/scripts/kubectl_wrapper.sh"
create_cmd_body = "https://${local.cluster_endpoint} ${data.google_client_config.default.access_token} ${local.cluster_ca_certificate} ${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"
}

/******************************************
Expand All @@ -55,7 +51,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand All @@ -82,7 +78,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand Down Expand Up @@ -112,7 +108,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand Down
35 changes: 14 additions & 21 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,25 +481,18 @@ resource "google_container_node_pool" "pools" {
}
}

resource "null_resource" "wait_for_cluster" {
count = var.skip_provisioners ? 0 : 1

triggers = {
project_id = var.project_id
name = var.name
}

provisioner "local-exec" {
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

provisioner "local-exec" {
when = destroy
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

depends_on = [
google_container_cluster.primary,
google_container_node_pool.pools,
]
module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.0.1"
enabled = var.skip_provisioners

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
26 changes: 11 additions & 15 deletions modules/beta-private-cluster-update-variant/dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,14 @@
/******************************************
Delete default kube-dns configmap
*****************************************/
resource "null_resource" "delete_default_kube_dns_configmap" {
count = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners ? 1 : 0

provisioner "local-exec" {
command = "${path.module}/scripts/kubectl_wrapper.sh https://${local.cluster_endpoint} ${data.google_client_config.default.access_token} ${local.cluster_ca_certificate} ${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"
}

depends_on = [
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
]
module "gcloud_delete_default_kube_dns_configmap" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.0.1"
enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners
additional_components = ["kubectl"]

create_cmd_entrypoint = "${path.module}/scripts/kubectl_wrapper.sh"
create_cmd_body = "https://${local.cluster_endpoint} ${data.google_client_config.default.access_token} ${local.cluster_ca_certificate} ${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"
}

/******************************************
Expand All @@ -55,7 +51,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand All @@ -82,7 +78,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand Down Expand Up @@ -112,7 +108,7 @@ EOF
}

depends_on = [
null_resource.delete_default_kube_dns_configmap,
module.gcloud_delete_default_kube_dns_configmap.wait,
data.google_client_config.default,
google_container_cluster.primary,
google_container_node_pool.pools,
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster-update-variant/scripts/delete-default-resource.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RESOURCE_LIST=$(kubectl -n "${RESOURCE_NAMESPACE}" get "${RESOURCE_TYPE}" || exi

# Delete requested resource
if [[ $RESOURCE_LIST = *"${RESOURCE_NAME}"* ]]; then
RESOURCE_MAINTAINED_LABEL=$(kubectl -n "${RESOURCE_NAMESPACE}" get "${RESOURCE_TYPE}" -o json "${RESOURCE_NAME}" | jq -r '.metadata.labels."maintained_by"')
RESOURCE_MAINTAINED_LABEL=$(kubectl -n "${RESOURCE_NAMESPACE}" get "${RESOURCE_TYPE}" "${RESOURCE_NAME}" -o=jsonpath='{.metadata.labels.maintained_by}')
if [[ $RESOURCE_MAINTAINED_LABEL = "terraform" ]]; then
echo "Terraform maintained ${RESOURCE_NAME} ${RESOURCE_TYPE} appears to have already been created in ${RESOURCE_NAMESPACE} namespace"
else
Expand Down
11 changes: 4 additions & 7 deletions modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,9 @@ CLUSTER_NAME=$2

echo "Waiting for cluster $CLUSTER_NAME in project $PROJECT to reconcile..."

current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")

while [[ "$current_status" == "RECONCILING" ]]; do
printf "."
sleep 5
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
done
while
current_status=$(gcloud container clusters list --project="$PROJECT" --filter=name:"$CLUSTER_NAME" --format="value(status)")
[[ "${current_status}" == "RECONCILING" ]]
do printf ".";sleep 5; done

echo "Cluster is ready!"
35 changes: 14 additions & 21 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,25 +408,18 @@ resource "google_container_node_pool" "pools" {
}
}

resource "null_resource" "wait_for_cluster" {
count = var.skip_provisioners ? 0 : 1

triggers = {
project_id = var.project_id
name = var.name
}

provisioner "local-exec" {
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

provisioner "local-exec" {
when = destroy
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
}

depends_on = [
google_container_cluster.primary,
google_container_node_pool.pools,
]
module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.0.1"
enabled = var.skip_provisioners

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}