From 227dffd98469704d74c2a29caf7e02637df68ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= <mickael.canevet@gmail.com>
Date: Wed, 4 Nov 2020 17:23:00 +0100
Subject: [PATCH] Don't use kubernetes-alpha provider (fixes #192)

---
 argocd/app-of-apps/Chart.yaml                 |  4 ++++
 argocd/app-of-apps/templates/apps.yaml        | 23 +++++++++++++++++++
 argocd/app-of-apps/values.yaml                |  7 ++++++
 .../k3s-docker-demo-app/terraform/main.tf     |  6 ++---
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 argocd/app-of-apps/Chart.yaml
 create mode 100644 argocd/app-of-apps/templates/apps.yaml
 create mode 100644 argocd/app-of-apps/values.yaml

diff --git a/argocd/app-of-apps/Chart.yaml b/argocd/app-of-apps/Chart.yaml
new file mode 100644
index 0000000000..21cfe49977
--- /dev/null
+++ b/argocd/app-of-apps/Chart.yaml
@@ -0,0 +1,4 @@
+---
+apiVersion: "v2"
+name: "app-of-apps"
+version: "0"
diff --git a/argocd/app-of-apps/templates/apps.yaml b/argocd/app-of-apps/templates/apps.yaml
new file mode 100644
index 0000000000..6817725529
--- /dev/null
+++ b/argocd/app-of-apps/templates/apps.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "5"
+  name: apps
+  namespace: argocd
+spec:
+  project: default
+  source:
+    path: argocd/apps
+    repoURL: {{ .Values.spec.source.repoURL }}
+    targetRevision: {{ .Values.spec.source.targetRevision }}
+    helm:
+      values: |
+        {{ toYaml .Values | nindent 8 }}
+  destination:
+    namespace: default
+    server: {{ .Values.spec.destination.server }}
+  syncPolicy:
+    automated:
+      selfHeal: true
diff --git a/argocd/app-of-apps/values.yaml b/argocd/app-of-apps/values.yaml
new file mode 100644
index 0000000000..ec6a7ca8a6
--- /dev/null
+++ b/argocd/app-of-apps/values.yaml
@@ -0,0 +1,7 @@
+---
+spec:
+  destination:
+    server: https://kubernetes.default.svc
+  source:
+    repoURL: ...
+    targetRevision: HEAD
diff --git a/examples/k3s-docker-demo-app/terraform/main.tf b/examples/k3s-docker-demo-app/terraform/main.tf
index 5ee00547f4..522c331ec2 100644
--- a/examples/k3s-docker-demo-app/terraform/main.tf
+++ b/examples/k3s-docker-demo-app/terraform/main.tf
@@ -1,6 +1,6 @@
 locals {
-  repo_url        = "https://github.com/camptocamp/camptocamp-devops-stack.git"
-  target_revision = "HEAD"
+  repo_url        = "https://github.com/mcanevet/camptocamp-devops-stack.git"
+  target_revision = "no_kubernetes_alpha"
 
   base_domain                        = module.cluster.base_domain
   kubernetes_host                    = module.cluster.kubernetes_host
@@ -11,7 +11,7 @@ locals {
 }
 
 module "cluster" {
-  source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/k3s-docker?ref=HEAD"
+  source = "../../../modules/k3s-docker"
 
   cluster_name = terraform.workspace
   node_count   = 1