From 8cf6cc9867ad94d6fd9e899d7ed84524716be1e3 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Tue, 7 May 2024 20:14:34 -0500 Subject: [PATCH] separate dependencies on openebs installation --- kubernetes/apps/default/maintainerr/ks.yaml | 2 +- .../default/overseerr/app/helmrelease.yaml | 2 +- .../apps/default/radarr/app/helmrelease.yaml | 2 +- .../default/recyclarr/app/helmrelease.yaml | 2 +- .../apps/default/sabnzbd/app/helmrelease.yaml | 2 +- .../apps/default/sonarr/app/helmrelease.yaml | 2 +- .../default/tautulli/app/helmrelease.yaml | 2 +- .../home-assistant/app/helmrelease.yaml | 2 +- .../apps/home-automation/mosquitto/ks.yaml | 2 +- .../app/helmrelease.yaml | 2 +- .../observability/loki/app/helmrelease.yaml | 2 +- .../observability/thanos/app/helmrelease.yaml | 2 +- .../openebs/app/kustomization.yaml | 2 -- .../openebs/cluster/kustomization.yaml | 7 ++++++ .../{app => cluster}/storageclass.yaml | 0 .../{app => cluster}/volumesnapshotclass.yaml | 0 .../apps/openebs-system/openebs/ks.yaml | 25 ++++++++++++++++++- .../apps/qbittorrent/qbittorrent/ks.yaml | 2 +- 18 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 kubernetes/apps/openebs-system/openebs/cluster/kustomization.yaml rename kubernetes/apps/openebs-system/openebs/{app => cluster}/storageclass.yaml (100%) rename kubernetes/apps/openebs-system/openebs/{app => cluster}/volumesnapshotclass.yaml (100%) diff --git a/kubernetes/apps/default/maintainerr/ks.yaml b/kubernetes/apps/default/maintainerr/ks.yaml index 88c4d715..f881f422 100644 --- a/kubernetes/apps/default/maintainerr/ks.yaml +++ b/kubernetes/apps/default/maintainerr/ks.yaml @@ -18,7 +18,7 @@ spec: name: homelab wait: false dependsOn: - - name: openebs + - name: openebs-cluster - name: volsync - name: external-secrets-stores postBuild: diff --git a/kubernetes/apps/default/overseerr/app/helmrelease.yaml b/kubernetes/apps/default/overseerr/app/helmrelease.yaml index 06df1905..f380f808 100644 --- a/kubernetes/apps/default/overseerr/app/helmrelease.yaml +++ b/kubernetes/apps/default/overseerr/app/helmrelease.yaml @@ -23,7 +23,7 @@ spec: retries: 3 strategy: rollback dependsOn: - - name: openebs + - name: openebs-cluster namespace: rook-ceph - name: volsync namespace: volsync-system diff --git a/kubernetes/apps/default/radarr/app/helmrelease.yaml b/kubernetes/apps/default/radarr/app/helmrelease.yaml index 8d279bdd..234db953 100644 --- a/kubernetes/apps/default/radarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/radarr/app/helmrelease.yaml @@ -23,7 +23,7 @@ spec: retries: 3 strategy: rollback dependsOn: - - name: openebs + - name: openebs-cluster namespace: rook-ceph values: controllers: diff --git a/kubernetes/apps/default/recyclarr/app/helmrelease.yaml b/kubernetes/apps/default/recyclarr/app/helmrelease.yaml index 6a093109..f7ee6be1 100644 --- a/kubernetes/apps/default/recyclarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/recyclarr/app/helmrelease.yaml @@ -23,7 +23,7 @@ spec: retries: 3 strategy: rollback dependsOn: - - name: openebs + - name: openebs-cluster namespace: rook-ceph - name: volsync namespace: volsync-system diff --git a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml index 64615f95..dd66ed04 100644 --- a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml +++ b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml @@ -23,7 +23,7 @@ spec: retries: 3 strategy: rollback dependsOn: - - name: openebs + - name: openebs-cluster namespace: rook-ceph - name: volsync namespace: volsync-system diff --git a/kubernetes/apps/default/sonarr/app/helmrelease.yaml b/kubernetes/apps/default/sonarr/app/helmrelease.yaml index 25456db4..724d35cd 100644 --- a/kubernetes/apps/default/sonarr/app/helmrelease.yaml +++ b/kubernetes/apps/default/sonarr/app/helmrelease.yaml @@ -23,7 +23,7 @@ spec: retries: 3 strategy: rollback dependsOn: - - name: openebs + - name: openebs-cluster namespace: rook-ceph values: controllers: diff --git a/kubernetes/apps/default/tautulli/app/helmrelease.yaml b/kubernetes/apps/default/tautulli/app/helmrelease.yaml index 699dbb4e..01531a32 100644 --- a/kubernetes/apps/default/tautulli/app/helmrelease.yaml +++ b/kubernetes/apps/default/tautulli/app/helmrelease.yaml @@ -23,7 +23,7 @@ spec: retries: 3 strategy: rollback dependsOn: - - name: openebs + - name: openebs-cluster namespace: rook-ceph - name: volsync namespace: volsync-system diff --git a/kubernetes/apps/home-automation/home-assistant/app/helmrelease.yaml b/kubernetes/apps/home-automation/home-assistant/app/helmrelease.yaml index 0d1f594a..577dabd8 100644 --- a/kubernetes/apps/home-automation/home-assistant/app/helmrelease.yaml +++ b/kubernetes/apps/home-automation/home-assistant/app/helmrelease.yaml @@ -23,7 +23,7 @@ spec: strategy: rollback retries: 3 dependsOn: - - name: openebs + - name: openebs-cluster namespace: rook-ceph - name: volsync namespace: volsync-system diff --git a/kubernetes/apps/home-automation/mosquitto/ks.yaml b/kubernetes/apps/home-automation/mosquitto/ks.yaml index 9dbb6728..2272a571 100644 --- a/kubernetes/apps/home-automation/mosquitto/ks.yaml +++ b/kubernetes/apps/home-automation/mosquitto/ks.yaml @@ -18,7 +18,7 @@ spec: name: homelab wait: true dependsOn: - - name: openebs + - name: openebs-cluster - name: volsync - name: external-secrets-stores postBuild: diff --git a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml index 36d26209..56928d5b 100644 --- a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml +++ b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml @@ -26,7 +26,7 @@ spec: strategy: rollback retries: 3 dependsOn: - - name: openebs + - name: openebs-cluster namespace: openebs-system - name: thanos namespace: observability diff --git a/kubernetes/apps/observability/loki/app/helmrelease.yaml b/kubernetes/apps/observability/loki/app/helmrelease.yaml index f80ece9c..cf547b17 100644 --- a/kubernetes/apps/observability/loki/app/helmrelease.yaml +++ b/kubernetes/apps/observability/loki/app/helmrelease.yaml @@ -24,7 +24,7 @@ spec: strategy: uninstall retries: 3 dependsOn: - - name: openebs + - name: openebs-cluster namespace: openebs-system - name: rook-ceph-cluster namespace: rook-ceph diff --git a/kubernetes/apps/observability/thanos/app/helmrelease.yaml b/kubernetes/apps/observability/thanos/app/helmrelease.yaml index 770f1319..0b937825 100644 --- a/kubernetes/apps/observability/thanos/app/helmrelease.yaml +++ b/kubernetes/apps/observability/thanos/app/helmrelease.yaml @@ -24,7 +24,7 @@ spec: strategy: rollback retries: 3 dependsOn: - - name: openebs + - name: openebs-cluster namespace: openebs-system - name: dragonfly-operator namespace: dragonfly-operator-system diff --git a/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml b/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml index 0a884217..17cbc72b 100644 --- a/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml +++ b/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml @@ -4,5 +4,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helmrelease.yaml - - ./storageclass.yaml - - ./volumesnapshotclass.yaml diff --git a/kubernetes/apps/openebs-system/openebs/cluster/kustomization.yaml b/kubernetes/apps/openebs-system/openebs/cluster/kustomization.yaml new file mode 100644 index 00000000..176bb55e --- /dev/null +++ b/kubernetes/apps/openebs-system/openebs/cluster/kustomization.yaml @@ -0,0 +1,7 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./storageclass.yaml + - ./volumesnapshotclass.yaml diff --git a/kubernetes/apps/openebs-system/openebs/app/storageclass.yaml b/kubernetes/apps/openebs-system/openebs/cluster/storageclass.yaml similarity index 100% rename from kubernetes/apps/openebs-system/openebs/app/storageclass.yaml rename to kubernetes/apps/openebs-system/openebs/cluster/storageclass.yaml diff --git a/kubernetes/apps/openebs-system/openebs/app/volumesnapshotclass.yaml b/kubernetes/apps/openebs-system/openebs/cluster/volumesnapshotclass.yaml similarity index 100% rename from kubernetes/apps/openebs-system/openebs/app/volumesnapshotclass.yaml rename to kubernetes/apps/openebs-system/openebs/cluster/volumesnapshotclass.yaml diff --git a/kubernetes/apps/openebs-system/openebs/ks.yaml b/kubernetes/apps/openebs-system/openebs/ks.yaml index 4bff98f1..88bd1a59 100644 --- a/kubernetes/apps/openebs-system/openebs/ks.yaml +++ b/kubernetes/apps/openebs-system/openebs/ks.yaml @@ -18,4 +18,27 @@ spec: wait: false interval: 30m retryInterval: 1m - timeout: 5m \ No newline at end of file + timeout: 5m +--- +# yaml-language-server: $schema=https://ks.hsn.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: &app openebs-cluster + namespace: flux-system +spec: + targetNamespace: openebs-system + commonMetadata: + labels: + app.kubernetes.io/name: *app + path: ./kubernetes/apps/openebs-system/openebs/cluster + dependsOn: + - name: openebs + prune: true + sourceRef: + kind: GitRepository + name: homelab + wait: false + interval: 30m + retryInterval: 1m + timeout: 5m diff --git a/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml b/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml index 764f932c..0af40b66 100644 --- a/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml +++ b/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml @@ -18,7 +18,7 @@ spec: name: homelab wait: true dependsOn: - - name: openebs + - name: openebs-cluster - name: volsync - name: external-secrets-stores postBuild: