Exercise for readiness and liveness probes added. (#3)

* Exercise for readiness and liveness probes added.
* Bugfix in reading JWT encryption and signing keys from ENV variable
* Microgateway updated to 3.0.1
* check ready state is reached in verification

Author: dieti80

.scripts/verify.sh

@@ -23,6 +23,15 @@ else
     exit 1
 fi
 
+mgw_ready_count="$(kubectl get pod -l app=microgateway  | grep 1/1 | wc -l)"
+
+if [[ $mgw_ready_count -eq 1 ]]; then
+    echo "OK: Microgateway is ready"
+else
+    echo "NOK: Microgateway is not running - number of pods ready: $mgw_ready_count"
+    exit 1
+fi
+
 if [[ -f "${TUTORIAL_DIR}/../.scripts/verify.sh" ]]; then
     ${TUTORIAL_DIR}/../.scripts/verify.sh
 fi

.templates/microgateway/deployment.yaml

@@ -22,7 +22,7 @@ spec:
         - name: dockerregcred
       initContainers:
         - name: configbuilder
-          image: docker.io/ergon/airlock-microgateway-configbuilder:3.0.0
+          image: docker.io/ergon/airlock-microgateway-configbuilder:3.0.1
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config
@@ -44,7 +44,7 @@ spec:
               value: "Europe/Zurich"
       containers:
         - name: microgateway
-          image: docker.io/ergon/airlock-microgateway:3.0.0
+          image: docker.io/ergon/airlock-microgateway:3.0.1
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config-files

.templates/wordpress/config/install-simple-jwt-login.sh

@@ -3,7 +3,7 @@ wp plugin install /var/tmp/plugins/simple-jwt-login/simple-jwt-login.zip --activ
 wp option update simple_jwt_login_settings "
   {
     \"route_namespace\":\"simple-jwt-login\/v1\/\",
-    \"decryption_key\":\"${JWT_DECRYPTION_KEY2:-c3VwZXJsb25ndGV4dHRoYXRpc3VzZWRmb3Jqd3R0b2tlbgo=}\",
+    \"decryption_key\":\"${JWT_DECRYPTION_KEY:-c3VwZXJsb25ndGV4dHRoYXRpc3VzZWRmb3Jqd3R0b2tlbgo=}\",
     \"jwt_algorithm\":\"HS512\",
     \"jwt_login_by\":0,
     \"jwt_login_by_parameter\":\"email\",
@@ -19,7 +19,7 @@ wp option update simple_jwt_login_settings "
     \"require_register_auth\":true,
     \"auth_codes\":[
         {
-          \"code\":\"${JWT_AUTH_CODE2:-superlongtextthatisusedforjwttoken}\",
+          \"code\":\"${JWT_AUTH_CODE:-superlongtextthatisusedforjwttoken}\",
           \"role\":\"\",
           \"expiration_date\":\"\"
         }

readiness-and-liveness-probes/exercise/kustomization.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+  - ../solution
+
+patchesStrategicMerge:
+  - patch-probes.yaml

readiness-and-liveness-probes/exercise/patch-probes.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: microgateway
+spec:
+  template:
+    spec:
+      containers:
+        - name: microgateway
+          readinessProbe:
+            httpGet:
+              port: 443
+          livenessProbe:
+            httpGet:
+              port: 443

readiness-and-liveness-probes/solution/config/config.yaml

@@ -0,0 +1,13 @@
+---
+apps:
+  - virtual_host:
+      name: echoserver
+      hostname: echoserver.virtinc.local
+    mappings:
+      - name: echoserver
+        backend:
+          name: echoserver
+          hosts:
+            - name: echoserver
+              protocol: http
+              port: 8080

readiness-and-liveness-probes/solution/kustomization.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+  - ../../.templates/ingress
+  - ../../.templates/microgateway
+  - ../../.templates/echoserver
+
+configMapGenerator:
+  - name: microgateway-config
+    behavior: replace
+    files:
+      - config/config.yaml