Feature/ci cd k8s support

.github/workflows/develop-pipeline.yaml

@@ -0,0 +1,33 @@
+name: Build and Deploy to Local Kubernetes
+
+on:
+  push:
+    branches:
+      - feature/*
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Build with Maven
+        run: mvn clean package -DskipTests
+
+      - name: Log in to GitHub Container Registry
+        run: echo "${{ secrets.GHCR_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Build and Push Docker Image
+        run: |
+          for service in user-service order-service product-service; do
+            docker build -t ghcr.io/${{ github.repository_owner }}/$service:latest ./$service
+            docker push ghcr.io/${{ github.repository_owner }}/$service:latest
+          done

.github/workflows/ci-cd.yaml → .github/workflows/feature-pipeline.yaml

@@ -3,7 +3,7 @@ name: Build and Deploy to Local Kubernetes
 on:
   push:
     branches:
-      - develop
+      - feature/*
 
 jobs:
   build-and-deploy:
@@ -22,15 +22,15 @@ jobs:
       - name: Build with Maven
         run: mvn clean package -DskipTests
 
-      - name: Log in to GitHub Container Registry
-        run: echo "${{ secrets.GHCR_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Build and Push Docker Image
-        run: |
-          for service in user-service order-service product-service; do
-            docker build -t ghcr.io/${{ github.repository_owner }}/$service:latest ./$service
-            docker push ghcr.io/${{ github.repository_owner }}/$service:latest
-          done
+#      - name: Log in to GitHub Container Registry
+#        run: echo "${{ secrets.GHCR_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+#
+#      - name: Build and Push Docker Image
+#        run: |
+#          for service in user-service order-service product-service; do
+#            docker build -t ghcr.io/${{ github.repository_owner }}/$service:latest ./$service
+#            docker push ghcr.io/${{ github.repository_owner }}/$service:latest
+#          done
 #      - name: Set up kubectl
 #        uses: azure/setup-kubectl@v3
 #        with:

.github/workflows/release-pipeline.yaml

@@ -0,0 +1,88 @@
+name: Release Pipeline
+
+on:
+  push:
+    branches:
+      - 'release/**'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Needed to push tags & branches
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Extract release version from branch name
+        id: vars
+        run: |
+          # Assuming branch name like release/1.2.3
+          echo "RELEASE_VERSION=${GITHUB_REF#refs/heads/release/}" >> $GITHUB_OUTPUT
+
+      - name: Build with Maven
+        run: mvn clean package -DskipTests
+
+      - name: Create and push Git tag for release
+        env:
+          RELEASE_VERSION: ${{ steps.vars.outputs.RELEASE_VERSION }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag -a "v$RELEASE_VERSION" -m "Release $RELEASE_VERSION"
+          git push origin "v$RELEASE_VERSION"
+
+      - name: Checkout master branch
+        run: git checkout master
+
+      - name: Update master branch to latest release tag
+        env:
+          RELEASE_VERSION: ${{ steps.vars.outputs.RELEASE_VERSION }}
+        run: |
+          git reset --hard "v$RELEASE_VERSION"
+          git push origin master --force
+
+      - name: Checkout develop branch
+        run: git checkout develop
+
+      - name: Bump develop version to next SNAPSHOT
+        env:
+          RELEASE_VERSION: ${{ steps.vars.outputs.RELEASE_VERSION }}
+        run: |
+          # Extract major.minor.patch, then increment patch + add SNAPSHOT
+          IFS='.' read -r major minor patch <<< "${RELEASE_VERSION}"
+          next_patch=$((patch + 1))
+          next_snapshot="${major}.${minor}.${next_patch}-SNAPSHOT"
+
+          echo "Next develop version: $next_snapshot"
+
+          # Update version in pom.xml or your version file
+          mvn versions:set -DnewVersion=$next_snapshot
+          mvn versions:commit
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git add pom.xml
+          git commit -m "Bump develop version to $next_snapshot"
+          git push origin develop
+
+      - name: Build and push Docker images
+        env:
+          RELEASE_VERSION: ${{ steps.vars.outputs.RELEASE_VERSION }}
+          GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
+        run: |
+          echo "${GHCR_TOKEN}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+          for service in user-service order-service product-service; do
+            docker build -t ghcr.io/${{ github.repository_owner }}/$service:$RELEASE_VERSION ./$service
+            docker push ghcr.io/${{ github.repository_owner }}/$service:$RELEASE_VERSION
+          done

k8s/configmaps/postgres-config-map.yaml

@@ -7,4 +7,26 @@ data:
     -- This script creates schemas for each microservice
     CREATE SCHEMA IF NOT EXISTS "user";
     CREATE SCHEMA IF NOT EXISTS "product";
-    CREATE SCHEMA IF NOT EXISTS "order";
+    CREATE SCHEMA IF NOT EXISTS "order";
+    CREATE SCHEMA IF NOT EXISTS "categories";
+
+    CREATE TABLE IF NOT EXISTS product.categories (
+      id SERIAL PRIMARY KEY,
+      name VARCHAR(255) NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS product.products (
+      id SERIAL PRIMARY KEY,
+      name VARCHAR(255) NOT NULL,
+      description TEXT,
+      price DOUBLE PRECISION,
+      available_quantity INTEGER
+    );
+
+    CREATE TABLE IF NOT EXISTS product.product_category (
+      product_id BIGINT NOT NULL,
+      category_id BIGINT NOT NULL,
+      PRIMARY KEY (product_id, category_id),
+      FOREIGN KEY (product_id) REFERENCES product.products(id) ON DELETE CASCADE,
+      FOREIGN KEY (category_id) REFERENCES product.categories(id) ON DELETE CASCADE
+    );

order-service/src/main/java/com/devsocket/ecommerce/order/entity/Order.java

@@ -9,7 +9,7 @@
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "orders")
+@Table(name = "orders", schema = "order")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

order-service/src/main/resources/application.yaml

@@ -5,15 +5,18 @@ spring:
   application:
     name: order-service
 
-  spring:
-    datasource:
-      url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/orders}
-      username: ${SPRING_DATASOURCE_USERNAME:admin}
-      password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
-      driver-class-name: org.postgresql.Driver
-    jpa:
+  datasource:
+    url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
+    username: ${SPRING_DATASOURCE_USERNAME:admin}
+    password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
+    driver-class-name: org.postgresql.Driver
+  jpa:
+    hibernate:
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
+    properties:
       hibernate:
-        ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
+        default_schema: order
+
 
   jwt:
     secret: ${JWT_SECRET:dev_secret_key}

product-service/src/main/java/com/devsocket/ecommerce/product/ProductServiceApplication.java

@@ -2,12 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 @ComponentScan(basePackages = {
         "com.devsocket.ecommerce"
 })
+@EntityScan("com.devsocket.ecommerce.product.entity")
 public class ProductServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(ProductServiceApplication.class, args);

product-service/src/main/java/com/devsocket/ecommerce/product/entity/Category.java

@@ -8,7 +8,7 @@
 
 @Data
 @Entity
-@Table(name = "categories")
+@Table(name = "categories", schema = "product")
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder

product-service/src/main/java/com/devsocket/ecommerce/product/entity/Product.java

@@ -9,7 +9,7 @@
 import java.util.List;
 
 @Entity
-@Table(name = "products")
+@Table(name = "products", schema = "product")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

product-service/src/main/resources/application.yaml

@@ -5,15 +5,17 @@ spring:
   application:
     name: product-service
 
-  spring:
-    datasource:
-      url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/products}
-      username: ${SPRING_DATASOURCE_USERNAME:admin}
-      password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
-      driver-class-name: org.postgresql.Driver
-    jpa:
+  datasource:
+    url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
+    username: ${SPRING_DATASOURCE_USERNAME:admin}
+    password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
+    driver-class-name: org.postgresql.Driver
+  jpa:
+    hibernate:
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
+    properties:
       hibernate:
-        ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
+        default_schema: product
 
   jwt:
     secret: ${JWT_SECRET:dev_secret_key}

user-service/src/main/java/com/devsocket/ecommerce/userservice/entity/User.java

@@ -7,7 +7,7 @@
 import lombok.NoArgsConstructor;
 
 @Entity
-@Table(name = "users")
+@Table(name = "users", schema = "user")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

user-service/src/main/resources/application.yaml

@@ -5,15 +5,17 @@ spring:
   application:
     name: user-service
 
-  spring:
-    datasource:
-      url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/userdb}
-      username: ${SPRING_DATASOURCE_USERNAME:admin}
-      password: ${SPRING_DATASOURCE_PASSWORD:password}
-      driver-class-name: org.postgresql.Driver
-    jpa:
+  datasource:
+    url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
+    username: ${SPRING_DATASOURCE_USERNAME:admin}
+    password: ${SPRING_DATASOURCE_PASSWORD:password}
+    driver-class-name: org.postgresql.Driver
+  jpa:
+    hibernate:
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
+    properties:
       hibernate:
-        ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
+        default_schema: user
 
   jwt:
     secret: ${JWT_SECRET:dev_secret_key}