Merge pull request #1712 from yinzara/feature/skip-dep-up

add "skipDepUpdate" config parameter to HelmRelease
fluxcd · Feb 8, 2019 · 09757f9 · 09757f9
2 parents 116e2c9 + a57b3a4
commit 09757f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/deploy-helm/flux-helm-release-crd.yaml b/deploy-helm/flux-helm-release-crd.yaml
@@ -31,6 +31,8 @@ spec:
               format: int64
             resetValues:
               type: boolean
+            skipDepUpdate:
+              type: boolean
             valueFileSecrets:
               type: array
               properties:

diff --git a/integrations/apis/flux.weave.works/v1beta1/types.go b/integrations/apis/flux.weave.works/v1beta1/types.go
@@ -75,6 +75,9 @@ type HelmReleaseSpec struct {
 	// Reset values on helm upgrade
 	// +optional
 	ResetValues bool `json:"resetValues,omitempty"`
+	// Do not run 'dep' update (assume requirements.yaml is already fulfilled)
+	// +optional
+	SkipDepUpdate bool `json:"skipDepUpdate,omitempty"`
 }
 
 // GetTimeout returns the install or upgrade timeout (defaults to 300s)

diff --git a/integrations/helm/chartsync/chartsync.go b/integrations/helm/chartsync/chartsync.go
@@ -327,7 +327,7 @@ func (chs *ChartChangeSync) reconcileReleaseDef(fhr fluxv1beta1.HelmRelease) {
 		chs.setCondition(&fhr, fluxv1beta1.HelmReleaseChartFetched, v1.ConditionTrue, ReasonCloned, "successfully cloned git repo")
 		chartPath = filepath.Join(chartClone.export.Dir(), chartSource.Path)
 
-		if chs.config.UpdateDeps {
+		if chs.config.UpdateDeps && !fhr.Spec.SkipDepUpdate {
 			if err := updateDependencies(chartPath, ""); err != nil {
 				chs.setCondition(&fhr, fluxv1beta1.HelmReleaseReleased, v1.ConditionFalse, ReasonDependencyFailed, err.Error())
 				chs.logger.Log("warning", "Failed to update chart dependencies", "namespace", fhr.Namespace, "name", fhr.Name, "error", err)