added app data presistent volume to k8s

octodemo · Jul 10, 2023 · 62dc211 · 62dc211
1 parent 61ac7f1
commit 62dc211
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 52 deletions.
diff --git a/deployments/postgres_db-deployment.yaml b/deployments/postgres_db-deployment.yaml
@@ -1,3 +1,57 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres-database-service
+spec:
+  selector:
+    app: postgres-database
+  ports:
+    - name: postgres
+      port: 5432
+      targetPort: 5432
+  type: ClusterIP
+---
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+  name: postgres-pv-volume
+  labels:
+    type: local
+    app: postgres-database
+spec:
+  storageClassName: manual
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/mnt/data"
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: postgres-pv-claim
+  labels:
+    app: postgres-database
+spec:
+  storageClassName: manual
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgres-config
+  labels:
+    app: postgres
+data:
+  POSTGRES_DB: postgresdb
+  POSTGRES_USER: postgresadmin
+  POSTGRES_PASSWORD: admin123
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -14,28 +68,19 @@ spec:
     spec:
       containers:
         - name: postgres-database-container
-          image: postgres:latest
+          image: postgres:10.4
+          imagePullPolicy: "IfNotPresent"
           ports:
             - containerPort: 5432
-          env:
-            - name: POSTGRES_PASSWORD
-              value: postgres
+          envFrom:
+            - configMapRef:
+                name: postgres-config
           volumeMounts:
-            - name: postgres-volume
-              mountPath: /var/lib/postgresql/data
+            - mountPath: /var/lib/postgresql/data
+              name: postgredb
       volumes:
-        - name: postgres-volume
-          emptyDir: {}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: postgres-database-service
-spec:
-  selector:
-    app: postgres-database
-  ports:
-    - name: postgres
-      port: 5432
-      targetPort: 5432
-  type: ClusterIP
+        - name: postgredb
+          # persistentVolumeClaim:
+          #   claimName: postgres-pv-claim
+          emptyDir:
+            sizeLimit: "500Mi"
diff --git a/deployments/spring-app-deployment-v1.yaml b/deployments/spring-app-deployment-v1.yaml
@@ -15,16 +15,16 @@ spec:
     spec:
       containers:
         - name: spring-app-container
-          image: ghcr.io/octodemo/java-springboot-demo:107
+          image: ghcr.io/octodemo/java-springboot-demo:999
           ports:
             - containerPort: 8086
           env:
             - name: DB_URL
-              value: jdbc:postgresql://database:5432/postgres
-            - name: POSTGRES_USER
-              value: postgres
+              value: jdbc:postgresql://postgres-database-service:5432/postgres
+            - name: USER_NAME
+              value: postgresadmin
             - name: PASSWORD
-              value: postgres
+              value: admin123
             - name: CHANGELOG_VERSION
               value: changelog_version-3.3.xml
       imagePullSecrets:

diff --git a/deployments/spring-app-deployment-v2.yaml b/deployments/spring-app-deployment-v2.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: spring-app-deployment-v2
 spec:
-  replicas: 6
+  replicas: 3
   selector:
     matchLabels:
       app: spring-app
@@ -15,16 +15,16 @@ spec:
     spec:
       containers:
         - name: spring-app-container
-          image: ghcr.io/octodemo/java-springboot-demo:108
+          image: ghcr.io/octodemo/java-springboot-demo:1000
           ports:
             - containerPort: 8086
           env:
             - name: DB_URL
-              value: jdbc:postgresql://database:5432/postgres
-            - name: POSTGRES_USER
-              value: postgres
+              value: jdbc:postgresql://postgres-database-service:5432/postgres
+            - name: USER_NAME
+              value: postgresadmin
             - name: PASSWORD
-              value: postgres
+              value: admin123
             - name: CHANGELOG_VERSION
               value: changelog_version-3.3.xml
       imagePullSecrets:

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>net.codejava</groupId>
 	<artifactId>salesmanager</artifactId>
-	<version>0.0.7-SNAPSHOT</version>
+	<version>0.0.8-SNAPSHOT</version>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -65,10 +65,11 @@
 			</exclusions>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<scope>42.5.4</scope>
+			<version>42.6.0</version>
 		</dependency>
 
 		<dependency>
@@ -113,11 +114,12 @@
 				</configuration>
 				<dependencies>
 					<!--  postgresql driver - avoid volunerable version -->
-					<dependency>
-						<groupId>org.postgresql</groupId>
-						<artifactId>postgresql</artifactId>
-						<version>42.5.4</version>
-					</dependency>
+					<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
+				<dependency>
+					<groupId>org.postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+					<version>42.6.0</version>
+				</dependency>
 				</dependencies>
 			</plugin>
 		</plugins>

diff --git a/src/main/java/net/codejava/AppController.java b/src/main/java/net/codejava/AppController.java
@@ -64,10 +64,10 @@ public String delete(@PathVariable(name = "id") int id) {
 	    return "redirect:/";       
 	}	
 
-	// // method to clear the amount column in the database given an id
-	// @RequestMapping("/clear/{id}")
-	// public String clearAmount(@PathVariable(name = "id") int id) {
-	// 	dao.clearAmount(id);
-	// 	return "redirect:/";
-	// }
+	// method to clear the amount column in the database given an id
+	@RequestMapping("/clear/{id}")
+	public String clearAmount(@PathVariable(name = "id") int id) {
+		dao.clearAmount(id);
+		return "redirect:/";
+	}
 }
diff --git a/src/main/java/net/codejava/SalesDAO.java b/src/main/java/net/codejava/SalesDAO.java
@@ -51,9 +51,9 @@ public void delete(int id) {
 		jdbcTemplate.update(sql, id);
 	}
 
-	// // method to clear the amount column in the database given an id
-	// public void clearAmount(int id) {
-	// 	String sql = "UPDATE SALES SET amount=0 WHERE id=?";
-	// 	jdbcTemplate.update(sql, id);
-	// }
+	// method to clear the amount column in the database given an id
+	public void clearAmount(int id) {
+		String sql = "UPDATE SALES SET amount=0 WHERE id=?";
+		jdbcTemplate.update(sql, id);
+	}
 }
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -31,8 +31,8 @@ <h1>Sales Records</h1>
                     &nbsp;&nbsp;&nbsp;
                     <a th:href="@{'/delete/' + ${sale.id}}">Delete</a>
                     <!--  add a clear button to clear the amount given by id -->
-                    <!-- &nbsp;&nbsp;&nbsp; -->
-                    <!-- <a th:href="@{'/clear/' + ${sale.id}}">Clear</a> -->
+                    &nbsp;&nbsp;&nbsp;
+                    <a th:href="@{'/clear/' + ${sale.id}}">Clear</a>
                 </td>
             </tr>
         </tbody>