Kubernetes ConfigMaps, External Database Service & tools

arafkarsh · Jan 21, 2025 · 9d7946f · 9d7946f
1 parent ca2a629
commit 9d7946f
Show file tree

Hide file tree

Showing 18 changed files with 379 additions and 24 deletions.
diff --git a/compile b/compile
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # -------------------------------------------------------------------------------------------
 # @author: Araf Karsh Hamid
 # -------------------------------------------------------------------------------------------

diff --git a/config/application.properties b/config/application.properties
@@ -1,8 +1,8 @@
 # =======================================================================
 # MS-Vanilla Service Properties
 # =======================================================================
-build.number=211
-build.date=Tue Jan 21 10:05:58 IST 2025
+build.number=212
+build.date=Tue Jan 21 18:03:47 IST 2025
 # ------------------------------------------------------------------------
 # Spring Profile
 # ------------------------------------------------------------------------

diff --git a/getServiceName b/getServiceName
@@ -10,25 +10,25 @@ containerName=4
 param=$1
 if [ -z "$param" ]
 then
-	fgrep service.name= $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
+	grep '^service.name=' $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
 	exit
 fi
 if [ $param == $orgName ] 
 then
-	fgrep service.org= $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
+	grep '^service.org=' $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
 	exit
 elif [ $param == $serviceName ]
 then
-	fgrep service.name= $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
+	grep '^service.name=' $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
 	exit
 elif [ $param == $apiName ] 
 then
-	fgrep service.api.name= $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
+	grep '^service.api.name=' $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
 	exit
 elif [ $param == $containerName ] 
 then
-	fgrep service.container= $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
+	grep '^service.container=' $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
 	exit
 fi
-fgrep service.api.name= $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
+grep '^service.api.name=' $SRC_BASE/src/main/resources/app.props.tmpl |  cut -d "=" -f 2
 exit
diff --git a/src/docker/Input/application.properties b/src/docker/Input/application.properties
@@ -1,8 +1,8 @@
 # =======================================================================
 # MS-Vanilla Service Properties
 # =======================================================================
-build.number=211
-build.date=Tue Jan 21 10:05:58 IST 2025
+build.number=212
+build.date=Tue Jan 21 18:03:47 IST 2025
 # ------------------------------------------------------------------------
 # Spring Profile
 # ------------------------------------------------------------------------

diff --git a/src/kubernetes/Package/default/application.properties b/src/kubernetes/Package/default/application.properties
@@ -1,5 +1,5 @@
-build.number=211
-build.date=Tue Jan 21 10:05:58 IST 2025
+build.number=212
+build.date=Tue Jan 21 18:03:47 IST 2025
 spring.profiles.default=dev
 service.org=arafkarsh
 service.name=MS-Vanilla

diff --git a/src/kubernetes/Yamls/vanilla-configmap-active.yaml b/src/kubernetes/Yamls/vanilla-configmap-active.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vanilla-configmap-active
+data:
+  spring.profiles.active: prod
diff --git a/src/kubernetes/Yamls/vanilla-configmap-default.yaml b/src/kubernetes/Yamls/vanilla-configmap-default.yaml
@@ -17,7 +17,7 @@ data:
     service.license=Apache 2 License
     service.license.url=https://github.com/arafkarsh/ms-springboot-334-vanilla?tab=Apache-2.0-1-ov-file
     server.port=9334
-    server.version=0.3.4
+    server.version=3.4.0
     server.restart=false
     server.leak.test=3
     server.resources.url=${service.url}${service.api.path}

diff --git a/src/kubernetes/Yamls/vanilla-database-service.yaml b/src/kubernetes/Yamls/vanilla-database-service.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: database-service
+spec:
+  type: ExternalName
+  externalName: 192.168.5.1
diff --git a/src/kubernetes/Yamls/vanilla-deploy.yaml b/src/kubernetes/Yamls/vanilla-deploy.yaml
@@ -21,18 +21,28 @@ spec:
           # Only for testing purpose - use Always
           imagePullPolicy: Always
           args:
-            - "-APP_PROFILE=prod"
-            - "-SPRING_PROFILES_ACTIVE=prod"
-            - "-SPRING_DATASOURCE_URL=jdbc:postgresql://192.168.5.1:5433/ms_vanilla_334"
+            - "-APP_PROFILE=$(SPRING_PROFILES_ACTIVE)""
+            - "-SPRING_DATASOURCE_URL=jdbc:postgresql://database-service:5433/ms_vanilla_334"
           ports:
             - containerPort: 9334
               hostPort: 9334
+          volumeMounts:
+            - name: config-volume
+              mountPath: /config
+              readOnly: true
           env:
             - name: JASYPT_ENCRYPTOR_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: vanilla-secret
                   key: JASYPT_ENCRYPTOR
+            - name: SPRING_CONFIG_LOCATION
+              value: "file:/config/application.properties"
+            - name: SPRING_PROFILES_ACTIVE
+              valueFrom:
+                configMapKeyRef:
+                  name: vanilla-configmap-active # Shared ConfigMap for all environments
+                  key: spring.profiles.active
           livenessProbe:
             httpGet:
               path: /ms-vanilla/api/v1/service/live
