Merge pull request #43 from natrontech/42-update-templates

42 update templates
natrontech · Jul 20, 2023 · b695f4e · b695f4e
2 parents 406d403 + 50973e6
commit b695f4e
Show file tree

Hide file tree

Showing 20 changed files with 146 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,5 @@ dist/
 .ash_history
 /docker-compose.override.yml
 _temp/
+
+./momentum-core/momentum-core
diff --git a/momentum-core/_templates/applications/_base/kustomization.yaml b/momentum-core/_templates/applications/_base/kustomization.yaml
@@ -11,7 +11,7 @@ configMapGenerator:
     disableNameSuffixHash: true
 secretGenerator:
 - files:
-  - secrets.yaml
+  - values.yaml=secrets.yaml
   name: base-secrets
   options:
     disableNameSuffixHash: true

diff --git a/momentum-core/_templates/applications/_base/release.yaml b/momentum-core/_templates/applications/_base/release.yaml
@@ -3,10 +3,10 @@ kind: HelmRelease
 metadata:
   name: {{ .ApplicationName }}
 spec:
-  interval: 10m
+  interval: '{{ .ReconcileInterval }}'
   chart:
     spec:
-      chart: '{{ .ApplicationChartName }}'
+      version: '{{ .ChartVersion }}'
       sourceRef:
         kind: HelmRepository
         name: '{{ .ApplicationName }}-charts'

diff --git a/momentum-core/_templates/deployments/deploymentName.yaml b/momentum-core/_templates/deployments/deploymentName.yaml
@@ -2,9 +2,11 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: '{{ .DeploymentNameWithoutEnding }}'
+  namespace: flux-system
 spec:
+  targetNamespace: '{{ .DeploymentNameWithoutEnding }}'
   interval: 5m0s
-  path: ./_deploy/{{ .DeploymentName }}/
+  path: {{ .PathFromMomentumRoot }}
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/momentum-core/_templates/deployments/deploymentName/kustomization.yaml b/momentum-core/_templates/deployments/deploymentName/kustomization.yaml
@@ -11,7 +11,7 @@ configMapGenerator:
     disableNameSuffixHash: true
 secretGenerator:
 - files:
-  - secrets.yaml
+  - values.yaml=secrets.yaml
   name: deploy-secrets
   options:
     disableNameSuffixHash: true

diff --git a/momentum-core/_templates/deployments/deploymentName/release.yaml b/momentum-core/_templates/deployments/deploymentName/release.yaml
@@ -1,4 +1,9 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: {{ .ApplicationName }}
+  name: {{ .ApplicationName }}
+spec:
+  interval: '{{ .ReconcileInterval }}'
+  chart:
+    spec:
+      version: '{{ .ChartVersion }}'
diff --git a/momentum-core/_templates/stages/_base/kustomization.yaml b/momentum-core/_templates/stages/_base/kustomization.yaml
@@ -1,28 +1,23 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../_base/release.yaml
+- ../../_base/
 configMapGenerator:
-- files:
-  - ../../_base/values.yaml
-  name: base-values
-  options:
-    disableNameSuffixHash: true
 - files:
   - values.yaml
   name: '{{ .StageName }}-values'
   options:
     disableNameSuffixHash: true
 secretGenerator:
 - files:
-  - ../../_base/secrets.yaml
-  name: base-secrets
-  options:
-    disableNameSuffixHash: true
-- files:
-  - secrets.yaml
+  - values.yaml=secrets.yaml
   name: '{{ .StageName }}-secrets'
   options:
     disableNameSuffixHash: true
 patches:
   - path: release.yaml
+labels:
+- includeSelectors: true
+  pairs:
+    gitops.natron.io/application: '{{ .ApplicationName }}'
+    gitops.natron.io/stage: '{{ .StageName }}'
diff --git a/momentum-core/_templates/stages/_base/release.yaml b/momentum-core/_templates/stages/_base/release.yaml
@@ -2,6 +2,11 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: '{{ .ApplicationName }}'
+spec:
+  interval: '{{ .ReconcileInterval }}'
+  chart:
+    spec:
+      version: '{{ .ChartVersion }}'
 spec:
   valuesFrom:
     - kind: ConfigMap

