Merge pull request #157 from vfarcic/my-pr

My PR
vfarcic · Dec 1, 2019 · dfb248a · dfb248a
2 parents 2524f1a + 72c2e78
commit dfb248a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/charts/go-demo-6/values.yaml b/charts/go-demo-6/values.yaml
@@ -43,3 +43,5 @@ go-demo-6-db:
   replicaSet:
     enabled: true
 
+
+  usePassword: false
diff --git a/charts/preview/values.yaml b/charts/preview/values.yaml
@@ -21,3 +21,13 @@ preview:
     tag:
     pullPolicy: IfNotPresent
   probePath: /demo/hello?health=true
+
+
+db:
+  enabled: false
+
+preview-db:
+  persistence:
+    enabled: false
+
+  usePassword: false
diff --git a/main.go b/main.go
@@ -92,7 +92,7 @@ func HelloServer(w http.ResponseWriter, req *http.Request) {
 		delayNum, _ := strconv.Atoi(delay)
 		sleep(time.Duration(delayNum) * time.Millisecond)
 	}
-	io.WriteString(w, "hello, devpod with tests!\n")
+	io.WriteString(w, "hello, PR!\n")
 }
 
 func RandomErrorServer(w http.ResponseWriter, req *http.Request) {

diff --git a/main_test.go b/main_test.go
@@ -88,7 +88,7 @@ func (s *MainTestSuite) Test_HelloServer_WritesHelloWorld() {
 
 	HelloServer(w, req)
 
-	w.AssertCalled(s.T(), "Write", []byte("hello, devpod with tests!\n"))
+	w.AssertCalled(s.T(), "Write", []byte("hello, PR!\n"))
 }
 
 func (s *MainTestSuite) Test_HelloServer_Waits_WhenDelayIsPresent() {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,3 +43,5 @@ go-demo-6-db:
		replicaSet:
		enabled: true


		usePassword: false