Merge branch 'nitishm/enh/235/order-parent-chart' of https://github.c…

…om/nitishm/orkestra into nitishm/enh/235/order-parent-chart

Makefile

@@ -41,6 +41,7 @@ deploy: manifests
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=chart/orkestra/crds
 
 # Run go fmt against code
 fmt:

api/v1alpha1/appgroup_types.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/Azure/Orkestra/pkg/meta"
+	fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -67,40 +68,19 @@ type Release struct {
 
 	// Install holds the configuration for Helm install actions for this HelmRelease.
 	// +optional
-	Install *ReleaseInstallSpec `json:"install,omitempty"`
+	Install *fluxhelmv2beta1.Install `json:"install,omitempty"`
 
 	// Upgrade holds the configuration for Helm upgrade actions for this HelmRelease.
 	// +optional
-	Upgrade *ReleaseUpgradeSpec `json:"upgrade,omitempty"`
+	Upgrade *fluxhelmv2beta1.Upgrade `json:"upgrade,omitempty"`
 
 	// Rollback holds the configuration for Helm rollback actions for this HelmRelease.
 	// +optional
-	Rollback *ReleaseRollbackSpec `json:"rollback,omitempty"`
-}
-
-type ReleaseInstallSpec struct {
-	// DisableWait disables the waiting for resources to be ready after a Helm
-	// install has been performed.
-	// +optional
-	DisableWait bool `json:"disableWait,omitempty"`
-}
-
-type ReleaseUpgradeSpec struct {
-	// DisableWait disables the waiting for resources to be ready after a Helm
-	// upgrade has been performed.
-	// +optional
-	DisableWait bool `json:"disableWait,omitempty"`
-
-	// Force forces resource updates through a replacement strategy.
-	// +optional
-	Force bool `json:"force,omitempty"`
-}
+	Rollback *fluxhelmv2beta1.Rollback `json:"rollback,omitempty"`
 
-type ReleaseRollbackSpec struct {
-	// DisableWait disables the waiting for resources to be ready after a Helm
-	// rollback has been performed.
+	// Rollback holds the configuration for Helm uninstall actions for this HelmRelease.
 	// +optional
-	DisableWait bool `json:"disableWait,omitempty"`
+	Uninstall *fluxhelmv2beta1.Uninstall `json:"uninstall,omitempty"`
 }
 
 type ChartRef struct {

chart/orkestra/Chart.lock

@@ -5,11 +5,8 @@ dependencies:
 - name: argo
   repository: https://argoproj.github.io/argo-helm
   version: 0.16.8
-- name: helm-operator
-  repository: https://charts.fluxcd.io
-  version: 1.2.0
 - name: helm-controller
   repository: https://nitishm.github.io/charts
-  version: 0.1.0
-digest: sha256:dbaa6bb947e68c751aeb07f569cc1b18761922a9dc209b8189980ed36735c00d
-generated: "2021-04-22T10:12:19.315706-07:00"
+  version: 0.1.1
+digest: sha256:7f2f2e1f5efdec11d929472f4779a4ea014355570cf2294d6958b65765463cbb
+generated: "2021-05-14T12:59:31.637787-07:00"

chart/orkestra/Chart.yaml

@@ -26,7 +26,7 @@ dependencies:
   repository: "https://argoproj.github.io/argo-helm"
 - name: helm-controller
   condition: helm-controller.enabled
-  version: "0.1.0"
+  version: "0.1.1"
   repository: "https://nitishm.github.io/charts"
 
 keywords: