Merge pull request #199 from kbst/removeclusterservices

Remove cluster-services from cluster modules

Author: pst

.github/workflows/main.yml

@@ -116,28 +116,28 @@ jobs:
       working-directory: ./kubestack-starter-${{ matrix.starter }}
       run: |
         # ALL: set name_prefix
-        sed -i 's/name_prefix = ""/name_prefix = "test"/g' config.auto.tfvars
+        sed -i 's/name_prefix = ""/name_prefix = "test"/g' *_cluster.tf
 
         # ALL: set base_domain
-        sed -i 's/base_domain = ""/base_domain = "infra.serverwolken.de"/g' config.auto.tfvars
+        sed -i 's/base_domain = ""/base_domain = "infra.serverwolken.de"/g' *_cluster.tf
 
         # AKS: set resource_group
-        sed -i 's/resource_group = ""/resource_group = "terraform-kubestack-testing"/g' config.auto.tfvars
+        sed -i 's/resource_group = ""/resource_group = "terraform-kubestack-testing"/g' aks_zero_cluster.tf || true
 
         # EKS: set region
-        sed -i 's/region = ""/region = "eu-west-1"/g' providers.tf || true
+        sed -i 's/region = ""/region = "eu-west-1"/g' eks_zero_providers.tf || true
 
         # EKS: set cluster_availability_zones
-        sed -i 's/cluster_availability_zones = ""/cluster_availability_zones = "eu-west-1a,eu-west-1b"/g' config.auto.tfvars
+        sed -i 's/cluster_availability_zones = ""/cluster_availability_zones = "eu-west-1a,eu-west-1b"/g' eks_zero_cluster.tf || true
 
         # GKE: set project_id
-        sed -i 's/project_id = ""/project_id = "terraform-kubestack-testing"/g' config.auto.tfvars
+        sed -i 's/project_id = ""/project_id = "terraform-kubestack-testing"/g' gke_zero_cluster.tf || true
 
         # GKE: set region
-        sed -i 's/region = ""/region = "europe-west1"/g' config.auto.tfvars
+        sed -i 's/region = ""/region = "europe-west1"/g' gke_zero_cluster.tf || true
 
         # GKE: set cluster_node_locations
-        sed -i 's/cluster_node_locations = ""/cluster_node_locations = "europe-west1-b,europe-west1-c,europe-west1-d"/g' config.auto.tfvars
+        sed -i 's/cluster_node_locations = ""/cluster_node_locations = "europe-west1-b,europe-west1-c,europe-west1-d"/g' gke_zero_cluster.tf || true
 
     - name: 'Terraform init'
       working-directory: ./kubestack-starter-${{ matrix.starter }}
@@ -177,7 +177,7 @@ jobs:
           -v `pwd`:/infra \
           -v /var/run/docker.sock:/var/run/docker.sock \
           test-image:${{ github.sha }} \
-          terraform plan
+          terraform plan --target module.aks_zero --target module.eks_zero --target module.gke_zero
 
   publish-image:
     runs-on: ubuntu-latest

Makefile

@@ -57,6 +57,9 @@ validate: .init
 		entrypoint terraform validate
 
 test: validate
+	docker exec \
+		test-container-$(GIT_SHA) \
+		entrypoint terraform apply --target module.aks_zero --target module.eks_zero --target module.gke_zero --input=false --auto-approve
 	docker exec \
 		test-container-$(GIT_SHA) \
 		entrypoint terraform apply --input=false --auto-approve

aws/_modules/eks/cluster_services.tf

