Skip to content

Commit 9cfa974

Browse files
committed
feat(ci-cd-k8s): application.yaml files correction related to data source and jpa
1 parent 576ab1c commit 9cfa974

6 files changed

Lines changed: 69 additions & 50 deletions

File tree

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: postgres-init-script
5+
data:
6+
init.sql: |
7+
-- This script creates schemas for each microservice
8+
CREATE SCHEMA IF NOT EXISTS "user";
9+
CREATE SCHEMA IF NOT EXISTS "product";
10+
CREATE SCHEMA IF NOT EXISTS "order";
11+
CREATE SCHEMA IF NOT EXISTS "categories";
12+
13+
CREATE TABLE IF NOT EXISTS product.categories (
14+
id SERIAL PRIMARY KEY,
15+
name VARCHAR(255) NOT NULL
16+
);
17+
18+
CREATE TABLE IF NOT EXISTS product.products (
19+
id SERIAL PRIMARY KEY,
20+
name VARCHAR(255) NOT NULL,
21+
description TEXT,
22+
price DOUBLE PRECISION,
23+
available_quantity INTEGER
24+
);
25+
26+
CREATE TABLE IF NOT EXISTS product.product_category (
27+
product_id BIGINT NOT NULL,
28+
category_id BIGINT NOT NULL,
29+
PRIMARY KEY (product_id, category_id),
30+
FOREIGN KEY (product_id) REFERENCES product.products(id) ON DELETE CASCADE,
31+
FOREIGN KEY (category_id) REFERENCES product.categories(id) ON DELETE CASCADE
32+
);

k8s/configmaps/postgres-config-map.yaml.bck

Lines changed: 0 additions & 11 deletions
This file was deleted.

k8s/statefulsets/postgres.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ spec:
4040
volumeMounts:
4141
- name: postgres-storage
4242
mountPath: /var/lib/postgresql/data
43-
# - name: init-script
44-
# mountPath: /docker-entrypoint-initdb.d
45-
# volumes:
46-
# - name: init-script
47-
# configMap:
48-
# name: postgres-init-script
43+
- name: init-script
44+
mountPath: /docker-entrypoint-initdb.d
45+
volumes:
46+
- name: init-script
47+
configMap:
48+
name: postgres-init-script
4949
volumeClaimTemplates:
5050
- metadata:
5151
name: postgres-storage

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ spring:
55
application:
66
name: order-service
77

8-
spring:
9-
datasource:
10-
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
11-
username: ${SPRING_DATASOURCE_USERNAME:admin}
12-
password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
13-
driver-class-name: org.postgresql.Driver
14-
jpa:
8+
datasource:
9+
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
10+
username: ${SPRING_DATASOURCE_USERNAME:admin}
11+
password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
12+
driver-class-name: org.postgresql.Driver
13+
jpa:
14+
hibernate:
15+
ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
16+
properties:
1517
hibernate:
16-
ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
17-
properties:
18-
hibernate:
19-
default_schema: order
18+
default_schema: order
19+
2020

2121
jwt:
2222
secret: ${JWT_SECRET:dev_secret_key}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ spring:
55
application:
66
name: product-service
77

8-
spring:
9-
datasource:
10-
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
11-
username: ${SPRING_DATASOURCE_USERNAME:admin}
12-
password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
13-
driver-class-name: org.postgresql.Driver
14-
jpa:
8+
datasource:
9+
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
10+
username: ${SPRING_DATASOURCE_USERNAME:admin}
11+
password: ${SPRING_DATASOURCE_PASSWORD:passowrd}
12+
driver-class-name: org.postgresql.Driver
13+
jpa:
14+
hibernate:
15+
ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
16+
properties:
1517
hibernate:
16-
ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
17-
properties:
18-
hibernate:
19-
default_schema: product
18+
default_schema: product
2019

2120
jwt:
2221
secret: ${JWT_SECRET:dev_secret_key}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ spring:
55
application:
66
name: user-service
77

8-
spring:
9-
datasource:
10-
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
11-
username: ${SPRING_DATASOURCE_USERNAME:admin}
12-
password: ${SPRING_DATASOURCE_PASSWORD:password}
13-
driver-class-name: org.postgresql.Driver
14-
jpa:
8+
datasource:
9+
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/ecommerce}
10+
username: ${SPRING_DATASOURCE_USERNAME:admin}
11+
password: ${SPRING_DATASOURCE_PASSWORD:password}
12+
driver-class-name: org.postgresql.Driver
13+
jpa:
14+
hibernate:
15+
ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
16+
properties:
1517
hibernate:
16-
ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
17-
properties:
18-
hibernate:
19-
default_schema: user
18+
default_schema: user
2019

2120
jwt:
2221
secret: ${JWT_SECRET:dev_secret_key}

0 commit comments

Comments
 (0)