Move Comments

cmd/helm/install.go

@@ -211,10 +211,6 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 
 	// Only check dependencies if there are any
 	if req := chartRequested.Metadata.Dependencies; req != nil {
-		// If CheckDependencies returns an error, we have unfulfilled dependencies.
-		// As of Helm 2.4.0, this is treated as a stopping condition:
-		// https://github.com/helm/helm/issues/2209
-		// Update all dependencies if DependencyUpdate is true
 		if client.DependencyUpdate {
 			man := &downloader.Manager{
 				Out:              out,
@@ -239,7 +235,10 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 
 		}
 
-		// If not all dependencies are locally fail
+		// If CheckDependencies returns an error, we have unfulfilled dependencies.
+		// As of Helm 2.4.0, this is treated as a stopping condition:
+		// https://github.com/helm/helm/issues/2209
+		// Update all dependencies if DependencyUpdate is true
 		if err := action.CheckDependencies(chartRequested, req); err != nil {
 			return nil, err
 		}

cmd/helm/install_test.go

@@ -111,7 +111,7 @@ func TestInstall(t *testing.T) {
 		{
 			name: "install with verification, valid",
 			cmd:  "install signtest testdata/testcharts/signtest-0.1.0.tgz --verify --keyring testdata/helm-test-key.pub",
-		},
+		}, 
 		// Install, chart with missing dependencies in /charts
 		{
 			name:      "install chart with missing dependencies",
@@ -120,7 +120,7 @@ func TestInstall(t *testing.T) {
 		},
 		// Install chart with update-dependency
 		{
-			name:   "install chart with missing dependencies",
+			name:   "install chart with missing dependencies with update",
 			cmd:    "install --dependency-update updeps testdata/testcharts/chart-with-subchart-update",
 			golden: "output/chart-with-subchart-update.txt",
 		},

cmd/helm/upgrade.go

@@ -171,7 +171,10 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 					}
 				}
 
-				// If not all dependencies are locally fail
+				// If CheckDependencies returns an error, we have unfulfilled dependencies.
+				// As of Helm 2.4.0, this is treated as a stopping condition:
+				// https://github.com/helm/helm/issues/2209
+				// Update all dependencies if DependencyUpdate is true
 				if err := action.CheckDependencies(ch, req); err != nil {
 					return err
 				}