From 293b4cab64dffc740d03b90a453822f01f69cf17 Mon Sep 17 00:00:00 2001 From: Manuel Bovo Date: Thu, 30 May 2024 12:49:45 +0200 Subject: [PATCH] restructuring directory tree --- high/envs/astrid/cert-manager.yaml | 2 +- high/envs/astrid/certs.yaml | 2 +- high/envs/astrid/monicahq.yaml | 7 ++++++- high/envs/astrid/ouath2-proxy.yaml | 7 ++++++- high/{ => infra}/.sops.yaml | 0 high/overlays/astrid/{monicahq => }/.sops.yaml | 2 +- high/overlays/astrid/certmanager/kustomization.yaml | 4 ++++ .../astrid => overlays/astrid/certs}/ClusterIssuer.yaml | 0 .../astrid => overlays/astrid/certs}/kustomization.yaml | 1 + high/overlays/astrid/oauth2-proxy/.sops.yaml | 4 ---- high/{apps => overlays/prod}/.placeholder | 0 11 files changed, 20 insertions(+), 9 deletions(-) rename high/{ => infra}/.sops.yaml (100%) rename high/overlays/astrid/{monicahq => }/.sops.yaml (84%) create mode 100644 high/overlays/astrid/certmanager/kustomization.yaml rename high/{infra/certs/overlays/astrid => overlays/astrid/certs}/ClusterIssuer.yaml (100%) rename high/{infra/certs/overlays/astrid => overlays/astrid/certs}/kustomization.yaml (80%) delete mode 100644 high/overlays/astrid/oauth2-proxy/.sops.yaml rename high/{apps => overlays/prod}/.placeholder (100%) diff --git a/high/envs/astrid/cert-manager.yaml b/high/envs/astrid/cert-manager.yaml index a9dff27..c51b888 100644 --- a/high/envs/astrid/cert-manager.yaml +++ b/high/envs/astrid/cert-manager.yaml @@ -10,5 +10,5 @@ spec: sourceRef: kind: GitRepository name: flux-system - path: ./high/infra/certmanager + path: ./high/overlays/astrid/certmanager prune: true \ No newline at end of file diff --git a/high/envs/astrid/certs.yaml b/high/envs/astrid/certs.yaml index db0b304..7070bc1 100644 --- a/high/envs/astrid/certs.yaml +++ b/high/envs/astrid/certs.yaml @@ -10,7 +10,7 @@ spec: sourceRef: kind: GitRepository name: flux-system - path: ./high/infra/certs/overlays/astrid + path: ./high/overlays/astrid/certs prune: true dependsOn: - name: cert-manager diff --git a/high/envs/astrid/monicahq.yaml b/high/envs/astrid/monicahq.yaml index cc80ab8..51d489b 100644 --- a/high/envs/astrid/monicahq.yaml +++ b/high/envs/astrid/monicahq.yaml @@ -13,4 +13,9 @@ spec: kind: GitRepository name: flux-system path: ./high/overlays/astrid/monicahq - prune: true \ No newline at end of file + prune: true + dependsOn: + - name: cert-manager + namespace: flux-system + - name: certs + namespace: flux-system \ No newline at end of file diff --git a/high/envs/astrid/ouath2-proxy.yaml b/high/envs/astrid/ouath2-proxy.yaml index 641e248..c53c9b5 100644 --- a/high/envs/astrid/ouath2-proxy.yaml +++ b/high/envs/astrid/ouath2-proxy.yaml @@ -13,4 +13,9 @@ spec: kind: GitRepository name: flux-system path: ./high/overlays/astrid/oauth2-proxy - prune: true \ No newline at end of file + prune: true + dependsOn: + - name: cert-manager + namespace: flux-system + - name: certs + namespace: flux-system \ No newline at end of file diff --git a/high/.sops.yaml b/high/infra/.sops.yaml similarity index 100% rename from high/.sops.yaml rename to high/infra/.sops.yaml diff --git a/high/overlays/astrid/monicahq/.sops.yaml b/high/overlays/astrid/.sops.yaml similarity index 84% rename from high/overlays/astrid/monicahq/.sops.yaml rename to high/overlays/astrid/.sops.yaml index 99faa35..1d097c7 100644 --- a/high/overlays/astrid/monicahq/.sops.yaml +++ b/high/overlays/astrid/.sops.yaml @@ -1,4 +1,4 @@ creation_rules: - path_regex: .*.yaml - encrypted_regex: ^(data|stringData|consumerKey|email|groupName|applicationKey|host|hosts|addresses|server|configLogicalBackup|channel|monica|mariadb|redis)$ + encrypted_regex: ^(data|stringData|consumerKey|email|groupName|applicationKey|host|hosts|addresses|server|configLogicalBackup|channel|monica|mariadb|redis|config)$ pgp: 46FAA8106554E4BAC648A9C8DAC3C1A5974CE5A1 \ No newline at end of file diff --git a/high/overlays/astrid/certmanager/kustomization.yaml b/high/overlays/astrid/certmanager/kustomization.yaml new file mode 100644 index 0000000..c5a44b4 --- /dev/null +++ b/high/overlays/astrid/certmanager/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../../infra/certmanager/ diff --git a/high/infra/certs/overlays/astrid/ClusterIssuer.yaml b/high/overlays/astrid/certs/ClusterIssuer.yaml similarity index 100% rename from high/infra/certs/overlays/astrid/ClusterIssuer.yaml rename to high/overlays/astrid/certs/ClusterIssuer.yaml diff --git a/high/infra/certs/overlays/astrid/kustomization.yaml b/high/overlays/astrid/certs/kustomization.yaml similarity index 80% rename from high/infra/certs/overlays/astrid/kustomization.yaml rename to high/overlays/astrid/certs/kustomization.yaml index 8dc9e4d..dd0abba 100644 --- a/high/infra/certs/overlays/astrid/kustomization.yaml +++ b/high/overlays/astrid/certs/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: +- ../../../infra/certs/ - ClusterIssuer.yaml diff --git a/high/overlays/astrid/oauth2-proxy/.sops.yaml b/high/overlays/astrid/oauth2-proxy/.sops.yaml deleted file mode 100644 index 2daa21d..0000000 --- a/high/overlays/astrid/oauth2-proxy/.sops.yaml +++ /dev/null @@ -1,4 +0,0 @@ -creation_rules: - - path_regex: .*.yaml - encrypted_regex: ^(data|stringData|consumerKey|email|groupName|applicationKey|host|hosts|addresses|server|configLogicalBackup|channel|config)$ - pgp: 46FAA8106554E4BAC648A9C8DAC3C1A5974CE5A1 \ No newline at end of file diff --git a/high/apps/.placeholder b/high/overlays/prod/.placeholder similarity index 100% rename from high/apps/.placeholder rename to high/overlays/prod/.placeholder