updated w/ debug base image and also removed trace from readiness checks

Author: saturnism

examples-bootiful-gcp/helloworld-ui/src/main/java/com/example/guestbook/HelloworldUiController.java

@@ -41,7 +41,6 @@ public HelloworldUiController(HelloworldService helloworldService, GuestbookServ
 
   @GetMapping("/")
   public String index(HttpSession session, Model model) {
-  	log.info("starting index");
     if (model.containsAttribute("name")) {
       String name = (String) model.asMap().get("name");
       Map<String, String> greeting = helloworldService.greeting(name);

examples-bootiful-gcp/kubernetes/guestbook-deployment.yaml

@@ -42,10 +42,18 @@ spec:
       containers:
       - name: guestbook-service
         image: gcr.io/wise-coyote-827/bootiful-guestbook-service:latest
-        readinessProbe:
+        livenessProbe:
+          initialDelaySeconds: 30
           httpGet:
             path: /actuator/health
             port: 8080
+        readinessProbe:
+          httpGet:
+            path: /api
+            port: 8080
+            httpHeaders:
+            - name: x-b3-sampled
+              value: "0"
         resources:
           requests:
             cpu: 0.5

examples-bootiful-gcp/kubernetes/guestbook-service.yaml

@@ -25,6 +25,7 @@ spec:
   ports:
     - port: 8080
       targetPort: 8080
+      name: http
   selector:
     app: guestbook-service
     serving: "true"

examples-bootiful-gcp/kubernetes/helloworld-deployment.yaml

@@ -41,10 +41,18 @@ spec:
       containers:
       - name: helloworld-service
         image: gcr.io/wise-coyote-827/bootiful-helloworld-service:latest
-        readinessProbe:
+        livenessProbe:
+          initialDelaySeconds: 30
           httpGet:
             path: /actuator/health
             port: 8080
+        readinessProbe:
+          httpGet:
+            path: /hello/test
+            port: 8080
+            httpHeaders:
+            - name: x-b3-sampled
+              value: "0"
         resources:
           requests:
             cpu: 0.5

examples-bootiful-gcp/kubernetes/helloworld-service.yaml

@@ -25,6 +25,7 @@ spec:
   ports:
     - port: 8080
       targetPort: 8080
+      name: http
   selector:
     app: helloworld-service
     serving: "true"

examples-bootiful-gcp/kubernetes/mysql-service.yaml

@@ -9,6 +9,7 @@ spec:
   ports:
     # the port that this service should serve on
     - port: 3306
+      name: mysql
   # label keys and values that must match in order to receive traffic for this service
   selector: 
     app: mysql

examples-bootiful-gcp/kubernetes/redis-service.yaml

@@ -25,5 +25,6 @@ spec:
   ports:
     - port: 6379
       targetPort: 6379
+      name: redis
   selector:
     app: redis

examples-bootiful-gcp/kubernetes/ui-deployment.yaml

@@ -49,10 +49,18 @@ spec:
           value: http://guestbook-service:8080
         - name: SPRING_REDIS_HOST
           value: redis
-        readinessProbe:
+        livenessProbe:
+          initialDelaySeconds: 30
           httpGet:
             path: /actuator/health
             port: 8080
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 8080
+            httpHeaders:
+              - name: x-b3-sampled
+                value: "0"
         resources:
           requests:
             cpu: 0.5

examples-bootiful-gcp/pom.xml

@@ -44,6 +44,9 @@
 					<artifactId>jib-maven-plugin</artifactId>
 					<version>0.10.1</version>
 					<configuration>
+						<from>
+                            <image>gcr.io/distroless/java:debug</image>
+						</from>
 						<to>
 							<image>${docker.image.prefix}/bootiful-${project.artifactId}</image>
 						</to>