Skip to content

Commit

Permalink
Regenerate modules
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-lane committed Apr 12, 2019
1 parent 718b6a3 commit 025babd
Show file tree
Hide file tree
Showing 24 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion auth.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ provider "kubernetes" {
host = "https://${local.cluster_endpoint}"
token = "${data.google_client_config.default.access_token}"
cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
}
}
2 changes: 1 addition & 1 deletion cluster_regional.tf
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@ resource "null_resource" "wait_for_regional_cluster" {
}

depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
}
}
2 changes: 1 addition & 1 deletion cluster_zonal.tf
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
}

depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
}
}
2 changes: 1 addition & 1 deletion dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ EOF
}

depends_on = ["null_resource.delete_default_kube_dns_configmap", "data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
}
}
2 changes: 1 addition & 1 deletion masq.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ EOF
}

depends_on = ["data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
}
}
2 changes: 1 addition & 1 deletion modules/private-cluster/auth.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ provider "kubernetes" {
host = "https://${local.cluster_endpoint}"
token = "${data.google_client_config.default.access_token}"
cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
}
}
2 changes: 1 addition & 1 deletion modules/private-cluster/cluster_regional.tf
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@ resource "null_resource" "wait_for_regional_cluster" {
}

depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
}
}
2 changes: 1 addition & 1 deletion modules/private-cluster/cluster_zonal.tf
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
}

depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
}
}
2 changes: 1 addition & 1 deletion modules/private-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ EOF
}

depends_on = ["null_resource.delete_default_kube_dns_configmap", "data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
}
}
2 changes: 1 addition & 1 deletion modules/private-cluster/masq.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ EOF
}

depends_on = ["data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
}
}
2 changes: 1 addition & 1 deletion modules/private-cluster/networks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
name = "${var.subnetwork}"
region = "${var.region}"
project = "${local.network_project_id}"
}
}
4 changes: 2 additions & 2 deletions modules/private-cluster/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,5 @@ output "node_pools_versions" {

output "service_account" {
description = "The service account to default running nodes as if not overridden in `node_pools`."
value = "${local.service_account}"
}
value = "${local.service_account}"
}
2 changes: 1 addition & 1 deletion modules/private-cluster/sa.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
project = "${google_project_iam_member.cluster_service_account-metric_writer.project}"
role = "roles/monitoring.viewer"
member = "serviceAccount:${google_service_account.cluster_service_account.email}"
}
}
2 changes: 1 addition & 1 deletion modules/private-cluster/scripts/delete-default-resource.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ if [[ $RESOURCE_LIST = *"${RESOURCE_NAME}"* ]]; then
fi
else
echo "No default ${RESOURCE_NAME} ${RESOURCE_TYPE} found in ${RESOURCE_NAMESPACE} namespace"
fi
fi
2 changes: 1 addition & 1 deletion modules/private-cluster/scripts/kubectl_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ kubectl config set-credentials kubectl-wrapper --token="${TOKEN}" 1>/dev/null
kubectl config use-context kubectl-wrapper 1>/dev/null
kubectl version 1>/dev/null

"$@"
"$@"
2 changes: 1 addition & 1 deletion modules/private-cluster/scripts/wait-for-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ while [[ "${current_status}" == "RECONCILING" ]]; do
current_status=$($gcloud_command | jq -r "$jq_query")
done

echo "Cluster is ready!"
echo "Cluster is ready!"
8 changes: 4 additions & 4 deletions modules/private-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@ variable "master_ipv4_cidr_block" {

variable "basic_auth_username" {
description = "The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration."
default = ""
default = ""
}

variable "basic_auth_password" {
description = "The password to be used with Basic Authentication."
default = ""
default = ""
}

variable "issue_client_certificate" {
description = "Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive!"
default = "false"
}
default = "false"
}
2 changes: 1 addition & 1 deletion networks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
name = "${var.subnetwork}"
region = "${var.region}"
project = "${local.network_project_id}"
}
}
4 changes: 2 additions & 2 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,5 @@ output "node_pools_versions" {

output "service_account" {
description = "The service account to default running nodes as if not overridden in `node_pools`."
value = "${local.service_account}"
}
value = "${local.service_account}"
}
2 changes: 1 addition & 1 deletion sa.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer"
project = "${google_project_iam_member.cluster_service_account-metric_writer.project}"
role = "roles/monitoring.viewer"
member = "serviceAccount:${google_service_account.cluster_service_account.email}"
}
}
2 changes: 1 addition & 1 deletion scripts/delete-default-resource.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ if [[ $RESOURCE_LIST = *"${RESOURCE_NAME}"* ]]; then
fi
else
echo "No default ${RESOURCE_NAME} ${RESOURCE_TYPE} found in ${RESOURCE_NAMESPACE} namespace"
fi
fi
2 changes: 1 addition & 1 deletion scripts/kubectl_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ kubectl config set-credentials kubectl-wrapper --token="${TOKEN}" 1>/dev/null
kubectl config use-context kubectl-wrapper 1>/dev/null
kubectl version 1>/dev/null

"$@"
"$@"
2 changes: 1 addition & 1 deletion scripts/wait-for-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ while [[ "${current_status}" == "RECONCILING" ]]; do
current_status=$($gcloud_command | jq -r "$jq_query")
done

echo "Cluster is ready!"
echo "Cluster is ready!"
8 changes: 4 additions & 4 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,15 @@ variable "service_account" {

variable "basic_auth_username" {
description = "The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration."
default = ""
default = ""
}

variable "basic_auth_password" {
description = "The password to be used with Basic Authentication."
default = ""
default = ""
}

variable "issue_client_certificate" {
description = "Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive!"
default = "false"
}
default = "false"
}

0 comments on commit 025babd

Please sign in to comment.