Merge pull request #41 from natrontech/update-structure

Update structure

momentum-structure/README.md

@@ -8,13 +8,13 @@ The structure is as follows (generated with `tree -a -I`):
 
 ```bash
 .
-└── {root}
-    ├── kustomization.yaml
-    └── {application} # An application e.g. my-app (level 1)
+└── momentum-root # This is the root of the repository
+    ├── kustomization.yaml # This is the root kustomization file
+    └── {application}
         ├── _base
         │   ├── kustomization.yaml
         │   ├── ns.yaml
-        │   ├── release.yaml
+        │   ├── release.yaml # This is the helm release for base
         │   ├── secrets.yaml
         │   └── values.yaml
         ├── _deploy
@@ -24,13 +24,13 @@ The structure is as follows (generated with `tree -a -I`):
         │       ├── secrets.yaml
         │       └── values.yaml
         ├── _template
-        │   ├── secrets.yaml # The helmrelease keys for secrets templated with go template
-        │   └── values.yaml # The helmrelease values templated with go template
+        │   ├── secrets.yaml
+        │   └── values.yaml
         ├── kustomization.yaml
-        ├── ns.yaml # The namespace of the application (to store the helmrepository stuff)
-        ├── repository.yaml # The helm repository of the application
-        ├── {deployment}.yaml # A deployment of the application, which is a flux kustomization
-        └── {stage} # A stage of the application e.g. cluster-test, cluster-prod (level 2)
+        ├── ns.yaml
+        ├── repository.yaml
+        ├── {deployment}.yaml
+        └── {stage}
             ├── _base
             │   ├── kustomization.yaml
             │   ├── release.yaml
@@ -47,7 +47,7 @@ The structure is as follows (generated with `tree -a -I`):
             │   └── values.yaml
             ├── kustomization.yaml
             ├── {deployment}.yaml
-            └── {stage} # A stage of the application e.g. test,prod (level 3)
+            └── {stage}
                 ├── _base
                 │   ├── kustomization.yaml
                 │   ├── release.yaml

momentum-structure/{root}/{application}/_base/kustomization.yaml → momentum-structure/momentum-root/{application}/_base/kustomization.yaml

@@ -11,7 +11,7 @@ configMapGenerator:
     disableNameSuffixHash: true
 secretGenerator:
 - files:
-  - secrets.yaml
+  - values.yaml=secrets.yaml
   name: base-secrets
   options:
     disableNameSuffixHash: true

momentum-structure/{root}/{application}/_base/ns.yaml → momentum-structure/momentum-root/{application}/_base/ns.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: patch
+  name: patch

momentum-structure/{root}/{application}/_base/release.yaml → momentum-structure/momentum-root/{application}/_base/release.yaml

@@ -3,10 +3,10 @@ kind: HelmRelease
 metadata:
   name: '{application}'
 spec:
-  interval: 10m
+  interval: '{application-interval}'
   chart:
     spec:
-      chart: '{application-chart}'
+      version: '{application-chart-version}'
       sourceRef:
         kind: HelmRepository
         name: '{application}-charts'

momentum-structure/momentum-root/{application}/_base/secrets.yaml

@@ -0,0 +1 @@
+base-secretkey: base-secretvalue

momentum-structure/momentum-root/{application}/_base/values.yaml

@@ -0,0 +1 @@
+base-key: base-value

momentum-structure/{root}/{application}/_deploy/{deployment}/kustomization.yaml → momentum-structure/momentum-root/{application}/_deploy/{deployment}/kustomization.yaml

@@ -11,7 +11,7 @@ configMapGenerator:
     disableNameSuffixHash: true
 secretGenerator:
 - files:
-  - secrets.yaml
+  - values.yaml=secrets.yaml
   name: deploy-secrets
   options:
     disableNameSuffixHash: true

momentum-structure/momentum-root/{application}/_deploy/{deployment}/release.yaml

@@ -0,0 +1,9 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: '{application}'
+spec:
+  interval: '{application-interval}'
+  chart:
+    spec:
+      version: '{application-chart-version}'

momentum-structure/momentum-root/{application}/_deploy/{deployment}/secrets.yaml

@@ -0,0 +1 @@
+deploy-secretkey: deploy-secretvalue

momentum-structure/momentum-root/{application}/_deploy/{deployment}/values.yaml

@@ -0,0 +1 @@
+deploy-key: deploy-value

momentum-structure/momentum-root/{application}/_template/secrets.yaml

@@ -0,0 +1 @@
+template-secretkey: {{ .template-secretvalue }}

momentum-structure/momentum-root/{application}/_template/values.yaml

@@ -0,0 +1 @@
+template-key: {{.template-value}}

momentum-structure/{root}/{application}/{deployment}.yaml → momentum-structure/momentum-root/{application}/{deployment}.yaml

@@ -2,9 +2,11 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: '{deployment}'
+  namespace: flux-system
 spec:
+  targetNamespace: '{deployment}'
   interval: 5m0s
-  path: ./_deploy/{deployment}/
+  path: ./momentum-root/{application}/_deploy/{deployment}/
   prune: true
   sourceRef:
     kind: GitRepository

momentum-structure/momentum-root/{application}/{stage}/_base/kustomization.yaml

@@ -0,0 +1,23 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../_base/
+configMapGenerator:
+- files:
+  - values.yaml
+  name: '{stage}-values'
+  options:
+    disableNameSuffixHash: true
+secretGenerator:
+- files:
+  - values.yaml=secrets.yaml
+  name: '{stage}-secrets'
+  options:
+    disableNameSuffixHash: true
+patches:
+  - path: release.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    gitops.natron.io/application: '{application}'
+    gitops.natron.io/stage: '{stage}'

momentum-structure/{root}/{application}/{stage}/_base/release.yaml → momentum-structure/momentum-root/{application}/{stage}/_base/release.yaml

@@ -3,6 +3,10 @@ kind: HelmRelease
 metadata:
   name: '{application}'
 spec:
+  interval: '{application-interval}'
+  chart:
+    spec:
+      version: '{application-chart-version}'
   valuesFrom:
     - kind: ConfigMap
       name: base-values

momentum-structure/momentum-root/{application}/{stage}/_base/secrets.yaml

@@ -0,0 +1 @@
+stage-base-secretkey: stage-base-secretvalue

momentum-structure/momentum-root/{application}/{stage}/_base/values.yaml

@@ -0,0 +1 @@
+stage-base-key: stage-base-value

momentum-structure/{root}/{application}/{stage}/_deploy/{deployment}/kustomization.yaml → momentum-structure/momentum-root/{application}/{stage}/_deploy/{deployment}/kustomization.yaml

@@ -11,7 +11,7 @@ configMapGenerator:
     disableNameSuffixHash: true
 secretGenerator:
 - files:
-  - secrets.yaml
+  - values.yaml=secrets.yaml
   name: deploy-secrets
   options:
     disableNameSuffixHash: true

momentum-structure/momentum-root/{application}/{stage}/_deploy/{deployment}/release.yaml

@@ -0,0 +1,9 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: '{application}'
+spec:
+  interval: '{application-interval}'
+  chart:
+    spec:
+      version: '{application-chart-version}'

momentum-structure/momentum-root/{application}/{stage}/_deploy/{deployment}/secrets.yaml

@@ -0,0 +1 @@
+deploy-secretkey: deploy-secretvalue

momentum-structure/momentum-root/{application}/{stage}/_deploy/{deployment}/values.yaml

@@ -0,0 +1 @@
+deploy-key: deploy-value

momentum-structure/momentum-root/{application}/{stage}/_template/secrets.yaml

@@ -0,0 +1 @@
+template-secretkey: {{ .template-secretvalue }}

momentum-structure/momentum-root/{application}/{stage}/_template/values.yaml

@@ -0,0 +1 @@
+template-key: {{.template-value}}

momentum-structure/{root}/{application}/{stage}/{deployment}.yaml → momentum-structure/momentum-root/{application}/{stage}/{deployment}.yaml

@@ -2,9 +2,11 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: '{deployment}-{stage}' # next stage would be '{deployment}-{stage}-{next_stage}'
+  namespace: flux-system
 spec:
+  targetNamespace: '{deployment}-{stage}'
   interval: 5m0s
-  path: ./_deploy/{deployment}/
+  path: ./momentum-root/{application}/{stage}/_deploy/{deployment}/
   prune: true
   sourceRef:
     kind: GitRepository

momentum-structure/momentum-root/{application}/{stage}/{stage}/_base/kustomization.yaml

@@ -0,0 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../../_base/
+configMapGenerator:
+- files:
+  - values.yaml
+  name: '{stage}-{stage}-values'
+  options:
+    disableNameSuffixHash: true
+secretGenerator:
+- files:
+  - values.yaml=secrets.yaml
+  name: '{stage}-{stage}-secrets'
+  options:
+    disableNameSuffixHash: true
+patches:
+  - path: release.yaml

momentum-structure/{root}/{application}/{stage}/{stage}/_base/release.yaml → momentum-structure/momentum-root/{application}/{stage}/{stage}/_base/release.yaml

@@ -3,6 +3,10 @@ kind: HelmRelease
 metadata:
   name: '{application}'
 spec:
+  interval: '{application-interval}'
+  chart:
+    spec:
+      version: '{application-chart-version}'
   valuesFrom:
     - kind: ConfigMap
       name: base-values

momentum-structure/momentum-root/{application}/{stage}/{stage}/_base/secrets.yaml

@@ -0,0 +1 @@
+stage-base-secretkey: stage-base-secretvalue

momentum-structure/momentum-root/{application}/{stage}/{stage}/_base/values.yaml

@@ -0,0 +1 @@
+stage-base-key: stage-base-value

momentum-structure/{root}/{application}/{stage}/{stage}/_deploy/{deployment}/kustomization.yaml → momentum-structure/momentum-root/{application}/{stage}/{stage}/_deploy/{deployment}/kustomization.yaml

@@ -11,7 +11,7 @@ configMapGenerator:
     disableNameSuffixHash: true
 secretGenerator:
 - files:
-  - secrets.yaml
+  - values.yaml=secrets.yaml
   name: deploy-secrets
   options:
     disableNameSuffixHash: true

momentum-structure/momentum-root/{application}/{stage}/{stage}/_deploy/{deployment}/release.yaml

@@ -0,0 +1,9 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: '{application}'
+spec:
+  interval: '{application-interval}'
+  chart:
+    spec:
+      version: '{application-chart-version}'

momentum-structure/momentum-root/{application}/{stage}/{stage}/_deploy/{deployment}/secrets.yaml

@@ -0,0 +1 @@
+deploy-secretkey: deploy-secretvalue

momentum-structure/momentum-root/{application}/{stage}/{stage}/_deploy/{deployment}/values.yaml

@@ -0,0 +1 @@
+deploy-key: deploy-value

momentum-structure/momentum-root/{application}/{stage}/{stage}/_template/secrets.yaml

@@ -0,0 +1 @@
+template-secretkey: {{ .template-secretvalue }}

momentum-structure/momentum-root/{application}/{stage}/{stage}/_template/values.yaml

@@ -0,0 +1 @@
+template-key: {{.template-value}}

momentum-structure/{root}/{application}/{stage}/{stage}/{deployment}.yaml → momentum-structure/momentum-root/{application}/{stage}/{stage}/{deployment}.yaml

@@ -1,10 +1,12 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: '{deployment}-{stage}-{stage}' # next stage would be '{deployment}-{stage}--{stage}-{next_stage}'
+  name: '{deployment}-{stage}-{stage}' # next stage would be '{deployment}-{stage}-{stage}-{next_stage}'
+  namespace: flux-system
 spec:
+  targetNamespace: '{deployment}-{stage}-{stage}'
   interval: 5m0s
-  path: ./_deploy/{deployment}/
+  path: ./momentum-root/{application}/{stage}/{stage}/_deploy/{deployment}/
   prune: true
   sourceRef:
     kind: GitRepository