refactor: simplify the registry structure

mrsimonemms · Nov 10, 2024 · 861a21d · 861a21d
1 parent a9dddd9
commit 861a21d
Show file tree

Hide file tree

Showing 31 changed files with 76 additions and 204 deletions.
diff --git a/registry/clusters/dev/cert-manager.yaml b/registry/clusters/dev/cert-manager.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/dev/components/cert-manager
-    targetRevision: HEAD
+    path: registry/components/cert-manager
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: cert-manager

diff --git a/registry/clusters/dev/components/external-secret-stores/infisical.yaml b/registry/clusters/dev/components/external-secret-stores/infisical.yaml
diff --git a/registry/clusters/dev/external-dns.yaml b/registry/clusters/dev/external-dns.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/dev/components/external-dns
-    targetRevision: HEAD
+    path: registry/components/external-dns
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: external-dns

diff --git a/registry/clusters/dev/external-secret-stores.yaml b/registry/clusters/dev/external-secret-stores.yaml
@@ -11,8 +11,19 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/dev/components/external-secret-stores
-    targetRevision: HEAD
+    path: registry/components/external-secret-stores
+    targetRevision: main
+    kustomize:
+      patches:
+        - target:
+            group: external-secrets.io
+            version: v1beta1
+            kind: ClusterSecretStore
+            name: infisical
+          patch: |-
+            - op: replace
+              path: /spec/provider/infisical/secretsScope/environmentSlug
+              value: dev
   destination:
     server: https://kubernetes.default.svc
     namespace: external-secrets

diff --git a/registry/clusters/dev/external-secrets.yaml b/registry/clusters/dev/external-secrets.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/dev/components/external-secrets
-    targetRevision: HEAD
+    path: registry/components/external-secrets
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: external-secrets

diff --git a/registry/clusters/dev/registry.yaml b/registry/clusters/dev/registry.yaml
@@ -12,7 +12,9 @@ spec:
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
     path: registry/clusters/dev
-    targetRevision: HEAD
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd

diff --git a/registry/clusters/dev/reloader.yaml b/registry/clusters/dev/reloader.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/dev/components/reloader
-    targetRevision: HEAD
+    path: registry/components/reloader
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: reloader

diff --git a/registry/clusters/prod/cert-manager.yaml b/registry/clusters/prod/cert-manager.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/prod/components/cert-manager
-    targetRevision: HEAD
+    path: registry/components/cert-manager
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: cert-manager

diff --git a/registry/clusters/prod/components/cert-manager/application.yaml b/registry/clusters/prod/components/cert-manager/application.yaml
diff --git a/registry/clusters/prod/components/cert-manager/clusterissuers.yaml b/registry/clusters/prod/components/cert-manager/clusterissuers.yaml
diff --git a/registry/clusters/prod/components/external-dns/application.yaml b/registry/clusters/prod/components/external-dns/application.yaml
diff --git a/registry/clusters/prod/components/external-dns/secret.yaml b/registry/clusters/prod/components/external-dns/secret.yaml
diff --git a/registry/clusters/prod/components/external-secrets/application.yaml b/registry/clusters/prod/components/external-secrets/application.yaml
diff --git a/registry/clusters/prod/components/reloader/application.yaml b/registry/clusters/prod/components/reloader/application.yaml
diff --git a/registry/clusters/prod/external-dns.yaml b/registry/clusters/prod/external-dns.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/prod/components/external-dns
-    targetRevision: HEAD
+    path: registry/components/external-dns
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: external-dns

diff --git a/registry/clusters/prod/external-secret-stores.yaml b/registry/clusters/prod/external-secret-stores.yaml
@@ -11,8 +11,9 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/prod/components/external-secret-stores
-    targetRevision: HEAD
+    path: registry/components
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: external-secrets

diff --git a/registry/clusters/prod/external-secrets.yaml b/registry/clusters/prod/external-secrets.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/prod/components/external-secrets
-    targetRevision: HEAD
+    path: registry/components/external-secrets
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: external-secrets

diff --git a/registry/clusters/prod/registry.yaml b/registry/clusters/prod/registry.yaml
@@ -12,7 +12,9 @@ spec:
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
     path: registry/clusters/prod
-    targetRevision: HEAD
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd

diff --git a/registry/clusters/prod/reloader.yaml b/registry/clusters/prod/reloader.yaml
@@ -11,8 +11,10 @@ spec:
   project: default
   source:
     repoURL: https://github.com/mrsimonemms/infrastructure
-    path: registry/clusters/prod/components/reloader
-    targetRevision: HEAD
+    path: registry/components/reloader
+    targetRevision: main
+    kustomize:
+      patches: []
   destination:
     server: https://kubernetes.default.svc
     namespace: reloader

diff --git a/.../components/cert-manager/application.yaml → .../components/cert-manager/application.yaml b/.../components/cert-manager/application.yaml → .../components/cert-manager/application.yaml
diff --git a/...mponents/cert-manager/clusterissuers.yaml → ...mponents/cert-manager/clusterissuers.yaml b/...mponents/cert-manager/clusterissuers.yaml → ...mponents/cert-manager/clusterissuers.yaml
diff --git a/registry/components/cert-manager/kustomization.yaml b/registry/components/cert-manager/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - application.yaml
+  - clusterissuers.yaml
diff --git a/.../components/external-dns/application.yaml → .../components/external-dns/application.yaml b/.../components/external-dns/application.yaml → .../components/external-dns/application.yaml
diff --git a/registry/components/external-dns/kustomization.yaml b/registry/components/external-dns/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - application.yaml
+  - secret.yaml
diff --git a/...s/dev/components/external-dns/secret.yaml → registry/components/external-dns/secret.yaml b/...s/dev/components/external-dns/secret.yaml → registry/components/external-dns/secret.yaml
diff --git a/...nts/external-secret-stores/infisical.yaml → ...nts/external-secret-stores/infisical.yaml b/...nts/external-secret-stores/infisical.yaml → ...nts/external-secret-stores/infisical.yaml
diff --git a/registry/components/external-secret-stores/kustomization.yaml b/registry/components/external-secret-stores/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - infisical.yaml
diff --git a/...ponents/external-secrets/application.yaml → ...ponents/external-secrets/application.yaml b/...ponents/external-secrets/application.yaml → ...ponents/external-secrets/application.yaml
diff --git a/registry/components/external-secrets/kustomization.yaml b/registry/components/external-secrets/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - application.yaml
diff --git a/.../dev/components/reloader/application.yaml → ...stry/components/reloader/application.yaml b/.../dev/components/reloader/application.yaml → ...stry/components/reloader/application.yaml
diff --git a/registry/components/reloader/kustomization.yaml b/registry/components/reloader/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - reloader.yaml