worked on Controller

Author: rhuss

advanced/Controller/README.adoc

@@ -41,8 +41,7 @@ To create this deployment in the current namespace, call:
 
 [source,bash]
 ----
-# Create the controller Deployment
-kubectl create -f config-watcher-controller.yml
+kubectl apply -f https://k8spatterns.io/Controller/config-watcher-controller.yml
 ----
 
 You might want to have a look at the descriptor file; it contains some useful comments along the way and also the security setup to allow the controller to watch resources and to restart `Pods`.
@@ -57,45 +56,52 @@ Before we deploy this app, we should tail on the log of our controller (e.g. `ku
 
 [source,bash]
 ----
-controller_pod=$(kubectl get pod -o name | grep config-watcher-controller | sed -e "s/^pods\///")
-kubectl logs -f $controller_pod config-watcher
+kubectl logs -f $(kubectl get pods -l role=controller -o name) config-watcher
 ----
 
 Then create the web application itself:
 
 [source,bash]
 ----
-# Create a sample web application with an 'expose' annotation:
-kubectl create -f web-app.yml
+kubectl apply -f https://k8spatterns.io/Controller/web-app.yml
 ----
 
 If you look into this descriptor, you will find a `Deployment` using our dumb HTTP server which references the content environment variable via a `ConfigMap`.
 The `ConfigMap` itself is annotated with a pod selector `k8spatterns.io/podDeleteSelector: "app=webapp"` which directly select the webapp `Pod`.
 
 This resource file also includes the definition of a Service and an Ingress object so that we can access the server from the outside.
 
+Before accessing the web-app we need to path the Ingress object to point to our minikube installation:
+
+[source, bash]
+----
+kubectl patch ingress webapp --type=json \
+   -p "[{op: replace, \
+         path: /spec/rules/0/host, \
+         value: webapp.$(minikube ip).nip.io}]"
+----
+
+NOTE: `nip.io` is a nice DNS reflector service, that as result of a DNS lookup just returns the IP address that is added before as subdomain just before the `.nip.io` part.
 
 You can access our web app directly
 
 [source,bash]
 ----
-# Access webapp via the included Ingress obect
 curl -sk https://webapp.$(minikube ip).nip.io
 ----
 
 Now change the content of `ConfigMap` and watch the log of your controller:
 
 [source,bash]
 ----
-# Patch config-map to update the web content
-kubectl patch configmap webapp-config -p '{"data":{"message":"Take this update!"}}'
+kubectl patch configmap webapp-config \
+    -p '{"data":{"message":"Take this update!"}}'
 ----
 
 and then finally call the URL again to check that the content has been updated to
 
 [source,bash]
 ----
-# Access webapp via the included Ingress obect
 curl -sk https://webapp.$(minikube ip).nip.io
 ----
 

advanced/Controller/config-watcher-controller.yml

@@ -25,6 +25,7 @@ metadata:
   labels:
     project: k8spatterns
     pattern: Controller
+    role: contoller
   name: config-watcher-controller
 spec:
   replicas: 1
@@ -37,6 +38,7 @@ spec:
         project: k8spatterns
         pattern: Controller
         app: config-watcher-controller
+        role: controller
     spec:
       # A serviceaccount is needed to watch events
       # and to allow for restarting pods. For now its

advanced/Controller/web-app.yml

@@ -56,18 +56,24 @@ spec:
     app: webapp
 ---
 # Ingress object for external access to the webserver.
-# If running on minikube, open "https://webapp.$(minikube ip).nip.io"
+# If running on minikube, # Replace the IP address with the output of `minikube ip` either directly
+# in this file or later with a `kubectl patch`.
+# Then open "https://webapp.$(minikube ip).nip.io"
 # in the browser and don't forget to enable ingress on minikube via
 # "minikube addons enable ingress"
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1
 kind: Ingress
 metadata:
   name: webapp
 spec:
   rules:
-  - http:
+  - host: webapp.127.0.0.1.nip.io
+    http:
       paths:
-      - backend:
-          serviceName: webapp
-          servicePort: 8080
-        path: "/"
+      - path: "/"
+        pathType: Prefix
+        backend:
+          service:
+            name: webapp
+            port:
+              number: 8080