Merge branch 'master' into godiomaticity

2020-01-20 11:24:28 -08:00
parent 79532e7635 c4b11795e3
commit fcddc6e077
6 changed files with 33 additions and 6 deletions
--- a/internal/run/upgrade_test.go
+++ b/internal/run/upgrade_test.go
@@ -136,6 +136,7 @@ func (suite *UpgradeTestSuite) TestPrepareWithUpgradeFlags() {
 		Force:         true,
 		AtomicUpgrade: true,
 		CleanupOnFail: true,
+		RepoCAFile:    "local_ca.cert",
 	}
 	u := NewUpgrade(cfg)

@@ -154,6 +155,7 @@ func (suite *UpgradeTestSuite) TestPrepareWithUpgradeFlags() {
 			"--set-string", "height=5ft10in",
 			"--values", "/usr/local/stats",
 			"--values", "/usr/local/grades",
+			"--ca-file", "local_ca.cert",
 			"maroon_5_memories", "hot_ac"}, args)

 		return suite.mockCmd