Modifying html output and periodSeconds for liveness probe

twogg-git · twogg-git · commit 5fbdac68dc63 · 2018-09-30T14:11:50.000-05:00
diff --git a/k8s/k8s.go b/k8s/k8s.go
@@ -19,45 +19,48 @@ func getServerIP() string {
 	return conn.LocalAddr().(*net.UDPAddr).IP.String()
 }
 
-func getHTML(image string) string {
-	message := "TechSupport, Mr. Cat speaking, how can I help you?"
+func getHTML(status string) string {
+	message := "DevOps, Mr. Cat speaking, how can I help you?"
+	image := "1.3.0"
 	color := "orange"
-	if image == "1.3.1" {
+	if status == "alive" {
 		message = "High five budy, I'm healthy as ever!"
+		image = "1.3.1"
 		color = "green"
 	}
-	if image == "1.3.2" {
-		message = "I don't want to die Mr. Stark ( x_x ) ..."
+	if status == "dead" {
+		message = "I don't want to die Mr. Stark..."
+		image = "1.3.2"
 		color = "red"
 	}
 	return `<!DOCTYPE html><html><body><center>
-			<img src="https://raw.githubusercontent.com/twogg-git/k8s-workshop/master/src/` + image + `.png">
-			<h1 style="color:` + color + `">` + message + `</h3>	
-			<h2 style="color:green">Playing with Kubernetes</h1>
-			<h2 style="color:blue">Server IP ` + getServerIP() + `</h2>
-			<h3 style="color:blue">Version twogghub/k8s-workshop:1.3-liveness</h3>	
-			</center></body></html>`
+	<img src="https://raw.githubusercontent.com/twogg-git/k8s-workshop/1.3-liveness/src/` + image + `.png">
+	<h1 style="color:` + color + `">` + message + `</h3>	
+	<h2 style="color:green">Playing with Kubernetes</h1>
+	<h2 style="color:blue">Server IP ` + getServerIP() + `</h2>
+	<h3 style="color:blue">Version twogghub/k8s-workshop:1.3-liveness</h3>	
+	</center></body></html>`
 }
 
 func playHome(w http.ResponseWriter, r *http.Request) {
-	if getServerIP() == bannedIp {
-		fmt.Fprintf(w, getHTML("1.3.2"))
+	if bannedIp == getServerIP() {
+		fmt.Fprintf(w, getHTML("dead"))
 	} else {
-		fmt.Fprintf(w, getHTML("1.3.0"))
+		fmt.Fprintf(w, getHTML("home"))
 	}
 }
 
 func playHealth(w http.ResponseWriter, r *http.Request) {
 	if getServerIP() == bannedIp {
 		w.WriteHeader(http.StatusServiceUnavailable)
 	} else {
-		fmt.Fprintf(w, getHTML("1.3.1"))
+		fmt.Fprintf(w, getHTML("alive"))
 	}
 }
 
 func playKillMe(w http.ResponseWriter, r *http.Request) {
 	bannedIp = getServerIP()
-	fmt.Fprintf(w, getHTML("1.3.2"))
+	fmt.Fprintf(w, getHTML("dead"))
 }
 
 func main() {
diff --git a/yamls/k8sdp.yaml b/yamls/k8sdp.yaml
@@ -28,7 +28,7 @@ spec:
               port: 8080
             initialDelaySeconds: 5
             timeoutSeconds: 1
-            periodSeconds: 5
+            periodSeconds: 2
             failureThreshold: 1
           ports:
           - name: http
