diff --git a/Makefile b/Makefile index 3e70168..f26b223 100644 --- a/Makefile +++ b/Makefile @@ -47,19 +47,7 @@ ci: .PHONY: release # Release the latest version of the application release: - @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 ./ + @cd terraform && terraform apply -auto-approve .PHONY: help # Show this list of commands help: diff --git a/terraform/kubernetes-charts.tf b/terraform/kubernetes-charts.tf deleted file mode 100644 index 21abb6d..0000000 --- a/terraform/kubernetes-charts.tf +++ /dev/null @@ -1,20 +0,0 @@ -resource "helm_release" "helm-operator" { - name = "helm-operator" - repository = "https://charts.fluxcd.io" - chart = "helm-operator" - - max_history = 3 - - set { - name = "helm.versions" - value = "v3" - } - - set { - name = "createCRD" - value = "false" - } -} - - - diff --git a/terraform/kubernetes-cluster.tf b/terraform/kubernetes-cluster.tf index fadd94b..79370a2 100644 --- a/terraform/kubernetes-cluster.tf +++ b/terraform/kubernetes-cluster.tf @@ -1,14 +1,13 @@ resource "scaleway_k8s_cluster_beta" "k8s-cluster" { name = "cluster-fun" description = "" - version = "1.22.2" + version = "1.23.0" cni = "weave" enable_dashboard = false ingress = "nginx" feature_gates = [ - "HPAScaleToZero", - "TTLAfterFinished" + "HPAScaleToZero" ] }