From 4be0172a1f198488fe29349e10d446e33c4576c8 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Mon, 11 Aug 2025 07:30:38 -0500 Subject: [PATCH] fixed namespace & added monero ks --- .../flux-system/kustomization-gitea.yaml | 3 +-- .../flux-system/kustomization-harbor.yaml | 1 - .../flux-system/kustomization-monero.yaml | 15 +++++++++++++++ .../flux-system/kustomization-monerod.yaml | 6 ++++-- infrastructure/flux-system/kustomization.yaml | 2 ++ services/gitea/kustomization.yaml | 1 + services/gitea/namespace.yaml | 4 ++++ services/monero/kustomization.yaml | 4 ++++ services/monero/namespace.yaml | 4 ++++ 9 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 infrastructure/flux-system/kustomization-monero.yaml create mode 100644 services/gitea/namespace.yaml create mode 100644 services/monero/kustomization.yaml create mode 100644 services/monero/namespace.yaml diff --git a/infrastructure/flux-system/kustomization-gitea.yaml b/infrastructure/flux-system/kustomization-gitea.yaml index c9e6506..79278eb 100644 --- a/infrastructure/flux-system/kustomization-gitea.yaml +++ b/infrastructure/flux-system/kustomization-gitea.yaml @@ -7,8 +7,7 @@ spec: interval: 10m path: ./services/gitea targetNamespace: gitea - createNamespace: true - prune: true + prune: false sourceRef: kind: GitRepository name: flux-system diff --git a/infrastructure/flux-system/kustomization-harbor.yaml b/infrastructure/flux-system/kustomization-harbor.yaml index 561065c..13b6d96 100644 --- a/infrastructure/flux-system/kustomization-harbor.yaml +++ b/infrastructure/flux-system/kustomization-harbor.yaml @@ -7,7 +7,6 @@ spec: interval: 10m path: ./services/harbor targetNamespace: harbor - createNamespace: true prune: true sourceRef: kind: GitRepository diff --git a/infrastructure/flux-system/kustomization-monero.yaml b/infrastructure/flux-system/kustomization-monero.yaml new file mode 100644 index 0000000..2bb56ff --- /dev/null +++ b/infrastructure/flux-system/kustomization-monero.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: monero + namespace: flux-system +spec: + interval: 10m + path: ./services/monero + targetNamespace: monero + prune: false + sourceRef: + kind: GitRepository + name: flux-system + namespace: flux-system + wait: true \ No newline at end of file diff --git a/infrastructure/flux-system/kustomization-monerod.yaml b/infrastructure/flux-system/kustomization-monerod.yaml index 4ab4f3a..2e51e69 100644 --- a/infrastructure/flux-system/kustomization-monerod.yaml +++ b/infrastructure/flux-system/kustomization-monerod.yaml @@ -7,10 +7,12 @@ spec: interval: 10m path: ./services/monero/monerod targetNamespace: monero - createNamespace: true prune: true sourceRef: kind: GitRepository name: flux-system namespace: flux-system - wait: true \ No newline at end of file + dependsOn: + - name: monero + wait: true + timeout: 5m \ No newline at end of file diff --git a/infrastructure/flux-system/kustomization.yaml b/infrastructure/flux-system/kustomization.yaml index 8aae868..c91a66a 100644 --- a/infrastructure/flux-system/kustomization.yaml +++ b/infrastructure/flux-system/kustomization.yaml @@ -5,3 +5,5 @@ resources: - gotk-sync.yaml - kustomization-gitea.yaml - kustomization-harbor.yaml +- kustomization-monero.yaml +- kustomization-monerod.yaml diff --git a/services/gitea/kustomization.yaml b/services/gitea/kustomization.yaml index 5f363e9..7285a5c 100644 --- a/services/gitea/kustomization.yaml +++ b/services/gitea/kustomization.yaml @@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization # namespace: gitea resources: + - namespace.yaml - deployment.yaml - service.yaml - pvc.yaml diff --git a/services/gitea/namespace.yaml b/services/gitea/namespace.yaml new file mode 100644 index 0000000..d884423 --- /dev/null +++ b/services/gitea/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: gitea \ No newline at end of file diff --git a/services/monero/kustomization.yaml b/services/monero/kustomization.yaml new file mode 100644 index 0000000..48ef36e --- /dev/null +++ b/services/monero/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml diff --git a/services/monero/namespace.yaml b/services/monero/namespace.yaml new file mode 100644 index 0000000..8b34672 --- /dev/null +++ b/services/monero/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: monero \ No newline at end of file