@@ -47,4 +57,8 @@ spec:
               memory: 1536Mi
             requests:
               cpu: 1000m
-              memory: 1536Mi
+              memory: 1536Mi
+      volumes:
+        - name: config-volume
+          configMap:
+            name: vanilla-configmap-default
diff --git a/src/kubernetes/deploy b/src/kubernetes/deploy
@@ -0,0 +1,12 @@
+#!/bin/bash
+#---------------------------------------------------------------
+# Vanilla Microservice Kubernetes Utils
+# Araf Karsh Hamid, (c) Copyright 2025
+# License: Apache 2.0
+# Version 0.01
+#---------------------------------------------------------------
+
+source utils/colimaStatus
+
+echo "Deploy the App..."
+kubectl create -f Yamls/vanilla-deploy.yaml
diff --git a/src/kubernetes/describe b/src/kubernetes/describe
@@ -0,0 +1,12 @@
+#!/bin/bash
+#---------------------------------------------------------------
+# Vanilla Microservice Kubernetes Utils
+# Araf Karsh Hamid, (c) Copyright 2025
+# License: Apache 2.0
+# Version 0.01
+#---------------------------------------------------------------
+
+source utils/colimaStatus
+
+echo "Describe $1 and the component $2"
+kubectl describe $1 $2
diff --git a/src/kubernetes/events b/src/kubernetes/events
@@ -0,0 +1,12 @@
+#!/bin/bash
+#---------------------------------------------------------------
+# Vanilla Microservice Kubernetes Utils
+# Araf Karsh Hamid, (c) Copyright 2025
+# License: Apache 2.0
+# Version 0.01
+#---------------------------------------------------------------
+
+source utils/colimaStatus
+
+echo "Check Events"
+kubectl get events --sort-by='.metadata.creationTimestamp'
diff --git a/src/kubernetes/logs b/src/kubernetes/logs
@@ -8,5 +8,7 @@
 
 source utils/colimaStatus
 
-echo "Check the Logs of the Pod..."
-kubectl logs -f $1
+podName=`kubectl get pods | awk 'NR>1 {print $1}'`
+
+echo "Check the Logs of the Pod=$podName"
+kubectl logs -f $podName
diff --git a/src/kubernetes/restart b/src/kubernetes/restart
@@ -0,0 +1,12 @@
+#!/bin/bash
+#---------------------------------------------------------------
+# Vanilla Microservice Kubernetes Utils
+# Araf Karsh Hamid, (c) Copyright 2025
+# License: Apache 2.0
+# Version 0.01
+#---------------------------------------------------------------
+
+source utils/colimaStatus
+
+echo "Restart all the pods of Vanilla Deployment"
+kubectl rollout restart deployment vanilla-deployment
diff --git a/src/kubernetes/vanillaInstall b/src/kubernetes/vanillaInstall
@@ -8,8 +8,22 @@
 
 source utils/colimaStatus
 
+echo "---------------------------------------------------------------"
 echo "Deploy the Vanilla Service in Kubernetes cluster"
+echo "---------------------------------------------------------------"
+echo "1. Deploy the Vanilla Service Config/Secrets in Kubernetes cluster"
+kubectl create -f Yamls/vanilla-configmaps-active.yaml
+kubectl create -f Yamls/vanilla-configmaps-default.yaml
+kubectl create -f Yamls/vanilla-configmaps-dev.yaml
+kubectl create -f Yamls/vanilla-configmaps-staging.yaml
+kubectl create -f Yamls/vanilla-configmaps-prod.yaml
 kubectl create -f Yamls/vanilla-secret.yaml
+echo "---------------------------------------------------------------"
+echo "2. Deploy the External Database Service"
+kubectl create -f Yamls/vanilla-database-service.yaml
+echo "---------------------------------------------------------------"
+echo "3. Deploy the Pods/Services/Ingress in Kubernetes cluster"
 kubectl create -f Yamls/vanilla-deploy.yaml
 kubectl create -f Yamls/vanilla-service.yaml
 kubectl create -f Yamls/vanilla-ingress.yaml
+echo "---------------------------------------------------------------"
diff --git a/src/main/resources/app.props.build b/src/main/resources/app.props.build
@@ -1,5 +1,5 @@
 # =======================================================================
 # MS-Vanilla Service Properties
 # =======================================================================
-build.number=211
-build.date=Tue Jan 21 10:05:58 IST 2025
+build.number=212
+build.date=Tue Jan 21 18:03:47 IST 2025
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,8 +1,8 @@
 # =======================================================================
 # MS-Vanilla Service Properties
 # =======================================================================
-build.number=211
-build.date=Tue Jan 21 10:05:58 IST 2025
+build.number=212
+build.date=Tue Jan 21 18:03:47 IST 2025
 # ------------------------------------------------------------------------
 # Spring Profile
 # ------------------------------------------------------------------------