From 785e22050d5ba680a3fc6e6ef06dce53f8945d9b Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Mon, 5 Apr 2021 10:27:21 +0100 Subject: [PATCH] Migrated remaining apps to Argo --- manifests/_apps/loki_chart.yaml | 24 +++++++++++++++++++ manifests/_apps/matrix_chart.yaml | 24 +++++++++++++++++++ manifests/_apps/nextcloud_chart.yaml | 24 +++++++++++++++++++ manifests/loki_chart/loki_chart.yaml | 5 ---- manifests/matrix_chart/matrix_chart.yaml | 7 ------ .../nextcloud_chart/nextcloud_chart.yaml | 6 ----- 6 files changed, 72 insertions(+), 18 deletions(-) diff --git a/manifests/_apps/loki_chart.yaml b/manifests/_apps/loki_chart.yaml index e69de29..ea4b11f 100644 --- a/manifests/_apps/loki_chart.yaml +++ b/manifests/_apps/loki_chart.yaml @@ -0,0 +1,24 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: loki + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: cluster.fun + destination: + namespace: logging + name: cluster-fun (scaleway) + source: + path: manifests/loki_chart + repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git" + targetRevision: HEAD + syncPolicy: + syncOptions: + - CreateNamespace=true + # automated: {} + ignoreDifferences: + - kind: Secret + jsonPointers: + - /data diff --git a/manifests/_apps/matrix_chart.yaml b/manifests/_apps/matrix_chart.yaml index e69de29..c82cdb9 100644 --- a/manifests/_apps/matrix_chart.yaml +++ b/manifests/_apps/matrix_chart.yaml @@ -0,0 +1,24 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: matrix + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: cluster.fun + destination: + namespace: chat + name: cluster-fun (scaleway) + source: + path: manifests/matrix_chart + repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git" + targetRevision: HEAD + syncPolicy: + syncOptions: + - CreateNamespace=true + # automated: {} + ignoreDifferences: + - kind: Secret + jsonPointers: + - /data diff --git a/manifests/_apps/nextcloud_chart.yaml b/manifests/_apps/nextcloud_chart.yaml index e69de29..e7ae187 100644 --- a/manifests/_apps/nextcloud_chart.yaml +++ b/manifests/_apps/nextcloud_chart.yaml @@ -0,0 +1,24 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: nextcloud + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: cluster.fun + destination: + namespace: nextcloud + name: cluster-fun (scaleway) + source: + path: manifests/nextcloud_chart + repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git" + targetRevision: HEAD + syncPolicy: + syncOptions: + - CreateNamespace=true + # automated: {} + ignoreDifferences: + - kind: Secret + jsonPointers: + - /data diff --git a/manifests/loki_chart/loki_chart.yaml b/manifests/loki_chart/loki_chart.yaml index 1205a7e..6129c39 100644 --- a/manifests/loki_chart/loki_chart.yaml +++ b/manifests/loki_chart/loki_chart.yaml @@ -1,9 +1,4 @@ apiVersion: v1 -kind: Namespace -metadata: - name: logging ---- -apiVersion: v1 kind: Secret metadata: name: grafana-credentials diff --git a/manifests/matrix_chart/matrix_chart.yaml b/manifests/matrix_chart/matrix_chart.yaml index da502fb..30db0b6 100644 --- a/manifests/matrix_chart/matrix_chart.yaml +++ b/manifests/matrix_chart/matrix_chart.yaml @@ -1,10 +1,3 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: chat - ---- - apiVersion: helm.fluxcd.io/v1 kind: HelmRelease metadata: diff --git a/manifests/nextcloud_chart/nextcloud_chart.yaml b/manifests/nextcloud_chart/nextcloud_chart.yaml index 0a852f2..379fd5c 100644 --- a/manifests/nextcloud_chart/nextcloud_chart.yaml +++ b/manifests/nextcloud_chart/nextcloud_chart.yaml @@ -1,10 +1,4 @@ apiVersion: v1 -kind: Namespace -metadata: - name: nextcloud - ---- -apiVersion: v1 kind: Secret metadata: name: nextcloud-values