diff --git a/momentum-core/docs/docs.go b/momentum-core/docs/docs.go
diff --git a/momentum-core/docs/swagger.json b/momentum-core/docs/swagger.json
@@ -658,9 +658,15 @@
         "models.ApplicationCreateRequest": {
             "type": "object",
             "properties": {
+                "chartVersion": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },
+                "reconcileInterval": {
+                    "type": "string"
+                },
                 "repositoryName": {
                     "type": "string"
                 }
@@ -689,12 +695,18 @@
                 "applicationName": {
                     "type": "string"
                 },
+                "chartVersion": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },
                 "parentStageId": {
                     "type": "string"
                 },
+                "reconcileInterval": {
+                    "type": "string"
+                },
                 "repositoryName": {
                     "type": "string"
                 }
@@ -742,6 +754,9 @@
         "models.StageCreateRequest": {
             "type": "object",
             "properties": {
+                "chartVersion": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },
@@ -751,6 +766,9 @@
                 "parentStageId": {
                     "type": "string"
                 },
+                "reconcileInterval": {
+                    "type": "string"
+                },
                 "repositoryName": {
                     "type": "string"
                 }

diff --git a/momentum-core/docs/swagger.yaml b/momentum-core/docs/swagger.yaml
@@ -25,8 +25,12 @@ definitions:
     type: object
   models.ApplicationCreateRequest:
     properties:
+      chartVersion:
+        type: string
       name:
         type: string
+      reconcileInterval:
+        type: string
       repositoryName:
         type: string
     type: object
@@ -45,10 +49,14 @@ definitions:
     properties:
       applicationName:
         type: string
+      chartVersion:
+        type: string
       name:
         type: string
       parentStageId:
         type: string
+      reconcileInterval:
+        type: string
       repositoryName:
         type: string
     type: object
@@ -79,12 +87,16 @@ definitions:
     type: object
   models.StageCreateRequest:
     properties:
+      chartVersion:
+        type: string
       name:
         type: string
       parentApplicationId:
         type: string
       parentStageId:
         type: string
+      reconcileInterval:
+        type: string
       repositoryName:
         type: string
     type: object

diff --git a/momentum-core/models/application.go b/momentum-core/models/application.go
@@ -10,8 +10,10 @@ import (
 )
 
 type ApplicationCreateRequest struct {
-	Name           string `json:"name"`
-	RepositoryName string `json:"repositoryName"`
+	Name              string `json:"name"`
+	ReconcileInterval string `json:"reconcileInterval"`
+	ChartVersion      string `json:"chartVersion"`
+	RepositoryName    string `json:"repositoryName"`
 }
 
 type Application struct {

diff --git a/momentum-core/models/deployment.go b/momentum-core/models/deployment.go
@@ -5,15 +5,18 @@ import (
 	"momentum-core/clients"
 	"momentum-core/tree"
 	"momentum-core/utils"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 )
 
 type DeploymentCreateRequest struct {
-	Name            string `json:"name"`
-	ParentStageId   string `json:"parentStageId"`
-	RepositoryName  string `json:"repositoryName"`
-	ApplicationName string `json:"applicationName"`
+	Name              string `json:"name"`
+	ReconcileInterval string `json:"reconcileInterval"`
+	ChartVersion      string `json:"chartVersion"`
+	ParentStageId     string `json:"parentStageId"`
+	RepositoryName    string `json:"repositoryName"`
+	ApplicationName   string `json:"applicationName"`
 }
 
 type Deployment struct {
@@ -41,7 +44,7 @@ func ToDeploymentFromNode(n *tree.Node, repositoryId string) (*Deployment, error
 	deployment := new(Deployment)
 
 	deployment.Id = n.Id
-	deployment.Name = n.Path
+	deployment.Name = strings.Split(n.Path, "::")[0]
 	deployment.Path = n.FullPath()
 	deployment.RepositoryId = repositoryId
 	deployment.ParentStageId = n.Parent.Id

diff --git a/momentum-core/models/stage.go b/momentum-core/models/stage.go
@@ -11,6 +11,8 @@ import (
 
 type StageCreateRequest struct {
 	Name                string `json:"name"`
+	ReconcileInterval   string `json:"reconcileInterval"`
+	ChartVersion        string `json:"chartVersion"`
 	RepositoryName      string `json:"repositoryName"`
 	ParentApplicationId string `json:"parentApplicationId"`
 	ParentStageId       string `json:"parentStageId"`

diff --git a/momentum-core/momentum-core b/momentum-core/momentum-core
diff --git a/momentum-core/services/application-service.go b/momentum-core/services/application-service.go
@@ -72,8 +72,6 @@ func (as *ApplicationService) AddApplication(request *models.ApplicationCreateRe
 		}
 	}
 
-	appChartName := request.Name + "-chart"
-
 	appMountPath := utils.BuildPath(repo.MomentumRoot().FullPath(), request.Name)
 	appBasePath := utils.BuildPath(appMountPath, "_base")
 
@@ -88,7 +86,7 @@ func (as *ApplicationService) AddApplication(request *models.ApplicationCreateRe
 	appBaseKustomizationPath := utils.BuildPath(appBasePath, KUSTOMIZATION_FILE_NAME)
 	appBaseReleasePath := utils.BuildPath(appBasePath, "release.yaml")
 
-	template := as.templateService.NewApplicationTemplate(appRepositoryPath, appNamespacePath, appBaseKustomizationPath, appBaseReleasePath, request.Name, appChartName)
+	template := as.templateService.NewApplicationTemplate(appRepositoryPath, appNamespacePath, appBaseKustomizationPath, appBaseReleasePath, request.Name, request.ReconcileInterval, request.ChartVersion)
 	err = as.templateService.ApplyApplicationTemplate(template)
 	if err != nil {
 		config.LOGGER.LogWarning("failed applying application template", err, traceId)

diff --git a/momentum-core/services/deployment-service.go b/momentum-core/services/deployment-service.go
@@ -5,6 +5,7 @@ import (
 	"momentum-core/config"
 	"momentum-core/models"
 	"momentum-core/utils"
+	"strings"
 )
 
 type DeploymentService struct {
@@ -92,8 +93,21 @@ func (ds *DeploymentService) AddDeployment(request *models.DeploymentCreateReque
 
 	releaseYamlPath := utils.BuildPath(deploymentFolderDestinationPath, "release.yaml")
 	deploymentKustomizationYamlPath := utils.BuildPath(deploymentFolderDestinationPath, KUSTOMIZATION_FILE_NAME)
+	pathFromMomentumRoot := strings.Split(deploymentFolderDestinationPath, config.MOMENTUM_ROOT)[1]
+	pathFromMomentumRoot = utils.BuildPath(config.MOMENTUM_ROOT, pathFromMomentumRoot)
+
+	template := ds.templateService.NewDeploymentTemplate(
+		deploymentKustomizationYamlPath,
+		deploymentFileDestinationPath,
+		releaseYamlPath,
+		deploymentYamlDestinationName,
+		pathFromMomentumRoot,
+		request.ReconcileInterval,
+		request.ChartVersion,
+		request.ApplicationName,
+		request.RepositoryName,
+	)
 
-	template := ds.templateService.NewDeploymentTemplate(deploymentKustomizationYamlPath, deploymentFileDestinationPath, releaseYamlPath, deploymentYamlDestinationName, request.ApplicationName, request.RepositoryName)
 	err = ds.templateService.ApplyDeploymentTemplate(template)
 	if err != nil {
 		config.LOGGER.LogWarning("failed applying deployment template", err, traceId)

diff --git a/momentum-core/services/stage-service.go b/momentum-core/services/stage-service.go
@@ -105,7 +105,7 @@ func (s *StageService) AddStage(request *models.StageCreateRequest, traceId stri
 	stageBaseKustomizationPath := utils.BuildPath(stageBasePath, KUSTOMIZATION_FILE_NAME)
 	stageBaseReleasePath := utils.BuildPath(stageBasePath, "release.yaml")
 
-	template := s.templateService.NewStageTemplate(stageBaseKustomizationPath, stageBaseReleasePath, request.Name, parentAppNode.Path)
+	template := s.templateService.NewStageTemplate(stageBaseKustomizationPath, stageBaseReleasePath, request.Name, parentAppNode.Path, request.ReconcileInterval, request.ChartVersion)
 	err = s.templateService.ApplyStageTemplate(template)
 	if err != nil {
 		return nil, err