From 6347ddc79ec9f0aa9291d6ff5d5ff86eb73d7047 Mon Sep 17 00:00:00 2001 From: David Dollar Date: Mon, 4 Nov 2019 16:41:33 -0500 Subject: [PATCH] clean up do local, remove buckets --- terraform/api/do/storage.tf | 7 +- terraform/cluster/do/main.tf | 110 -------------------------------- terraform/cluster/do/outputs.tf | 1 - 3 files changed, 4 insertions(+), 114 deletions(-) diff --git a/terraform/api/do/storage.tf b/terraform/api/do/storage.tf index 8d96264..dc0b203 100644 --- a/terraform/api/do/storage.tf +++ b/terraform/api/do/storage.tf @@ -5,7 +5,8 @@ resource "random_string" "suffix" { } resource "digitalocean_spaces_bucket" "storage" { - name = "${var.name}-storage-${random_string.suffix.result}" - region = var.region - acl = "private" + name = "${var.name}-storage-${random_string.suffix.result}" + region = var.region + acl = "private" + force_destroy = true } diff --git a/terraform/cluster/do/main.tf b/terraform/cluster/do/main.tf index 02dddb0..f5586c4 100644 --- a/terraform/cluster/do/main.tf +++ b/terraform/cluster/do/main.tf @@ -26,87 +26,8 @@ resource "digitalocean_kubernetes_cluster" "rack" { } } -# data "google_client_config" "current" {} - -# data "google_container_engine_versions" "available" { -# location = data.google_client_config.current.region -# version_prefix = "1.14." -# } - -# data "google_project" "current" {} - -# resource "random_string" "password" { -# length = 64 -# special = true -# } - -# resource "google_container_cluster" "rack" { -# provider = "google-beta" - -# name = var.name -# location = data.google_client_config.current.region - -# remove_default_node_pool = true -# initial_node_count = 1 -# logging_service = "logging.googleapis.com" -# min_master_version = data.google_container_engine_versions.available.latest_master_version - -# ip_allocation_policy { -# use_ip_aliases = true -# } - -# workload_identity_config { -# identity_namespace = "${data.google_project.current.project_id}.svc.id.goog" -# } - -# master_auth { -# username = "gcloud" -# password = random_string.password.result - -# client_certificate_config { -# issue_client_certificate = true -# } -# } -# } - -# resource "google_container_node_pool" "rack" { -# provider = "google-beta" - -# name = "${google_container_cluster.rack.name}-nodes-${var.node_type}" -# location = google_container_cluster.rack.location -# cluster = google_container_cluster.rack.name -# node_count = 1 - -# node_config { -# preemptible = true -# machine_type = var.node_type - -# metadata = { -# disable-legacy-endpoints = "true" -# } - -# workload_metadata_config { -# node_metadata = "GKE_METADATA_SERVER" -# } - -# service_account = google_service_account.nodes.email - -# oauth_scopes = [ -# "https://www.googleapis.com/auth/cloud-platform", -# "https://www.googleapis.com/auth/devstorage.read_write", -# "https://www.googleapis.com/auth/logging.write", -# "https://www.googleapis.com/auth/monitoring", -# ] -# } - -# lifecycle { -# create_before_destroy = true -# } -# } - resource "local_file" "kubeconfig" { depends_on = [ - kubernetes_cluster_role_binding.client, digitalocean_kubernetes_cluster.rack, ] @@ -121,34 +42,3 @@ resource "local_file" "kubeconfig" { ignore_changes = [content] } } - -provider "kubernetes" { - version = "~> 1.8" - - alias = "direct" - - load_config_file = false - - cluster_ca_certificate = "${base64decode(digitalocean_kubernetes_cluster.rack.kube_config[0].cluster_ca_certificate)}" - host = digitalocean_kubernetes_cluster.rack.endpoint - token = digitalocean_kubernetes_cluster.rack.kube_config[0].token -} - -resource "kubernetes_cluster_role_binding" "client" { - provider = "kubernetes.direct" - - metadata { - name = "client-binding" - } - - role_ref { - api_group = "rbac.authorization.k8s.io" - kind = "ClusterRole" - name = "cluster-admin" - } - - subject { - kind = "User" - name = "client" - } -} diff --git a/terraform/cluster/do/outputs.tf b/terraform/cluster/do/outputs.tf index 34390a8..c7bd9da 100644 --- a/terraform/cluster/do/outputs.tf +++ b/terraform/cluster/do/outputs.tf @@ -1,7 +1,6 @@ output "kubeconfig" { depends_on = [ local_file.kubeconfig, - kubernetes_cluster_role_binding.client, digitalocean_kubernetes_cluster.rack, ] value = local_file.kubeconfig.filename