Order the release of application parent chart

api/v1alpha1/appgroup_types.go

@@ -155,12 +155,25 @@ type ApplicationGroupSpec struct {
 	Interval *metav1.Duration `json:"interval,omitempty"`
 }
 
+type ParentChartOrder string
+
+const (
+	Parallel ParentChartOrder = "parallel"
+	First    ParentChartOrder = "first"
+	Last     ParentChartOrder = "last"
+)
+
 // Application spec and dependency on other applications
 type Application struct {
 	// DAG contains the dependency information
 	DAG `json:",inline"`
 	// Spec contains the application spec including the chart info and overlay values
 	Spec ApplicationSpec `json:"spec,omitempty"`
+	// Order specifies the order in which the application
+	// parent chart is deployed in comparison to it's subcharts (if any)
+	// +kubebuilder:default:="parallel"
+	// +optional
+	Order ParentChartOrder `json:"order,omitempty"`
 }
 
 // DAG contains the dependency information

chart/orkestra/crds/orkestra.azure.microsoft.com_applicationgroups.yaml

@@ -62,6 +62,12 @@ spec:
                     name:
                       description: Name of the application
                       type: string
+                    order:
+                      default: parallel
+                      description: Order specifies the order in which the application
+                        parent chart is deployed in comparison to it's subcharts (if
+                        any)
+                      type: string
                     spec:
                       description: Spec contains the application spec including the
                         chart info and overlay values

config/crd/bases/orkestra.azure.microsoft.com_applicationgroups.yaml

@@ -62,6 +62,12 @@ spec:
                     name:
                       description: Name of the application
                       type: string
+                    order:
+                      default: parallel
+                      description: Order specifies the order in which the application
+                        parent chart is deployed in comparison to it's subcharts (if
+                        any)
+                      type: string
                     spec:
                       description: Spec contains the application spec including the
                         chart info and overlay values

config/samples/bookinfo.yaml

@@ -22,12 +22,14 @@ spec:
           #   name: <secret-name>
           #   namespace: <secret-namespace>
         release:
+          interval: 1m
           targetNamespace: ambassador 
           values:
             service:
               type: ClusterIP
     - name: bookinfo 
       dependencies: [ambassador]
+      order: first
       spec:
         chart:
           url: "https://nitishm.github.io/charts"
@@ -43,6 +45,7 @@ spec:
         - name: details
           dependencies: []
         release:
+          interval: 1m
           targetNamespace: bookinfo 
           values:
             productpage:

controllers/appgroup_reconciler.go

@@ -131,7 +131,7 @@ func (r *ApplicationGroupReconciler) reconcileApplications(l logr.Logger, appGro
 						scc.Templates = append(scc.Templates, t)
 					}
 				}
-				scc.Files = append(scc.Files, appCh.Files...)
+				// scc.Files = append(scc.Files, appCh.Files...)
 
 				scc.Metadata.Name = pkg.ConvertToDNS1123(pkg.ToInitials(appCh.Metadata.Name) + "-" + scc.Metadata.Name)
 				path, err := registry.SaveChartPackage(scc, stagingDir)
@@ -194,6 +194,8 @@ func (r *ApplicationGroupReconciler) reconcileApplications(l logr.Logger, appGro
 			appCh.Templates = append(appCh.Templates, dummy)
 		}
 
