Makefile

@@ -47,19 +47,7 @@ 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:

manifests/nextcloud_chart.yaml

@@ -23,9 +23,9 @@ metadata:
   namespace: nextcloud
 spec:
   chart:
-    repository: https://nextcloud.github.io/helm/
+    repository: https://kubernetes-charts.storage.googleapis.com
     name: nextcloud
-    version: 2.5.5
+    version: 1.12.0
   maxHistory: 5
   valuesFrom:
   - secretKeyRef:
@@ -35,8 +35,7 @@ spec:
       optional: false
   values:
     image:
-      tag: 19.0.8-apache
+      tag: 19-apache
-      pullPolicy: Always
     ingress:
       enabled: true
       annotations:

terraform/kubernetes-cluster.tf

@@ -10,6 +10,12 @@ resource "scaleway_k8s_cluster_beta" "k8s-cluster" {
     "HPAScaleToZero",
     "TTLAfterFinished"
   ]
+
+  auto_upgrade {
+    enable                        = true
+    maintenance_window_start_hour = 2
+    maintenance_window_day        = "any"
+  }
 }
 
 

terraform/kubernetes-manifests.tf

@@ -0,0 +1,22 @@
+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)
+}
+

terraform/provider.tf

@@ -14,3 +14,12 @@ 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
+  )
+}

terraform/versions.tf

@@ -1,11 +1,15 @@
 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"
     }
   }