fix error from merge

nebari-dev · Aug 4, 2022 · bf82494 · bf82494
1 parent 2329db0
commit bf82494
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 41 deletions.
diff --git a/qhub/template/stages/02-infrastructure/local/main.tf b/qhub/template/stages/02-infrastructure/local/main.tf
@@ -1,11 +1,11 @@
 terraform {
   required_providers {
     kind = {
-      source = "kyma-incubator/kind"
+      source  = "kyma-incubator/kind"
       version = "0.0.11"
     }
     docker = {
-      source = "kreuzwerker/docker"
+      source  = "kreuzwerker/docker"
       version = "2.16.0"
     }
     kubectl = {
@@ -24,30 +24,30 @@ provider "docker" {
 }
 
 provider "kubernetes" {
-  host = kind_cluster.default.endpoint
+  host                   = kind_cluster.default.endpoint
   cluster_ca_certificate = kind_cluster.default.cluster_ca_certificate
-  client_key = kind_cluster.default.client_key
-  client_certificate = kind_cluster.default.client_certificate
+  client_key             = kind_cluster.default.client_key
+  client_certificate     = kind_cluster.default.client_certificate
 }
 
 provider "kubectl" {
-  load_config_file = false
-  host = kind_cluster.default.endpoint
+  load_config_file       = false
+  host                   = kind_cluster.default.endpoint
   cluster_ca_certificate = kind_cluster.default.cluster_ca_certificate
-  client_key = kind_cluster.default.client_key
-  client_certificate = kind_cluster.default.client_certificate
+  client_key             = kind_cluster.default.client_key
+  client_certificate     = kind_cluster.default.client_certificate
 }
 
 resource "kind_cluster" "default" {
-  name = "test-cluster"
+  name           = "test-cluster"
   wait_for_ready = true
 
   kind_config {
-    kind = "Cluster"
+    kind        = "Cluster"
     api_version = "kind.x-k8s.io/v1alpha4"
 
     node {
-      role = "general"
+      role  = "general"
       image = "kindest/node:v1.21.10"
     }
   }
@@ -60,28 +60,28 @@ resource "kubernetes_namespace" "metallb" {
 }
 
 data "kubectl_path_documents" "metallb" {
-    pattern = "${path.module}/metallb.yaml"
+  pattern = "${path.module}/metallb.yaml"
 }
 
 resource "kubectl_manifest" "metallb" {
-  for_each  = toset(data.kubectl_path_documents.metallb.documents)
-  yaml_body = each.value
-  wait = true
-  depends_on = [ kubernetes_namespace.metallb ]
+  for_each   = toset(data.kubectl_path_documents.metallb.documents)
+  yaml_body  = each.value
+  wait       = true
+  depends_on = [kubernetes_namespace.metallb]
 }
 
 resource "kubectl_manifest" "load-balancer" {
   yaml_body = yamlencode({
     apiVersion = "v1"
-    kind = "ConfigMap"
+    kind       = "ConfigMap"
     metadata = {
       namespace = kubernetes_namespace.metallb.metadata.0.name
-      name = "config"
+      name      = "config"
     }
     data = {
       config = yamlencode({
         address-pools = [{
-          name = "default"
+          name     = "default"
           protocol = "layer2"
           addresses = [
             "${local.metallb_ip_min}-${local.metallb_ip_max}"
@@ -91,13 +91,13 @@ resource "kubectl_manifest" "load-balancer" {
     }
   })
 
-  depends_on = [ kubectl_manifest.metallb ]
+  depends_on = [kubectl_manifest.metallb]
 }
 
 data "docker_network" "kind" {
   name = "kind"
 
-  depends_on = [ kind_cluster.default ]
+  depends_on = [kind_cluster.default]
 }
 
 locals {
@@ -108,16 +108,4 @@ locals {
   metallb_ip_max = cidrhost([
     for network in data.docker_network.kind.ipam_config : network if network.gateway != ""
   ][0].subnet, 406)
-
-output "kubernetes_credentials" {
-  description = "Parameters needed to connect to kubernetes cluster locally"
-  value = {
-    config_path    = pathexpand("~/.kube/config")
-    config_context = var.kube_context
-  }
-}
-
-output "kubeconfig_filename" {
-  description = "filename for qhub kubeconfig"
-  value       = pathexpand("~/.kube/config")
 }
diff --git a/qhub/template/stages/02-infrastructure/local/outputs.tf b/qhub/template/stages/02-infrastructure/local/outputs.tf
@@ -1,20 +1,20 @@
 output "kubernetes_credentials" {
   description = "Parameters needed to connect to kubernetes cluster locally"
-  sensitive = true
-  value       = {
-    host = kind_cluster.default.endpoint
+  sensitive   = true
+  value = {
+    host                   = kind_cluster.default.endpoint
     cluster_ca_certificate = kind_cluster.default.cluster_ca_certificate
-    client_key = kind_cluster.default.client_key
-    client_certificate = kind_cluster.default.client_certificate
+    client_key             = kind_cluster.default.client_key
+    client_certificate     = kind_cluster.default.client_certificate
   }
 }
 
 resource "local_file" "default" {
-  content = kind_cluster.default.kubeconfig
+  content  = kind_cluster.default.kubeconfig
   filename = var.kubeconfig_filename
 }
 
 output "kubeconfig_filename" {
   description = "filename for qhub kubeconfig"
-  value = var.kubeconfig_filename
+  value       = var.kubeconfig_filename
 }