From 030386cc6a2eb1c0ca95b2b4cb59bfe6d9c16ba7 Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Sat, 27 Feb 2021 15:07:41 +0000
Subject: [PATCH] Replaced terraform with kubectl calls

---
 Makefile                          | 14 +++++++++++++-
 terraform/kubernetes-manifests.tf | 22 ----------------------
 terraform/provider.tf             |  9 ---------
 terraform/versions.tf             |  8 ++------
 4 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 terraform/kubernetes-manifests.tf

diff --git a/Makefile b/Makefile
index f26b223..3e70168 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,19 @@ ci:
 
 .PHONY: release # Release the latest version of the application
 release:
-	@cd terraform && terraform apply -auto-approve
+	@cd terraform && terraform apply -auto-approve && \
+		kubectx admin@clusterfun-scaleway && \
+		cd ../tekton && \
+		kubectl apply -f ./1-Install/ && \
+		kubectl apply -f ./2-Setup/ && \
+		kubectl apply -f ./bindings/ && \
+		kubectl apply -f ./conditions/ && \
+		kubectl apply -f ./eventlisteners/ && \
+		kubectl apply -f ./pipelines/ && \
+		kubectl apply -f ./tasks/ && \
+		kubectl apply -f ./triggertemplates/ && \
+		cd ../manifests && \
+		kubectl apply -f ./
 
 .PHONY: help # Show this list of commands
 help:
diff --git a/terraform/kubernetes-manifests.tf b/terraform/kubernetes-manifests.tf
deleted file mode 100644
index d4f5b4a..0000000
--- a/terraform/kubernetes-manifests.tf
+++ /dev/null
@@ -1,22 +0,0 @@
-resource "kubectl_manifest" "manifests" {
-  for_each  = fileset(path.module, "../manifests/*")
-  yaml_body = file(each.key)
-}
-
-
-resource "kubectl_manifest" "tekton-install" {
-  for_each  = fileset(path.module, "../tekton/1-Install/*")
-  yaml_body = file(each.key)
-}
-
-resource "kubectl_manifest" "tekton-setup" {
-  for_each  = fileset(path.module, "../tekton/2-Setup/*")
-  yaml_body = file(each.key)
-}
-
-
-resource "kubectl_manifest" "tekton" {
-  for_each  = fileset(path.module, "../tekton/{bindings,conditions,eventlisteners,pipelines,tasks,triggertemplates}/*")
-  yaml_body = file(each.key)
-}
-
diff --git a/terraform/provider.tf b/terraform/provider.tf
index 4256f04..134dec5 100644
--- a/terraform/provider.tf
+++ b/terraform/provider.tf
@@ -14,12 +14,3 @@ provider "helm" {
     )
   }
 }
-
-provider "kubectl" {
-  load_config_file = false
-  host             = scaleway_k8s_cluster_beta.k8s-cluster.kubeconfig[0].host
-  token            = scaleway_k8s_cluster_beta.k8s-cluster.kubeconfig[0].token
-  cluster_ca_certificate = base64decode(
-    scaleway_k8s_cluster_beta.k8s-cluster.kubeconfig[0].cluster_ca_certificate
-  )
-}
diff --git a/terraform/versions.tf b/terraform/versions.tf
index d7462e0..5c820a2 100644
--- a/terraform/versions.tf
+++ b/terraform/versions.tf
@@ -1,15 +1,11 @@
 terraform {
   required_providers {
     helm = {
-      source = "hashicorp/helm"
+      source  = "hashicorp/helm"
       version = "1.3.2"
     }
-    kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = ">= 1.7.0"
-    }
     scaleway = {
-      source = "scaleway/scaleway"
+      source  = "scaleway/scaleway"
       version = "1.17.2"
     }
   }