Added postgres to k8

pratikb0501 · pratikb0501 · commit 70bfacd94068 · 2025-06-17T20:50:41.000-07:00
diff --git a/k8s/loanservice-deployment.yaml b/k8s/loanservice-deployment.yaml
@@ -21,8 +21,16 @@ spec:
             - containerPort: 8082
           env:
             - name: SPRING_DATASOURCE_URL
-              value: jdbc:postgresql://host.docker.internal:5432/postgres
+              value: jdbc:postgresql://postgres-service:5432/p2p_loandb
             - name: SPRING_DATASOURCE_USERNAME
-              value: postgres
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secret
+                  key: SPRING_DATASOURCE_USERNAME
             - name: SPRING_DATASOURCE_PASSWORD
-              value: root
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secret
+                  key: SPRING_DATASOURCE_PASSWORD
+            - name: SPRING_JPA_HIBERNATE_DDL_AUTO
+              value: update
diff --git a/k8s/postgres/postgres-deployment.yaml b/k8s/postgres/postgres-deployment.yaml
@@ -0,0 +1,39 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: postgres
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      containers:
+        - name: postgres
+          image: postgres:15
+          ports:
+            - containerPort: 5432
+          env:
+            - name: POSTGRES_DB
+              value: p2p_fintech
+            - name: POSTGRES_USER
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secret
+                  key: SPRING_DATASOURCE_USERNAME
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secret
+                  key: SPRING_DATASOURCE_PASSWORD
+          volumeMounts:
+            - name: postgres-storage
+              mountPath: /var/lib/postgresql/data
+      volumes:
+        - name: postgres-storage
+          persistentVolumeClaim:
+            claimName: postgres-pvc
diff --git a/k8s/postgres/postgres-pv.yaml b/k8s/postgres/postgres-pv.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: postgres-pv
+spec:
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/data/postgres"
diff --git a/k8s/postgres/postgres-pvc.yaml b/k8s/postgres/postgres-pvc.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: postgres-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/k8s/postgres/postgres-secret.yaml b/k8s/postgres/postgres-secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: postgres-secret
+type: Opaque
+data:
+  SPRING_DATASOURCE_USERNAME: cG9zdGdyZXM=         # base64 of 'username'
+  SPRING_DATASOURCE_PASSWORD: UHJhdGlrQDEyMw==     # base64 of 'passwrod'
diff --git a/k8s/postgres/postgres-service.yaml b/k8s/postgres/postgres-service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres-service
+spec:
+  type: ClusterIP
+  selector:
+    app: postgres
+  ports:
+    - port: 5432
+      targetPort: 5432
diff --git a/k8s/userservice-deployment.yaml b/k8s/userservice-deployment.yaml
@@ -20,5 +20,17 @@ spec:
           ports:
             - containerPort: 8081
           env:
-            - name: SPRING_PROFILES_ACTIVE
-              value: production 
+            - name: SPRING_DATASOURCE_URL
+              value: jdbc:postgresql://postgres-service:5432/p2p_loandb
+            - name: SPRING_DATASOURCE_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secret
+                  key: SPRING_DATASOURCE_USERNAME
+            - name: SPRING_DATASOURCE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secret
+                  key: SPRING_DATASOURCE_PASSWORD
+            - name: SPRING_JPA_HIBERNATE_DDL_AUTO
+              value: update
diff --git a/loanservice/.gitignore b/loanservice/.gitignore
@@ -31,3 +31,6 @@ build/
 
 ### VS Code ###
 .vscode/
+
+/src/main/resources/application.properties
+k8s/postgres/postgres-secret.yaml
diff --git a/loanservice/Dockerfile b/loanservice/Dockerfile
@@ -1,23 +1,27 @@
-
+# Stage 1: Build
 FROM eclipse-temurin:17-jdk-jammy AS build
 
 WORKDIR /app
 
+# Copy everything for Maven context
 COPY . .
 
+# Grant permission to mvnw
 RUN chmod +x mvnw
 
-RUN ./mvnw -pl loanservice dependency:go-offline
-
-COPY loanservice/src src
+# Download dependencies
+RUN ./mvnw dependency:go-offline
 
-RUN ./mvnw -pl loanservice -am clean package -DskipTests
+# Build the fat JAR
+RUN ./mvnw clean package -DskipTests
 