@@ -1,8 +1,6 @@
 module "cluster_services" {
   source = "../../../common/cluster_services"
 
-  manifest_path = var.manifest_path
-
   template_string = file("${path.module}/templates/kubeconfig.tpl")
 
   template_vars = {

aws/_modules/eks/ingress.tf

@@ -1,70 +1,5 @@
-resource "kubernetes_service" "current" {
-  count = var.disable_default_ingress ? 0 : 1
-
-  provider = kubernetes.eks
-
-  metadata {
-    name      = "ingress-kbst-default"
-    namespace = "ingress-kbst-default"
-  }
-
-  spec {
-    type = "LoadBalancer"
-
-    selector = {
-      "kubestack.com/ingress-default" = "true"
-    }
-
-    port {
-      name        = "http"
-      port        = 80
-      target_port = "http"
-    }
-
-    port {
-      name        = "https"
-      port        = 443
-      target_port = "https"
-    }
-  }
-
-  depends_on = [module.cluster_services]
-}
-
 resource "aws_route53_zone" "current" {
   count = var.disable_default_ingress ? 0 : 1
 
   name = "${var.metadata_fqdn}."
 }
-
-data "aws_elb_hosted_zone_id" "current" {
-  count = var.disable_default_ingress ? 0 : 1
-}
-
-resource "aws_route53_record" "host" {
-  count = var.disable_default_ingress ? 0 : 1
-
-  zone_id = aws_route53_zone.current[0].zone_id
-  name    = var.metadata_fqdn
-  type    = "A"
-
-  alias {
-    name                   = kubernetes_service.current[0].status[0].load_balancer[0].ingress[0].hostname
-    zone_id                = data.aws_elb_hosted_zone_id.current[0].id
-    evaluate_target_health = true
-  }
-}
-
-resource "aws_route53_record" "wildcard" {
-  count = var.disable_default_ingress ? 0 : 1
-
-  zone_id = aws_route53_zone.current[0].zone_id
-  name    = "*.${var.metadata_fqdn}"
-  type    = "A"
-
-  alias {
-    name                   = kubernetes_service.current[0].status[0].load_balancer[0].ingress[0].hostname
-    zone_id                = data.aws_elb_hosted_zone_id.current[0].id
-    evaluate_target_health = true
-  }
-}

aws/_modules/eks/kubeconfig.tf

@@ -0,0 +1,11 @@
+data "template_file" "kubeconfig" {
+  template = file("${path.module}/templates/kubeconfig.tpl")
+
+  vars = {
+    cluster_name       = aws_eks_cluster.current.name
+    cluster_endpoint   = aws_eks_cluster.current.endpoint
+    cluster_ca         = aws_eks_cluster.current.certificate_authority[0].data
+    caller_id_arn      = local.caller_id_arn
+    caller_id_arn_type = local.caller_id_arn_type
+  }
+}

aws/_modules/eks/outputs.tf

@@ -1,4 +1,3 @@
 output "kubeconfig" {
-  sensitive = true
-  value     = module.cluster_services.kubeconfig
+  value = data.template_file.kubeconfig.rendered
 }

aws/_modules/eks/variables.tf

@@ -65,11 +65,6 @@ variable "aws_auth_map_accounts" {
   type        = string
 }
 
-variable "manifest_path" {
-  type        = string
-  description = "Path to Kustomize overlay to build."
-}
-
 variable "disable_default_ingress" {
   type        = bool
   description = "Whether to disable the default ingress."

aws/cluster-local/configuration.tf

@@ -19,9 +19,6 @@ locals {
   https_port_default = terraform.workspace == "apps" ? 443 : 8443
   https_port         = lookup(local.cfg, "https_port", local.https_port_default)
 
-  manifest_path_default = "manifests/overlays/${terraform.workspace}"
-  manifest_path         = var.manifest_path != null ? var.manifest_path : local.manifest_path_default
-
   disable_default_ingress = lookup(local.cfg, "disable_default_ingress", false)
 
   node_image = lookup(local.cfg, "node_image", null)

aws/cluster-local/elb-dns/variables.tf

@@ -0,0 +1,14 @@
+variable "ingress_service_name" {
+  type        = string
+  description = "Metadata name of the ingress service."
+}
+
+variable "ingress_service_namespace" {
+  type        = string
+  description = "Metadata namespace of the ingress service."
+}
+
+variable "metadata_fqdn" {
+  type        = string
+  description = "Cluster module FQDN."
+}

aws/cluster-local/elb-dns/versions.tf

@@ -0,0 +1,13 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+
+    kubernetes = {
+      source = "hashicorp/kubernetes"
+    }
+  }
+
+  required_version = ">= 0.13"
+}