Compare commits

...

4 Commits

6 changed files with 19 additions and 47 deletions

View File

@ -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:

View File

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

View File

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

View File

@ -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)
}

View File

@ -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
)
}

View File

@ -4,10 +4,6 @@ terraform {
source = "hashicorp/helm"
version = "1.3.2"
}
kubectl = {
source = "gavinbunney/kubectl"
version = ">= 1.7.0"
}
scaleway = {
source = "scaleway/scaleway"
version = "1.17.2"