From 5169c527223352a5c8489ecae257e03c044dc994 Mon Sep 17 00:00:00 2001 From: Gwyn Hannay Date: Wed, 8 May 2024 09:08:28 +0800 Subject: [PATCH] elastic: move things around and do dependencies --- .../monitoring/eck-app/app/kustomization.yaml | 1 - .../{eck-app => fluentd}/app/fluentd.yaml | 0 .../monitoring/fluentd/app/kustomization.yaml | 6 ++++++ kubernetes/apps/monitoring/fluentd/ks.yaml | 15 +++++++++++++++ kubernetes/apps/monitoring/kustomization.yaml | 1 + 5 files changed, 22 insertions(+), 1 deletion(-) rename kubernetes/apps/monitoring/{eck-app => fluentd}/app/fluentd.yaml (100%) create mode 100644 kubernetes/apps/monitoring/fluentd/app/kustomization.yaml create mode 100644 kubernetes/apps/monitoring/fluentd/ks.yaml diff --git a/kubernetes/apps/monitoring/eck-app/app/kustomization.yaml b/kubernetes/apps/monitoring/eck-app/app/kustomization.yaml index 9fa4b976..ec994f6f 100644 --- a/kubernetes/apps/monitoring/eck-app/app/kustomization.yaml +++ b/kubernetes/apps/monitoring/eck-app/app/kustomization.yaml @@ -5,5 +5,4 @@ namespace: monitoring resources: - ./elastic.yaml - ./kibana.yaml - - ./fluentd.yaml - ./ingress.yaml diff --git a/kubernetes/apps/monitoring/eck-app/app/fluentd.yaml b/kubernetes/apps/monitoring/fluentd/app/fluentd.yaml similarity index 100% rename from kubernetes/apps/monitoring/eck-app/app/fluentd.yaml rename to kubernetes/apps/monitoring/fluentd/app/fluentd.yaml diff --git a/kubernetes/apps/monitoring/fluentd/app/kustomization.yaml b/kubernetes/apps/monitoring/fluentd/app/kustomization.yaml new file mode 100644 index 00000000..6d70c1f7 --- /dev/null +++ b/kubernetes/apps/monitoring/fluentd/app/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: monitoring +resources: + - ./fluentd.yaml diff --git a/kubernetes/apps/monitoring/fluentd/ks.yaml b/kubernetes/apps/monitoring/fluentd/ks.yaml new file mode 100644 index 00000000..7131a188 --- /dev/null +++ b/kubernetes/apps/monitoring/fluentd/ks.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: cluster-apps-fluentd + namespace: flux-system +spec: + dependsOn: + - name: cluster-apps-eck-app + path: ./kubernetes/apps/monitoring/fluentd/app + prune: true + sourceRef: + kind: GitRepository + name: home-kubernetes + interval: 5m diff --git a/kubernetes/apps/monitoring/kustomization.yaml b/kubernetes/apps/monitoring/kustomization.yaml index b05cf548..9da6fdcf 100644 --- a/kubernetes/apps/monitoring/kustomization.yaml +++ b/kubernetes/apps/monitoring/kustomization.yaml @@ -6,5 +6,6 @@ resources: - ./pvc.yaml - ./eck-app/ks.yaml - ./eck-operator/ks.yaml + - ./fluentd/ks.yaml - ./glances/ks.yaml - ./kubernetes-dashboard/ks.yaml