From 096309e6dcff414dc0cc6b5e462d705db1ae1f09 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 30 Nov 2021 16:25:45 +0100
Subject: [PATCH] use implicit dependencies
---
flux2/cluster/base/single-sign-on.yaml | 1 -
flux2/cluster/optional/monitoring/monitoring.yaml | 9 +--------
flux2/cluster/optional/nextcloud/nextcloud.yaml | 8 +-------
flux2/cluster/optional/rocketchat/rocketchat.yaml | 9 +--------
flux2/cluster/optional/velero/velero.yaml | 9 +--------
flux2/cluster/optional/wekan/wekan.yaml | 9 +--------
flux2/cluster/optional/wordpress/wordpress.yaml | 9 +--------
flux2/cluster/optional/zulip/zulip.yaml | 9 +--------
8 files changed, 7 insertions(+), 56 deletions(-)
diff --git a/flux2/cluster/base/single-sign-on.yaml b/flux2/cluster/base/single-sign-on.yaml
index e5b274862..78133014d 100644
--- a/flux2/cluster/base/single-sign-on.yaml
+++ b/flux2/cluster/base/single-sign-on.yaml
@@ -7,7 +7,6 @@ metadata:
spec:
dependsOn:
- name: nginx
- - name: letsencrypt-issuer
- name: local-path-provisioner
interval: 1h
timeout: 20m
diff --git a/flux2/cluster/optional/monitoring/monitoring.yaml b/flux2/cluster/optional/monitoring/monitoring.yaml
index 60c445e74..dc4a939d5 100644
--- a/flux2/cluster/optional/monitoring/monitoring.yaml
+++ b/flux2/cluster/optional/monitoring/monitoring.yaml
@@ -7,15 +7,8 @@ metadata:
spec:
interval: 1h
dependsOn:
- - name: cert-manager
- - name: dashboard
- - name: letsencrypt-issuer
- - name: local-path-provisioner
- - name: metallb
- - name: namespaces
- name: nginx
- - name: single-sign-on
- - name: sources
+ - name: local-path-provisioner
sourceRef:
kind: GitRepository
name: stackspin
diff --git a/flux2/cluster/optional/nextcloud/nextcloud.yaml b/flux2/cluster/optional/nextcloud/nextcloud.yaml
index a93099f9f..f413cd57d 100644
--- a/flux2/cluster/optional/nextcloud/nextcloud.yaml
+++ b/flux2/cluster/optional/nextcloud/nextcloud.yaml
@@ -7,15 +7,9 @@ metadata:
spec:
interval: 1h
dependsOn:
- - name: cert-manager
- - name: dashboard
+ - name: nginx
- name: letsencrypt-issuer
- name: local-path-provisioner
- - name: metallb
- - name: namespaces
- - name: nginx
- - name: single-sign-on
- - name: sources
sourceRef:
kind: GitRepository
name: stackspin
diff --git a/flux2/cluster/optional/rocketchat/rocketchat.yaml b/flux2/cluster/optional/rocketchat/rocketchat.yaml
index ad204c8b8..d1bc1d653 100644
--- a/flux2/cluster/optional/rocketchat/rocketchat.yaml
+++ b/flux2/cluster/optional/rocketchat/rocketchat.yaml
@@ -7,15 +7,8 @@ metadata:
spec:
interval: 1h
dependsOn:
- - name: cert-manager
- - name: dashboard
- - name: letsencrypt-issuer
- - name: local-path-provisioner
- - name: metallb
- - name: namespaces
- name: nginx
- - name: single-sign-on
- - name: sources
+ - name: local-path-provisioner
sourceRef:
kind: GitRepository
name: stackspin
diff --git a/flux2/cluster/optional/velero/velero.yaml b/flux2/cluster/optional/velero/velero.yaml
index 0a9d933bb..961144346 100644
--- a/flux2/cluster/optional/velero/velero.yaml
+++ b/flux2/cluster/optional/velero/velero.yaml
@@ -7,15 +7,8 @@ metadata:
spec:
interval: 1h
dependsOn:
- - name: cert-manager
- - name: dashboard
- - name: letsencrypt-issuer
- - name: local-path-provisioner
- - name: metallb
- - name: namespaces
- name: nginx
- - name: single-sign-on
- - name: sources
+ - name: local-path-provisioner
sourceRef:
kind: GitRepository
name: stackspin
diff --git a/flux2/cluster/optional/wekan/wekan.yaml b/flux2/cluster/optional/wekan/wekan.yaml
index aaa75c75f..77689c15f 100644
--- a/flux2/cluster/optional/wekan/wekan.yaml
+++ b/flux2/cluster/optional/wekan/wekan.yaml
@@ -7,15 +7,8 @@ metadata:
spec:
interval: 1h
dependsOn:
- - name: cert-manager
- - name: dashboard
- - name: letsencrypt-issuer
- - name: local-path-provisioner
- - name: metallb
- - name: namespaces
- name: nginx
- - name: single-sign-on
- - name: sources
+ - name: local-path-provisioner
sourceRef:
kind: GitRepository
name: stackspin
diff --git a/flux2/cluster/optional/wordpress/wordpress.yaml b/flux2/cluster/optional/wordpress/wordpress.yaml
index 0a8920fa1..241a3de08 100644
--- a/flux2/cluster/optional/wordpress/wordpress.yaml
+++ b/flux2/cluster/optional/wordpress/wordpress.yaml
@@ -7,15 +7,8 @@ metadata:
spec:
interval: 1h
dependsOn:
- - name: cert-manager
- - name: dashboard
- - name: letsencrypt-issuer
- - name: local-path-provisioner
- - name: metallb
- - name: namespaces
- name: nginx
- - name: single-sign-on
- - name: sources
+ - name: local-path-provisioner
sourceRef:
kind: GitRepository
name: stackspin
diff --git a/flux2/cluster/optional/zulip/zulip.yaml b/flux2/cluster/optional/zulip/zulip.yaml
index 43b2a4d22..b15e6cf03 100644
--- a/flux2/cluster/optional/zulip/zulip.yaml
+++ b/flux2/cluster/optional/zulip/zulip.yaml
@@ -7,15 +7,8 @@ metadata:
spec:
interval: 1h
dependsOn:
- - name: cert-manager
- - name: dashboard
- - name: letsencrypt-issuer
- - name: local-path-provisioner
- - name: metallb
- - name: namespaces
- name: nginx
- - name: single-sign-on
- - name: sources
+ - name: local-path-provisioner
sourceRef:
kind: GitRepository
name: stackspin
--
GitLab