+		appCh.Metadata.Name = pkg.ConvertToDNS1123(appCh.Metadata.Name)
+
 		if err := appCh.Validate(); err != nil {
 			ll.Error(err, "failed to validate application chart for staging registry")
 			err = fmt.Errorf("failed to validate application chart for staging registry : %w", err)
@@ -210,7 +212,7 @@ func (r *ApplicationGroupReconciler) reconcileApplications(l logr.Logger, appGro
 		}
 
 		// Replace existing chart with modified chart
-		path := stagingDir + "/" + application.Spec.Chart.Name + "-" + appCh.Metadata.Version + ".tgz"
+		path := stagingDir + "/" + pkg.ConvertToDNS1123(application.Spec.Chart.Name) + "-" + appCh.Metadata.Version + ".tgz"
 		err = r.RegistryClient.PushChart(ll, r.StagingRepoName, path, appCh)
 		defer func() {
 			if r.CleanupDownloadedCharts {

examples/simple/bookinfo.yaml

@@ -3,6 +3,7 @@ kind: ApplicationGroup
 metadata:
   name: bookinfo 
 spec:
+  interval: 1m
   applications:
     - name: ambassador
       dependencies: []
@@ -21,13 +22,14 @@ spec:
           #   name: <secret-name>
           #   namespace: <secret-namespace>
         release:
-          timeout: 10m
+          interval: 1m
           targetNamespace: ambassador 
           values:
             service:
               type: ClusterIP
     - name: bookinfo 
       dependencies: [ambassador]
+      order: last 
       spec:
         chart:
           url: "https://nitishm.github.io/charts"
@@ -43,6 +45,7 @@ spec:
         - name: details
           dependencies: []
         release:
+          interval: 1m
           targetNamespace: bookinfo 
           values:
             productpage:

pkg/workflow/argo.go

@@ -432,7 +432,7 @@ func (a *argo) generateAppDAGTemplates(ctx context.Context, g *v1alpha1.Applicat
 				Spec: fluxhelmv2beta1.HelmReleaseSpec{
 					Chart: fluxhelmv2beta1.HelmChartTemplate{
 						Spec: fluxhelmv2beta1.HelmChartTemplateSpec{
-							Chart:   app.Spec.Chart.Name,
+							Chart:   pkg.ConvertToDNS1123(app.Spec.Chart.Name),
 							Version: app.Spec.Chart.Version,
 							SourceRef: fluxhelmv2beta1.CrossNamespaceObjectReference{
 								Kind:      "HelmRepository",
@@ -543,7 +543,15 @@ func (a *argo) generateSubchartAndAppDAGTasks(ctx context.Context, g *v1alpha1.A
 					},
 				},
 			},
-			Dependencies: convertSliceToDNS1123(sc.Dependencies),
+			Dependencies: func() (out []string) {
+				out = convertSliceToDNS1123(sc.Dependencies)
+				// If parent chart must be deployed first then add it
+				// as a dependency for every subchart
+				if app.Order == v1alpha1.First {
+					out = append(out, pkg.ConvertToDNS1123(app.Name))
+				}
+				return out
+			}(),
 		}
 
 		tasks = append(tasks, task)
@@ -561,7 +569,7 @@ func (a *argo) generateSubchartAndAppDAGTasks(ctx context.Context, g *v1alpha1.A
 		Spec: fluxhelmv2beta1.HelmReleaseSpec{
 			Chart: fluxhelmv2beta1.HelmChartTemplate{
 				Spec: fluxhelmv2beta1.HelmChartTemplateSpec{
-					Chart:   app.Spec.Chart.Name,
+					Chart:   pkg.ConvertToDNS1123(app.Spec.Chart.Name),
 					Version: app.Spec.Chart.Version,
 					SourceRef: fluxhelmv2beta1.CrossNamespaceObjectReference{
 						Kind:      "HelmRepository",
@@ -630,12 +638,16 @@ func (a *argo) generateSubchartAndAppDAGTasks(ctx context.Context, g *v1alpha1.A
 			},
 		},
 		Dependencies: func() (out []string) {
-			for _, t := range tasks {
-				out = append(out, pkg.ConvertToDNS1123(t.Name))
+			if app.Order == v1alpha1.Last {
+				for _, t := range tasks {
+					out = append(out, pkg.ConvertToDNS1123(t.Name))
+				}
+				return
 			}
-			return out
+			return
 		}(),
 	}
+
 	tasks = append(tasks, task)
 
 	return tasks, nil