Merge pull request #56 from rusenask/develop

Develop
keel-hq · Jul 26, 2017 · d1658fd · d1658fd
2 parents 425c0cf + ae0c6fb
commit d1658fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/provider/helm/helm.go b/provider/helm/helm.go
@@ -29,6 +29,9 @@ type Manager interface {
 // ProviderName - helm provider name
 const ProviderName = "helm"
 
+// DefaultUpdateTimeout - update timeout in seconds
+const DefaultUpdateTimeout = 300
+
 // UpdatePlan - release update plan
 type UpdatePlan struct {
 	Namespace string
@@ -326,7 +329,7 @@ func updateHelmRelease(implementer Implementer, releaseName string, chart *hapi_
 		helm.UpgradeRecreate(false),
 		helm.UpgradeForce(true),
 		helm.UpgradeDisableHooks(false),
-		helm.UpgradeTimeout(30),
+		helm.UpgradeTimeout(DefaultUpdateTimeout),
 		helm.ResetValues(false),
 		helm.ReuseValues(true),
 		helm.UpgradeWait(true))

diff --git a/util/version/version_test.go b/util/version/version_test.go
@@ -258,6 +258,13 @@ func TestNewAvailable(t *testing.T) {
 			wantNewAvailable: false,
 			wantErr:          true,
 		},
+		{
+			name:             "staging",
+			args:             args{current: "1.1.1", tags: []string{"v1.2.1-staging.1"}},
+			wantNewVersion:   "1.2.1-staging.1",
+			wantNewAvailable: true,
+			wantErr:          false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {