Modifying qa and prod deployments

Merge with master

Author: twogg-git

k8s/k8s.go

@@ -6,11 +6,6 @@ import (
 	"net/http"
 )
 
-var (
-	version  = "1.2-yaml"
-	bannedIp = "0.0.0.0"
-)
-
 func getServerIP() string {
 	conn, err := net.Dial("udp", "8.8.8.8:80")
 	if err != nil {
@@ -25,7 +20,7 @@ func playHome(w http.ResponseWriter, r *http.Request) {
 		<img src="https://raw.githubusercontent.com/twogg-git/k8s-workshop/master/src/1.2.png">
 		<h1 style="color:green">Playing with Kubernetes</h1>
 		<h2 style="color:blue">Your server IP:` + getServerIP() + `</h2>
-		<h3 style="color:blue">Version: twogghub/k8s-workshop:` + version + `</h3>	
+		<h3 style="color:blue">Version: twogghub/k8s-workshop:1.2-yaml</h3>	
 		</center></body></html>`
 	fmt.Fprintf(w, html)
 }

src/1.3.png src/1.3.0.pngsrc/1.3.png renamed to src/1.3.0.png

@@ -0,0 +1,35 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: k8sdp
+spec:
+  replicas: 3
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+  selector:
+    matchLabels:
+      env: k8sdp
+  template:  
+    metadata:  
+      labels:  
+        env: k8sdp
+      annotations:
+        kubernetes.io/change-cause: "HttpGet /health return error!" 
+    spec:
+      containers:
+        - image: twogghub/k8s-workshop:1.3-liveness
+          name: k8sdp
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 5
+            timeoutSeconds: 1
+            periodSeconds: 2
+            failureThreshold: 1
+          ports:
+          - name: http
+            containerPort: 8080

src/1.3.1.png

@@ -0,0 +1,22 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: k8sprod
+spec:
+  replicas: 2
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+  template:  
+    metadata:  
+      labels:  
+        env: prod
+    spec:
+      containers:
+        - image: twogghub/k8s-workshop:1.2-yaml
+          name: k8sprod
+          ports:
+          - name: http
+            containerPort: 8080

src/1.3.2.png

@@ -0,0 +1,19 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: k8sqa
+spec:
+  replicas: 2
+  strategy:
+    type: Recreate
+  template:  
+    metadata:  
+      labels:  
+        env: qa
+    spec:
+      containers:
+        - image: twogghub/k8s-workshop:1.2-qaonly
+          name: k8sqa
+          ports:
+          - name: http
+            containerPort: 9090