From 924b9d48d199c1dcc4e869893895d944d040f355 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Mon, 11 Sep 2023 07:00:07 +0200 Subject: [PATCH] refactor: separate manifests and resources --- deploy/dev/kustomization.yaml | 28 +++++++++---------- .../dev/{ => resources}/element-config.json | 0 deploy/dev/{ => resources}/gitea-config.ini | 0 .../grafana-contactpoints.yaml | 0 .../{ => resources}/grafana-datasources.yaml | 0 deploy/dev/{ => resources}/grafana.ini | 0 .../dev/{ => resources}/invidious-config.yaml | 0 .../prometheus-alerting-rules.yaml | 0 .../prometheus-alertmanager.yaml | 0 deploy/dev/{ => resources}/prometheus.yaml | 0 .../dev/{ => resources}/radicale-config.toml | 0 deploy/dev/{ => resources}/radicale-users | 0 .../{ => resources}/synapse-homeserver.yaml | 0 deploy/dev/{ => resources}/synapse-log.config | 0 .../dev/{ => resources}/synapse-signing.key | 0 deploy/prod/kustomization.yaml | 12 ++++---- .../prod/{ => resources}/element-config.json | 0 .../grafana-contactpoints.yaml | 0 .../prod/{ => resources}/grafana-rules.yaml | 0 .../{ => resources}/invidious-config.yaml | 0 .../prometheus-alerting-rules.yaml | 0 deploy/prod/{ => resources}/prometheus.yaml | 0 22 files changed, 20 insertions(+), 20 deletions(-) rename deploy/dev/{ => resources}/element-config.json (100%) rename deploy/dev/{ => resources}/gitea-config.ini (100%) rename deploy/dev/{ => resources}/grafana-contactpoints.yaml (100%) rename deploy/dev/{ => resources}/grafana-datasources.yaml (100%) rename deploy/dev/{ => resources}/grafana.ini (100%) rename deploy/dev/{ => resources}/invidious-config.yaml (100%) rename deploy/dev/{ => resources}/prometheus-alerting-rules.yaml (100%) rename deploy/dev/{ => resources}/prometheus-alertmanager.yaml (100%) rename deploy/dev/{ => resources}/prometheus.yaml (100%) rename deploy/dev/{ => resources}/radicale-config.toml (100%) rename deploy/dev/{ => resources}/radicale-users (100%) rename deploy/dev/{ => resources}/synapse-homeserver.yaml (100%) rename deploy/dev/{ => resources}/synapse-log.config (100%) rename deploy/dev/{ => resources}/synapse-signing.key (100%) rename deploy/prod/{ => resources}/element-config.json (100%) rename deploy/prod/{ => resources}/grafana-contactpoints.yaml (100%) rename deploy/prod/{ => resources}/grafana-rules.yaml (100%) rename deploy/prod/{ => resources}/invidious-config.yaml (100%) rename deploy/prod/{ => resources}/prometheus-alerting-rules.yaml (100%) rename deploy/prod/{ => resources}/prometheus.yaml (100%) diff --git a/deploy/dev/kustomization.yaml b/deploy/dev/kustomization.yaml index 04d7ead..9d8cc5b 100644 --- a/deploy/dev/kustomization.yaml +++ b/deploy/dev/kustomization.yaml @@ -21,33 +21,33 @@ configMapGenerator: - name: prometheus-server behavior: merge files: - - prometheus.yml=prometheus.yaml - - alerting_rules.yml=prometheus-alerting-rules.yaml + - prometheus.yml=resources/prometheus.yaml + - alerting_rules.yml=resources/prometheus-alerting-rules.yaml options: labels: app: prometheus - name: prometheus-alertmanager behavior: merge files: - - alertmanager.yml=prometheus-alertmanager.yaml + - alertmanager.yml=resources/prometheus-alertmanager.yaml options: labels: app: prometheus - name: grafana behavior: merge files: - - grafana.ini - - datasources.yaml=grafana-datasources.yaml - - contactpoints.yaml=grafana-contactpoints.yaml + - grafana.ini=resources/grafana.ini + - datasources.yaml=resources/grafana-datasources.yaml + - contactpoints.yaml=resources/grafana-contactpoints.yaml - name: invidious-config files: - - config.yml=invidious-config.yaml + - config.yml=resources/invidious-config.yaml options: labels: app: invidious - name: element-config files: - - config.json=element-config.json + - config.json=resources/element-config.json options: labels: app: element @@ -66,8 +66,8 @@ configMapGenerator: app: drone - name: radicale-config files: - - config.toml=radicale-config.toml - - users=radicale-users + - config.toml=resources/radicale-config.toml + - users=resources/radicale-users options: labels: app: radicale @@ -95,7 +95,7 @@ secretGenerator: - admin-password=testme - admin-email=mail@localhost files: - - config.ini=gitea-config.ini + - config.ini=resources/gitea-config.ini options: labels: app: gitea @@ -110,9 +110,9 @@ secretGenerator: app: drone - name: synapse-config files: - - homeserver.yaml=synapse-homeserver.yaml - - signing.key=synapse-signing.key - - log.config=synapse-log.config + - homeserver.yaml=resources/synapse-homeserver.yaml + - signing.key=resources/synapse-signing.key + - log.config=resources/synapse-log.config options: labels: app: synapse diff --git a/deploy/dev/element-config.json b/deploy/dev/resources/element-config.json similarity index 100% rename from deploy/dev/element-config.json rename to deploy/dev/resources/element-config.json diff --git a/deploy/dev/gitea-config.ini b/deploy/dev/resources/gitea-config.ini similarity index 100% rename from deploy/dev/gitea-config.ini rename to deploy/dev/resources/gitea-config.ini diff --git a/deploy/dev/grafana-contactpoints.yaml b/deploy/dev/resources/grafana-contactpoints.yaml similarity index 100% rename from deploy/dev/grafana-contactpoints.yaml rename to deploy/dev/resources/grafana-contactpoints.yaml diff --git a/deploy/dev/grafana-datasources.yaml b/deploy/dev/resources/grafana-datasources.yaml similarity index 100% rename from deploy/dev/grafana-datasources.yaml rename to deploy/dev/resources/grafana-datasources.yaml diff --git a/deploy/dev/grafana.ini b/deploy/dev/resources/grafana.ini similarity index 100% rename from deploy/dev/grafana.ini rename to deploy/dev/resources/grafana.ini diff --git a/deploy/dev/invidious-config.yaml b/deploy/dev/resources/invidious-config.yaml similarity index 100% rename from deploy/dev/invidious-config.yaml rename to deploy/dev/resources/invidious-config.yaml diff --git a/deploy/dev/prometheus-alerting-rules.yaml b/deploy/dev/resources/prometheus-alerting-rules.yaml similarity index 100% rename from deploy/dev/prometheus-alerting-rules.yaml rename to deploy/dev/resources/prometheus-alerting-rules.yaml diff --git a/deploy/dev/prometheus-alertmanager.yaml b/deploy/dev/resources/prometheus-alertmanager.yaml similarity index 100% rename from deploy/dev/prometheus-alertmanager.yaml rename to deploy/dev/resources/prometheus-alertmanager.yaml diff --git a/deploy/dev/prometheus.yaml b/deploy/dev/resources/prometheus.yaml similarity index 100% rename from deploy/dev/prometheus.yaml rename to deploy/dev/resources/prometheus.yaml diff --git a/deploy/dev/radicale-config.toml b/deploy/dev/resources/radicale-config.toml similarity index 100% rename from deploy/dev/radicale-config.toml rename to deploy/dev/resources/radicale-config.toml diff --git a/deploy/dev/radicale-users b/deploy/dev/resources/radicale-users similarity index 100% rename from deploy/dev/radicale-users rename to deploy/dev/resources/radicale-users diff --git a/deploy/dev/synapse-homeserver.yaml b/deploy/dev/resources/synapse-homeserver.yaml similarity index 100% rename from deploy/dev/synapse-homeserver.yaml rename to deploy/dev/resources/synapse-homeserver.yaml diff --git a/deploy/dev/synapse-log.config b/deploy/dev/resources/synapse-log.config similarity index 100% rename from deploy/dev/synapse-log.config rename to deploy/dev/resources/synapse-log.config diff --git a/deploy/dev/synapse-signing.key b/deploy/dev/resources/synapse-signing.key similarity index 100% rename from deploy/dev/synapse-signing.key rename to deploy/dev/resources/synapse-signing.key diff --git a/deploy/prod/kustomization.yaml b/deploy/prod/kustomization.yaml index af1fce8..7d35b63 100644 --- a/deploy/prod/kustomization.yaml +++ b/deploy/prod/kustomization.yaml @@ -10,8 +10,8 @@ configMapGenerator: - name: prometheus-server behavior: merge files: - - prometheus.yml=prometheus.yaml - - alerting_rules.yml=prometheus-alerting-rules.yaml + - prometheus.yml=resources/prometheus.yaml + - alerting_rules.yml=resources/prometheus-alerting-rules.yaml options: labels: app: prometheus @@ -27,17 +27,17 @@ configMapGenerator: files: - grafana.ini=secrets/grafana-config.ini - datasources.yaml=secrets/grafana-datasources.yaml - - contactpoints.yaml=grafana-contactpoints.yaml - - rules.yaml=grafana-rules.yaml + - contactpoints.yaml=resources/grafana-contactpoints.yaml + - rules.yaml=resources/grafana-rules.yaml - name: invidious-config files: - - config.yml=invidious-config.yaml + - config.yml=resources/invidious-config.yaml options: labels: app: invidious - name: element-config files: - - config.json=element-config.json + - config.json=resources/element-config.json options: labels: app: element diff --git a/deploy/prod/element-config.json b/deploy/prod/resources/element-config.json similarity index 100% rename from deploy/prod/element-config.json rename to deploy/prod/resources/element-config.json diff --git a/deploy/prod/grafana-contactpoints.yaml b/deploy/prod/resources/grafana-contactpoints.yaml similarity index 100% rename from deploy/prod/grafana-contactpoints.yaml rename to deploy/prod/resources/grafana-contactpoints.yaml diff --git a/deploy/prod/grafana-rules.yaml b/deploy/prod/resources/grafana-rules.yaml similarity index 100% rename from deploy/prod/grafana-rules.yaml rename to deploy/prod/resources/grafana-rules.yaml diff --git a/deploy/prod/invidious-config.yaml b/deploy/prod/resources/invidious-config.yaml similarity index 100% rename from deploy/prod/invidious-config.yaml rename to deploy/prod/resources/invidious-config.yaml diff --git a/deploy/prod/prometheus-alerting-rules.yaml b/deploy/prod/resources/prometheus-alerting-rules.yaml similarity index 100% rename from deploy/prod/prometheus-alerting-rules.yaml rename to deploy/prod/resources/prometheus-alerting-rules.yaml diff --git a/deploy/prod/prometheus.yaml b/deploy/prod/resources/prometheus.yaml similarity index 100% rename from deploy/prod/prometheus.yaml rename to deploy/prod/resources/prometheus.yaml