Blog part two updates

Author: zvonegit

README.md

@@ -12,3 +12,4 @@ Both microservices are implemented following cloud-native concepts and functiona
 This example was used in the blog [Running KumuluzEE microservices on Kubernetes](https://blog.kumuluz.com/kumuluzee/kubernetes/2017/12/03/kumuluzee-microservices-on-kubernetes_part1).
 
 [Blog Part 1 artifacts](https://github.com/zvonegit/kumuluzee-kubernetes/releases/tag/v1.0.0)
+[Blog Part 2 artifacts](https://github.com/zvonegit/kumuluzee-kubernetes/releases/tag/v2.0.0)

customers/customers-api/src/main/resources/config.yaml

@@ -59,7 +59,7 @@ kumuluzee:
   health:
     checks:
       data-source-health-check:
-        connection-url: jdbc:postgresql://192.168.99.100:5432/customer
+        connection-url: jdbc:postgresql://postgres-customers:5432/customer
         username: dbuser
         password: postgres
       disk-space-health-check:

kubernetes/customer-cm.yaml

@@ -7,6 +7,6 @@ data:
   KUMULUZEE_DISCOVERY_CLUSTER: private-coreos
   KUMULUZEE_DISCOVERY_ETCD_HOSTS: http://etcd:2379
   KUMULUZEE_CONFIG_ETCD_HOSTS: http://etcd:2379
-  KUMULUZEE_DATASOURCES0_CONNECTIONURL: jdbc:postgresql://postgres-customers:5432/customer
+  KUMULUZEE_DATASOURCES0_CONNECTIONURL: jdbc:postgresql://postgres-customers:5433/customer
   KUMULUZEE_SERVER_BASEURL: http://192.168.29.246:32600
-  KUMULUZEE_HEALTH_CHECKS_DATASOURCEHEALTHCHECK_CONNECTIONURL: jdbc:postgresql://postgres-customers:5432/customer
+  KUMULUZEE_HEALTH_CHECKS_DATASOURCEHEALTHCHECK_CONNECTIONURL: jdbc:postgresql://postgres-customers:5433/customer

kubernetes/customer-deployment.yaml

@@ -16,6 +16,12 @@ spec:
         envFrom:
           - configMapRef:
               name: kubernetes-customer-config
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 40
+          periodSeconds: 5
         ports:
         - containerPort: 8080
           name: server

kubernetes/customer-hpa.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kubernetes-customer-config
+  namespace: kumuluzee-blog
+data:
+  KUMULUZEE_DISCOVERY_CLUSTER: private-coreos
+  KUMULUZEE_DISCOVERY_ETCD_HOSTS: http://etcd:2379
+  KUMULUZEE_CONFIG_ETCD_HOSTS: http://etcd:2379
+  KUMULUZEE_DATASOURCES0_CONNECTIONURL: jdbc:postgresql://postgres-customers:5433/customer
+  KUMULUZEE_SERVER_BASEURL: http://192.168.29.246:32600
+  KUMULUZEE_HEALTH_CHECKS_DATASOURCEHEALTHCHECK_CONNECTIONURL: jdbc:postgresql://postgres-customers:5433/customer

kubernetes/order-deployment.yaml

@@ -16,6 +16,15 @@ spec:
         envFrom:
           - configMapRef:
               name: kubernetes-order-config
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8081
+          initialDelaySeconds: 30
+          periodSeconds: 5
+        resources:
+          limits:
+            cpu: 1
         ports:
         - containerPort: 8081
           name: server

kubernetes/order-hpa.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kubernetes-order-config
+  namespace: kumuluzee-blog
+data:
+  KUMULUZEE_DISCOVERY_CLUSTER: private-coreos
+  KUMULUZEE_DISCOVERY_ETCD_HOSTS: http://etcd:2379
+  KUMULUZEE_CONFIG_ETCD_HOSTS: http://etcd:2379
+  KUMULUZEE_DATASOURCES0_CONNECTIONURL: jdbc:postgresql://postgres-orders:5432/order
+  KUMULUZEE_SERVER_BASEURL: http://192.168.29.246:32583
+  KUMULUZEE_HEALTH_CHECKS_DATASOURCEHEALTHCHECK_CONNECTIONURL: jdbc:postgresql://postgres-orders:5432/order

kubernetes/postgres-customers.yaml

@@ -34,7 +34,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: 5432
+  - port: 5433
     protocol: TCP
     targetPort: 5432
   selector:

orders/orders-api/src/main/resources/config.yaml

@@ -9,7 +9,7 @@ kumuluzee:
       port: 8081
   datasources:
     - jndi-name: jdbc/OrdersDS
-      connection-url: jdbc:postgresql://192.168.99.100:5433/order
+      connection-url: jdbc:postgresql://postgres-orders:5432/order
       username: dbuser
       password: postgres
       max-pool-size: 20
@@ -24,7 +24,7 @@ kumuluzee:
   health:
       checks:
         data-source-health-check:
-          connection-url: jdbc:postgresql://192.168.99.100:5433/order
+          connection-url: jdbc:postgresql://postgres-orders:5432/order
           username: dbuser
           password: postgres
         disk-space-health-check:

pom.xml

@@ -19,7 +19,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <kumuluzee.version>2.4.1</kumuluzee.version>
+        <kumuluzee.version>2.5.0-SNAPSHOT</kumuluzee.version>
         <kumuluzee-rest.version>1.1.0</kumuluzee-rest.version>
         <kumuluzee-logs.version>1.3.0</kumuluzee-logs.version>
         <kumuluzee-cors.version>1.0.2</kumuluzee-cors.version>