Changes to leverage newer version of minikube

k8s/gateway-deployment.yaml

@@ -57,4 +57,4 @@ spec:
     targetPort: 8080
   selector:
     app: gateway
-  type: NodePort
+  type: LoadBalancer

k8s/ingress.yaml

@@ -1,26 +1,44 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: gateway-ingress
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
-  backend:
-    serviceName: default-http-backend
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: gateway
+      port:
+        number: 8080
   rules:
   - host: microservices-cluster.info
     http:
       paths:
       - path: /employee
         backend:
-          serviceName: employee
-          servicePort: 8080
+          service:
+            name: employee
+            port:
+              number: 8080
+        pathType: Prefix
       - path: /department
         backend:
-          serviceName: department
-          servicePort: 8080
+          service:
+            name: department
+            port:
+              number: 8080      
+        pathType: Prefix
       - path: /organization
         backend:
-          serviceName: organization
-          servicePort: 8080
+           service:
+            name: organization
+            port:
+              number: 8080
+        pathType: Prefix
+      - path: /gateway
+        backend:
+          service:
+            name: gateway
+            port:
+              number: 8080
+        pathType: ImplementationSpecific

readme.md

@@ -4,7 +4,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 ### Java Microservices with Spring Boot and Spring Cloud Kubernetes
 
-This is repository accompanies my article for the `Tanzu Development Center` - [Microservices with Spring Cloud Kubernetes Reference Architecture](https://tanzu.vmware.com/developer/guides/preparing-and-deploying-kubernetes-workloads/)
+This is repository accompanies my article for the `Tanzu Development Center` - [Microservices with Spring Cloud Kubernetes Reference Architecture](https://tanzu.vmware.com/developer/guides/app-enhancements-spring-k8s//)
 
 This Reference Architecture demonstrates design, development, and deployment of
 [Spring Boot](https://spring.io/projects/spring-boot) microservices on

scripts/gateway-open.sh

@@ -4,6 +4,6 @@ set -x
 
 . ./set-env.sh
 
-open $(minikube service gateway --url -n=$NAMESPACE_GATEWAY)/swagger-ui.html
+#xdg-open $(minikube service gateway --url -n=$NAMESPACE_GATEWAY)/swagger-ui.html
 
-#kubectl get pod -n $NAMESPACE_GATEWAY -l 'app=gateway' --no-headers | awk '{print $1}' | xargs -I {} sh -c "echo {}; open $(minikube service gateway --url -n gateway)/swagger-ui.html"
+kubectl get pod -n $NAMESPACE_GATEWAY -l 'app=gateway' --no-headers | awk '{print $1}' | xargs -I {} sh -c "echo {}; xdg-open $(minikube service gateway --url -n gateway)/swagger-ui.html"

scripts/install-app.sh

@@ -6,7 +6,7 @@ set -x
 . ./set-env.sh
 
 
-minikube addons enable ingress
+#minikube addons enable ingress
 
 cd ../k8s
 
@@ -30,5 +30,6 @@ minikube profile $CLUSTER1_NAME
 CLUSTER1_IP=$(minikube ip)
 echo $CLUSTER1_IP
 sudo sed -i.bak 's/.*microservices-cluster.info/'"$CLUSTER1_IP"' microservices-cluster.info/' /etc/hosts && sudo rm /etc/hosts.bak
+echo "$(minikube ip) microservices-cluster.info" | sudo tee -a /etc/hosts
 
 cd ../scripts

scripts/start-cluster.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+  #!/bin/bash
 
 set -e
 set -x
@@ -13,4 +13,4 @@ minikube addons enable metrics-server
 eval $(minikube docker-env)
 
 kubectl config use-context $CLUSTER1_NAME
-minikube -p $CLUSTER1_NAME dashboard
+minikube -p $CLUSTER1_NAME tunnel dashboard