Merge pull request #215 from robertabbott/abbott/fixHttpInKVChecks

I had http and https backwards

Author: robertabbott

integration/single-node-slug-deploy/check.go

@@ -138,6 +138,7 @@ func generatePreparerPod(workdir string) (string, error) {
 	}
 	manifest.RunAs = "root"
 	manifest.StatusPort = preparerStatusPort
+	manifest.StatusHTTP = true
 
 	manifestBytes, err := manifest.Marshal()
 	if err != nil {
@@ -300,7 +301,6 @@ func postHelloManifest(dir string) error {
 	manifest := &pods.Manifest{}
 	manifest.Id = "hello"
 	manifest.StatusPort = 43770
-	manifest.StatusHTTP = true
 	stanza := pods.LaunchableStanza{
 		LaunchableId:   "hello",
 		LaunchableType: "hoist",

pkg/watch/health.go

@@ -166,9 +166,9 @@ func updatePods(store kp.Store,
 				Client: client,
 			}
 			if man.Manifest.StatusHTTP {
-				sc.URI = fmt.Sprintf("https://%s:%d/_status", node, man.Manifest.StatusPort)
-			} else {
 				sc.URI = fmt.Sprintf("http://%s:%d/_status", node, man.Manifest.StatusPort)
+			} else {
+				sc.URI = fmt.Sprintf("https://%s:%d/_status", node, man.Manifest.StatusPort)
 			}
 			newPod := PodWatch{
 				manifest:      man.Manifest,