+# Stage 2: Run
 FROM eclipse-temurin:17-jre-jammy
-WORKDIR /app
 
+WORKDIR /app
 
-COPY --from=build /app/loanservice/target/*.jar app.jar
+# Copy fat JAR
+COPY --from=build /app/loanservice/target/loanservice-0.0.1-SNAPSHOT.jar app.jar
 
 EXPOSE 8082
 
diff --git a/loanservice/pom.xml b/loanservice/pom.xml
@@ -4,43 +4,42 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
-        <groupId>com.p2plending</groupId>
-        <artifactId>fintech-platform</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath> <!-- adjust if needed -->
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.5.0</version>
+        <relativePath/> <!-- lookup parent from repository -->
     </parent>
-
+    <groupId>com.p2plending</groupId>
     <artifactId>loanservice</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>loanservice</name>
-    <description>Loan Service for P2P Lending</description>
+    <description>Loan Service</description>
 
     <properties>
         <java.version>17</java.version>
     </properties>
 
     <dependencies>
-        <!-- Spring Boot starters -->
+        <!-- Spring Boot Starters -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
+            <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <!-- PostgreSQL driver -->
+        <!-- PostgreSQL -->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -54,7 +53,7 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- JWT -->
+        <!-- JSON Web Token -->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
@@ -80,7 +79,7 @@
             <version>2.3.0</version>
         </dependency>
 
-        <!-- Testing -->
+        <!-- Test Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -95,37 +94,34 @@
 
     <build>
         <plugins>
-            <!-- Maven Compiler Plugin for Lombok annotation processing -->
+            <!-- Compiler Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
                 <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>1.18.30</version>
-                        </path>
-                    </annotationProcessorPaths>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
 
-            <!-- Spring Boot Maven Plugin -->
+            <!-- Spring Boot Plugin -->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.1.6</version>
                 <configuration>
                     <mainClass>com.p2plending.loanservice.LoanserviceApplication</mainClass>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/loanservice/src/main/java/com/p2plending/loanservice/security/SecurityConfig.java b/loanservice/src/main/java/com/p2plending/loanservice/security/SecurityConfig.java
@@ -16,10 +16,10 @@ public class SecurityConfig {
     private final JwtService jwtService;
     private final JwtAuthenticationProvider jwtAuthenticationProvider;
 
-    @Bean
-    public JwtAuthenticationFilter jwtAuthenticationFilter() {
-        return new JwtAuthenticationFilter(jwtService);
-    }
+//    @Bean
+//    public JwtAuthenticationFilter jwtAuthenticationFilter() {
+//        return new JwtAuthenticationFilter(jwtService);
+//    }
 
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
diff --git a/loanservice/src/main/resources/application.properties b/loanservice/src/main/resources/application.properties
@@ -2,11 +2,13 @@ spring.application.name=loanservice
 server.port=8082
 
 #spring.datasource.url=jdbc:postgresql://localhost:5432/p2p_loandb
-spring.datasource.url=jdbc:postgresql://host.docker.internal:5432/p2p_loandb
-spring.datasource.username=postgres
-spring.datasource.password=Pratik@123
+#spring.datasource.url=jdbc:postgresql://host.docker.internal:5432/p2p_loandb
+spring.datasource.url=${SPRING_DATASOURCE_URL}
 
-spring.jpa.hibernate.ddl-auto=update
+spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+
+spring.jpa.hibernate.ddl-auto=${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
 spring.jpa.show-sql=true
 
 # JWT Secret  # at least 32 chars for HMAC256
diff --git a/userservice/src/main/resources/application.properties b/userservice/src/main/resources/application.properties
@@ -1,12 +1,14 @@
 spring.application.name=user-service
 server.port=8081
 
-spring.datasource.url=jdbc:postgresql://localhost:5432/p2p_userdb
+#spring.datasource.url=jdbc:postgresql://localhost:5432/p2p_userdb
 #spring.datasource.url=jdbc:postgresql://host.docker.internal:5432/p2p_userdb
-spring.datasource.username=postgres
-spring.datasource.password=Pratik@123
+spring.datasource.url=${SPRING_DATASOURCE_URL}
 
-spring.jpa.hibernate.ddl-auto=update
+spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+
+spring.jpa.hibernate.ddl-auto=${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
 spring.jpa.show-sql=true
 
 # JWT Secret  # at least 32 chars for HMAC256
