Uncharted update (#150)

* Simplify Terraform required providers

* Bugfix for TLS EKS dependency issues

* Add Helm provider

* Add kube state metrics

* Update Terraform Lock

* Add kube state metrics version

* Simplify Dev Containers

* Update Terraform versions and remote state

* Update GitHub Action workflow

* Update Terraform lockfile

Author: onlydole

.devcontainer/Dockerfile

@@ -1,3 +1,2 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/codespaces-linux/.devcontainer/base.Dockerfile
-
-FROM mcr.microsoft.com/vscode/devcontainers/universal:2-focal
+# See https://hub.docker.com/r/hashicorp/terraform for more information
+FROM hashicorp/terraform:1.2.6

.devcontainer/devcontainer.json

@@ -7,13 +7,6 @@
 		"dockerfile": "Dockerfile"
 	},
 
-  "features": {
-    "terraform": {
-        "version": "latest",
-        "tflint": "latest"
-    }
-  },
-
 	// Configure tool-specific properties.
 	"customizations": {
 		// Configure properties specific to VS Code.
@@ -25,22 +18,5 @@
         "HashiCorp.terraform"
 			]
 		}
-	},
-
-	"remoteUser": "codespace",
-
-	"overrideCommand": false,
-
-	"mounts": ["source=codespaces-linux-var-lib-docker,target=/var/lib/docker,type=volume"],
-
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined",
-		"--privileged",
-		"--init"
-	],
-
-	// "oryx build" will automatically install your dependencies and attempt to build your project
-	"postCreateCommand": "oryx build -p virtualenv_name=.venv --log-file /tmp/oryx-build.log --manifest-dir /tmp || echo 'Could not auto-build. Skipping.'"
+	}
 }

.github/workflows/terraform.yaml

@@ -1,5 +1,4 @@
 ---
-
 name: "Code Quality: Terraform"
 
 on:
@@ -13,23 +12,20 @@ jobs:
     name: Terraform
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Set up Terraform
+        uses: hashicorp/setup-terraform@v2
         with:
-          fetch-depth: 1
+          cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v1.2.1
-      
       - name: Run `terraform fmt`
-        id: fmt
-        run: terraform fmt -diff -check -no-color -recursive
+        run: terraform fmt -check
 
       - name: Run `terraform init`
         id: init
         run: terraform init
 
       - name: Run `terraform validate`
-        id: validate
-        if: github.event_name == 'pull_request'
-        run: terraform validate -no-color
+        run: terraform validate -no-color

.terraform.lock.hcl

@@ -0,0 +1,8 @@
+# https://registry.terraform.io/providers/hashicorp/helm/latest/docs
+provider "helm" {
+  kubernetes {
+    host                   = data.aws_eks_cluster.cluster.endpoint
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data)
+    token                  = data.aws_eks_cluster_auth.cluster.token
+  }
+}

helm.tf

@@ -0,0 +1,19 @@
+# https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release
+resource "helm_release" "kube_state_metrics" {
+  name = "kube-state-metrics"
+
+  repository = "https://prometheus-community.github.io/helm-charts"
+  chart      = "kube-state-metrics"
+  namespace  = kubernetes_namespace.kube_state_metrics.metadata[0].name
+  version    = "4.13.0"
+}
+
+# https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace
+resource "kubernetes_namespace" "kube_state_metrics" {
+  metadata {
+    annotations = {
+      name = "kube-state-metrics"
+    }
+    name = "kube-state-metrics"
+  }
+}

kube-state-metrics.tf

@@ -1,16 +1,5 @@
 terraform {
   required_providers {
-    # https://registry.terraform.io/providers/hashicorp/null/latest
-    null = {
-      source  = "hashicorp/null"
-      version = "3.1.1"
-    }
-
-    # https://registry.terraform.io/providers/hashicorp/template/latest
-    template = {
-      source  = "hashicorp/template"
-      version = "2.2.0"
-    }
 
     # https://registry.terraform.io/providers/hashicorp/kubernetes/latest
     kubernetes = {
@@ -24,22 +13,18 @@ terraform {
       version = "4.23.0"
     }
 
-    # https://registry.terraform.io/providers/hashicorp/random/latest
-    random = {
-      source  = "hashicorp/random"
-      version = "3.3.2"
-    }
-
-    # https://registry.terraform.io/providers/hashicorp/local/latest
-    local = {
-      source  = "hashicorp/local"
-      version = "2.2.3"
+    # https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release
+    helm = {
+      source  = "hashicorp/helm"
+      version = "2.6.0"
     }
+  }
+  backend "remote" {
+    hostname     = "app.terraform.io"
+    organization = "onlydole"
 
-    # https://registry.terraform.io/providers/hashicorp/tls/latest
-    tls = {
-      source  = "hashicorp/tls"
-      version = "3.4.0"
+    workspaces {
+      name = "eks-in-action"
     }
   }
 }