From 04b0d24c4552113d16a5492cf0b2521d20fa528c Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:41:25 +0530
Subject: [PATCH 01/37] Dockerfile
---
Dockerfile | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 Dockerfile
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..2fddce9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+# Stage 1: Build the application
+FROM maven:3.8.1-openjdk-11 AS build
+WORKDIR /app
+COPY pom.xml .
+COPY src ./src
+RUN mvn clean install -Dmaven.test.skip=true
+
+# Stage 2: Run the application
+FROM openjdk:11-jre-slim
+WORKDIR /app
+COPY --from=build /app/target/*.jar /app/app.jar
+CMD ["java", "-jar", "app.jar"]
From 3115f99ac6658cacc16ca284a601739752bdb1b2 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 9 Aug 2024 22:34:39 +0530
Subject: [PATCH 02/37] Update README.md
---
README.md | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 184c826..dc6ecbc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Secret Santa Generator Application :santa:
-A __secret santa generator web application__ built using __Spring Boot technologies__, __Thymeleaf views__, __JPA__, __H2 Database__, and more. The project features Spring Model, View, and Controller (MVC) architecture and Service and Repository layers.
+A __secret santa generator web application__ built using __Spring Boot technologies__, __Thymeleaf views__, __JPA__, __MYSQL Database__, and more. The project features Spring Model, View, and Controller (MVC) architecture and Service and Repository layers.
This project is based on the popular Christmas game __Secret Santa__ where friends draw names from a hat to decide who they are required to give a present to. This project allows users to add names, and the project randomly generates secret santa matches (it isn't as simple as creating random pairs). There are different solutions to the "Secret Santa problem" as the problem essentially creates a directed graph.
@@ -43,13 +43,7 @@ Or you can run it from Maven directly using the Spring Boot Maven plugin.
```
## Database Configuration
-This project uses an in-memory database (H2). If you would like to work on the project, enable the `http://localhost:8080/h2-console` via the property :
-
-```spring.h2.console.enabled=true```
-
-in __application.properties__.
-
-The database url used is `jdbc:h2:mem:testdb`.
+This project uses an MYSQL database
## About
This project was a personal project to learn more about Spring development, database management, and industry application architecture.
@@ -62,7 +56,7 @@ A small summary of the skills showcased during this project: :small_red_triangle
* Thymeleaf technology, syntax, usage, capabilities, more
* Client/Server data transfer
* JPA annotations and repository management
-* H2 in-memory database management
+* MYSQL database management
* Software/web application development processes
* MVC architecture along with DAO, model, service layers, and similar
* Accessibility, web design
From 5846fb67bc35105571813595743299f1d02b822e Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 9 Aug 2024 22:36:59 +0530
Subject: [PATCH 03/37] docker-compose.yml
---
docker-compose.yml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..55067b1
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '3.8'
+services:
+ app:
+ image: santa
+ ports:
+ - "8080:8080"
+ container_name: santa
+ environment:
+ SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/santadb?autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=false
+ SPRING_DATASOURCE_USERNAME: admin
+ SPRING_DATASOURCE_PASSWORD: root
+ depends_on:
+ - db
+
+ db:
+ image: mysql:8.0.27
+ environment:
+ DATABASE_HOST: docker-mysql
+ DATABASE_POST: 3306
+ MYSQL_ROOT_PASSWORD: root
+ MYSQL_DATABASE: santadb
+ MYSQL_USER: admin
+ MYSQL_PASSWORD: root
+ volumes:
+ - db_data:/var/lib/mysql
+
+volumes:
+ db_data:
From b0f480a28de4fe4effb5d97a64f575fe170293e1 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 9 Aug 2024 22:37:34 +0530
Subject: [PATCH 04/37] Update application.properties
---
src/main/resources/application.properties | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 3ab8beb..1f1d5ba 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,2 +1,10 @@
-spring.datasource.platform=h2
-spring.datasource.url=jdbc:h2:mem:testdb
\ No newline at end of file
+# Datasource configuration
+spring.datasource.url=jdbc:mysql://localhost:3306/santadb?autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=false
+spring.datasource.username=admin
+spring.datasource.password=root
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.initialization-mode=always
+
+# JPA (Hibernate) configuration
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
+spring.jpa.hibernate.ddl-auto=update
From acf892f3901a6bbe8bc8ae980aa46e641f1f8e27 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 9 Aug 2024 22:38:50 +0530
Subject: [PATCH 05/37] Update pom.xml
---
pom.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1318e26..599098f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,10 +33,14 @@
- com.h2database
- h2
- runtime
-
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+ mysql
+ mysql-connector-java
+ 8.0.12
+
org.springframework.boot
spring-boot-starter-test
From 3d791331c03ec41f8b159b746a64c5ad5faed51a Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:24:10 +0530
Subject: [PATCH 06/37] Update docker-compose.yml
---
docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 55067b1..6892064 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.8'
services:
app:
- image: santa
+ image: sunil3gs98/secretesanta-generator:v1.0.0
ports:
- "8080:8080"
container_name: santa
From d66e95e4443233e383d8b51b7294a4fe603b8fbb Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:38:18 +0530
Subject: [PATCH 07/37] Create app.yml
---
k8-deployments/app.yml | 1 +
1 file changed, 1 insertion(+)
create mode 100644 k8-deployments/app.yml
diff --git a/k8-deployments/app.yml b/k8-deployments/app.yml
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/k8-deployments/app.yml
@@ -0,0 +1 @@
+
From a660603532a01b8d1855c0c76b3d8f3fc60fdf49 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:27:53 +0530
Subject: [PATCH 08/37] Delete k8-deployments/app.yml
---
k8-deployments/app.yml | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 k8-deployments/app.yml
diff --git a/k8-deployments/app.yml b/k8-deployments/app.yml
deleted file mode 100644
index 8b13789..0000000
--- a/k8-deployments/app.yml
+++ /dev/null
@@ -1 +0,0 @@
-
From e976e40026a1b38fdcaf264796e93ff71284ac17 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:28:35 +0530
Subject: [PATCH 09/37] Create app.yml
---
k8-deployments/app.yml | 1 +
1 file changed, 1 insertion(+)
create mode 100644 k8-deployments/app.yml
diff --git a/k8-deployments/app.yml b/k8-deployments/app.yml
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/k8-deployments/app.yml
@@ -0,0 +1 @@
+
From 7c00e413a8af32545389edbf3cf3de27223fc5f6 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:29:01 +0530
Subject: [PATCH 10/37] Add files via upload
---
k8-deployments/app-deployment.yaml | 28 ++++++++++++++++++++++
k8-deployments/app-service.yaml | 14 +++++++++++
k8-deployments/db-deployment.yaml | 37 ++++++++++++++++++++++++++++++
k8-deployments/db-pvc.yaml | 12 ++++++++++
k8-deployments/db-service.yaml | 14 +++++++++++
5 files changed, 105 insertions(+)
create mode 100644 k8-deployments/app-deployment.yaml
create mode 100644 k8-deployments/app-service.yaml
create mode 100644 k8-deployments/db-deployment.yaml
create mode 100644 k8-deployments/db-pvc.yaml
create mode 100644 k8-deployments/db-service.yaml
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
new file mode 100644
index 0000000..888315e
--- /dev/null
+++ b/k8-deployments/app-deployment.yaml
@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: santa-app
+ labels:
+ app: santa
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: santa
+ template:
+ metadata:
+ labels:
+ app: santa
+ spec:
+ containers:
+ - name: santa
+ image: sunil3gs98/secretesanta-generator:v1.0.0
+ ports:
+ - containerPort: 8080
+ env:
+ - name: SPRING_DATASOURCE_URL
+ value: "jdbc:mysql://santa-db-service:3306/santadb?autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=false"
+ - name: SPRING_DATASOURCE_USERNAME
+ value: "admin"
+ - name: SPRING_DATASOURCE_PASSWORD
+ value: "root"
diff --git a/k8-deployments/app-service.yaml b/k8-deployments/app-service.yaml
new file mode 100644
index 0000000..c8d8017
--- /dev/null
+++ b/k8-deployments/app-service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: santa-app-service
+ labels:
+ app: santa
+spec:
+ selector:
+ app: santa
+ ports:
+ - protocol: TCP
+ port: 8080
+ targetPort: 8080
+ type: ClusterIP
diff --git a/k8-deployments/db-deployment.yaml b/k8-deployments/db-deployment.yaml
new file mode 100644
index 0000000..74de8fe
--- /dev/null
+++ b/k8-deployments/db-deployment.yaml
@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: santa-db
+ labels:
+ app: santa-db
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: santa-db
+ template:
+ metadata:
+ labels:
+ app: santa-db
+ spec:
+ containers:
+ - name: mysql
+ image: mysql:8.0.27
+ ports:
+ - containerPort: 3306
+ env:
+ - name: MYSQL_ROOT_PASSWORD
+ value: "root"
+ - name: MYSQL_DATABASE
+ value: "santadb"
+ - name: MYSQL_USER
+ value: "admin"
+ - name: MYSQL_PASSWORD
+ value: "root"
+ volumeMounts:
+ - name: db-data
+ mountPath: /var/lib/mysql
+ volumes:
+ - name: db-data
+ persistentVolumeClaim:
+ claimName: db-pvc
diff --git a/k8-deployments/db-pvc.yaml b/k8-deployments/db-pvc.yaml
new file mode 100644
index 0000000..cc4b137
--- /dev/null
+++ b/k8-deployments/db-pvc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ name: db-pvc
+ labels:
+ app: santa-db
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 1Gi
diff --git a/k8-deployments/db-service.yaml b/k8-deployments/db-service.yaml
new file mode 100644
index 0000000..0101fa1
--- /dev/null
+++ b/k8-deployments/db-service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: santa-db-service
+ labels:
+ app: santa-db
+spec:
+ selector:
+ app: santa-db
+ ports:
+ - protocol: TCP
+ port: 3306
+ targetPort: 3306
+ type: ClusterIP
From fcf70e4c1520c81e562cf532dfc8625746a3d107 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:29:43 +0530
Subject: [PATCH 11/37] Delete app.yml
---
k8-deployments/app.yml | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 k8-deployments/app.yml
diff --git a/k8-deployments/app.yml b/k8-deployments/app.yml
deleted file mode 100644
index 8b13789..0000000
--- a/k8-deployments/app.yml
+++ /dev/null
@@ -1 +0,0 @@
-
From b3b015fbf9a3c0468cd2aeae9bb43e19d883d6e7 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:31:38 +0530
Subject: [PATCH 12/37] Update app-deployment.yaml
From f2b6b43f567624b73f9c651ca835c67cc11ca15d Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:45:27 +0530
Subject: [PATCH 13/37] Update app-deployment.yaml
---
k8-deployments/app-deployment.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
index 888315e..9e315a4 100644
--- a/k8-deployments/app-deployment.yaml
+++ b/k8-deployments/app-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: santa-app
+ namespace: sunil3gs98
labels:
app: santa
spec:
From 8001c76554a40e76c9d624b86904dde3728f52e6 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:45:46 +0530
Subject: [PATCH 14/37] Update app-service.yaml
---
k8-deployments/app-service.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/app-service.yaml b/k8-deployments/app-service.yaml
index c8d8017..4d23a1e 100644
--- a/k8-deployments/app-service.yaml
+++ b/k8-deployments/app-service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: santa-app-service
+ namespace: sunil3gs98
labels:
app: santa
spec:
From b10ad8d3b84748c1cd2435c3a6417fa4d856b2ac Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:46:11 +0530
Subject: [PATCH 15/37] Update db-deployment.yaml
---
k8-deployments/db-deployment.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/db-deployment.yaml b/k8-deployments/db-deployment.yaml
index 74de8fe..2b65597 100644
--- a/k8-deployments/db-deployment.yaml
+++ b/k8-deployments/db-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: santa-db
+ namespace: sunil3gs98
labels:
app: santa-db
spec:
From 6f98b73998f53aedd93483a12933d187c35b9aa0 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:46:32 +0530
Subject: [PATCH 16/37] Update db-pvc.yaml
---
k8-deployments/db-pvc.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/db-pvc.yaml b/k8-deployments/db-pvc.yaml
index cc4b137..cc2c905 100644
--- a/k8-deployments/db-pvc.yaml
+++ b/k8-deployments/db-pvc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: db-pvc
+ namespace: sunil3gs98
labels:
app: santa-db
spec:
From 24248c09f039aaf87087de75344bda288dc949ab Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:46:51 +0530
Subject: [PATCH 17/37] Update db-service.yaml
---
k8-deployments/db-service.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/db-service.yaml b/k8-deployments/db-service.yaml
index 0101fa1..6636854 100644
--- a/k8-deployments/db-service.yaml
+++ b/k8-deployments/db-service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: santa-db-service
+ namespace: sunil3gs98
labels:
app: santa-db
spec:
From a868145783e3636dac85c2a27fd845779d326f01 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Mon, 26 Aug 2024 11:54:43 +0530
Subject: [PATCH 18/37] Update docker-compose.yml
---
docker-compose.yml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 6892064..ad01f06 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,6 +23,16 @@ services:
MYSQL_PASSWORD: root
volumes:
- db_data:/var/lib/mysql
-
+
+ phpmyadmin:
+ image: phpmyadmin/phpmyadmin:latest
+ ports:
+ - "8081:80"
+ environment:
+ PMA_HOST: db
+ MYSQL_ROOT_PASSWORD: root
+ depends_on:
+ - db
+
volumes:
db_data:
From dcac5e9f783eecd10bb94bbac13ccd89999a4293 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 30 Aug 2024 10:42:24 +0530
Subject: [PATCH 19/37] Update app-service.yaml
---
k8-deployments/app-service.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8-deployments/app-service.yaml b/k8-deployments/app-service.yaml
index 4d23a1e..13402f3 100644
--- a/k8-deployments/app-service.yaml
+++ b/k8-deployments/app-service.yaml
@@ -12,4 +12,4 @@ spec:
- protocol: TCP
port: 8080
targetPort: 8080
- type: ClusterIP
+ type: LoadBalancer
From 910ab5b023d19c7dda6f570a65e4e35f15356ad4 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 30 Aug 2024 10:42:51 +0530
Subject: [PATCH 20/37] Update db-service.yaml
---
k8-deployments/db-service.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8-deployments/db-service.yaml b/k8-deployments/db-service.yaml
index 6636854..1794ac7 100644
--- a/k8-deployments/db-service.yaml
+++ b/k8-deployments/db-service.yaml
@@ -12,4 +12,4 @@ spec:
- protocol: TCP
port: 3306
targetPort: 3306
- type: ClusterIP
+ type: LoadBalancer
From fce6c37584552af8e098f29d7c18593377942f71 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 31 Aug 2024 13:30:52 +0530
Subject: [PATCH 21/37] Update app-deployment.yaml
---
k8-deployments/app-deployment.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
index 9e315a4..cb6bfbe 100644
--- a/k8-deployments/app-deployment.yaml
+++ b/k8-deployments/app-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
labels:
app: santa
spec:
- replicas: 1
+ replicas: 4
selector:
matchLabels:
app: santa
From 5854eda63afd5451ca3ddab2784e55145e27368e Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Mon, 9 Sep 2024 18:59:58 +0530
Subject: [PATCH 22/37] Create php-admin-service.yaml
---
k8-deployments/php-admin-service.yaml | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 k8-deployments/php-admin-service.yaml
diff --git a/k8-deployments/php-admin-service.yaml b/k8-deployments/php-admin-service.yaml
new file mode 100644
index 0000000..5dc949d
--- /dev/null
+++ b/k8-deployments/php-admin-service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: phpmyadmin
+ namespace: sunil3gs98
+spec:
+ selector:
+ app: phpmyadmin
+ ports:
+ - protocol: TCP
+ port: 80
+ targetPort: 80
+ type: LoadBalancer # or NodePort if you prefer
From ccd5c823703d6e9fef9c63f24a07686e32dd5d18 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Mon, 9 Sep 2024 19:00:43 +0530
Subject: [PATCH 23/37] Create php-admin.yaml
---
k8-deployments/php-admin.yaml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 k8-deployments/php-admin.yaml
diff --git a/k8-deployments/php-admin.yaml b/k8-deployments/php-admin.yaml
new file mode 100644
index 0000000..61c45b2
--- /dev/null
+++ b/k8-deployments/php-admin.yaml
@@ -0,0 +1,27 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: phpmyadmin
+ namespace: spandana
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: phpmyadmin
+ template:
+ metadata:
+ labels:
+ app: phpmyadmin
+ spec:
+ containers:
+ - name: phpmyadmin
+ image: phpmyadmin/phpmyadmin
+ ports:
+ - containerPort: 80
+ env:
+ - name: PMA_HOST
+ value: santa-db-service
+ - name: PMA_USER
+ value: admin
+ - name: PMA_PASSWORD
+ value: root
From cc285fdea674922702199e27ae168ce68e0dc82b Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sun, 15 Sep 2024 19:20:32 +0530
Subject: [PATCH 24/37] Update php-admin.yaml
---
k8-deployments/php-admin.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8-deployments/php-admin.yaml b/k8-deployments/php-admin.yaml
index 61c45b2..ad1e215 100644
--- a/k8-deployments/php-admin.yaml
+++ b/k8-deployments/php-admin.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: phpmyadmin
- namespace: spandana
+ namespace: sunil3gs98
spec:
replicas: 1
selector:
From ca309f554cbb1b8f79148becd29d6e8e9caa6d99 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:29:57 +0530
Subject: [PATCH 25/37] Update pom.xml
---
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pom.xml b/pom.xml
index 599098f..97d8bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,15 @@
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ io.micrometer
+ micrometer-registry-prometheus
+
+
From 2dff3f7ab895b7b0deecd29b963541ccb60b3549 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:35:56 +0530
Subject: [PATCH 26/37] Update application.properties
---
src/main/resources/application.properties | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1f1d5ba..91360d9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,6 +5,10 @@ spring.datasource.password=root
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.initialization-mode=always
+# Actuator endpoint exposure configuration
+management.endpoints.web.exposure.include=health,info,prometheus,auditevents,beans,caches,conditions,configprops,env,heapdump,loggers,metrics,mappings,threaddump,sessions
+management.endpoint.prometheus.enabled=true
+
# JPA (Hibernate) configuration
spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
spring.jpa.hibernate.ddl-auto=update
From ab600da7d3ba940a095d556f8aa34de444133ef3 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:43:43 +0530
Subject: [PATCH 27/37] Update app-service.yaml
---
k8-deployments/app-service.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/k8-deployments/app-service.yaml b/k8-deployments/app-service.yaml
index 13402f3..de33ef3 100644
--- a/k8-deployments/app-service.yaml
+++ b/k8-deployments/app-service.yaml
@@ -5,6 +5,10 @@ metadata:
namespace: sunil3gs98
labels:
app: santa
+ annotations:
+ prometheus.io/scrape: "true" # Enable scraping
+ prometheus.io/path: "/actuator/prometheus" # Metrics path
+ prometheus.io/port: "8080" # Port where metrics are exposed
spec:
selector:
app: santa
From aae498a5cb323080a97a9d2829fb59223fedccd5 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:20:19 +0530
Subject: [PATCH 28/37] Update docker-compose.yml
---
docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index ad01f06..4592f15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.8'
services:
app:
- image: sunil3gs98/secretesanta-generator:v1.0.0
+ image: sunil3gs98/secretesanta-generator:v1.1.0
ports:
- "8080:8080"
container_name: santa
From b0d74c4424bcb132e32f7f61ad9e00c311b811b2 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:21:18 +0530
Subject: [PATCH 29/37] image update from v1.0.0 -v1.1.0
---
k8-deployments/app-deployment.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
index cb6bfbe..5314c04 100644
--- a/k8-deployments/app-deployment.yaml
+++ b/k8-deployments/app-deployment.yaml
@@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: santa
- image: sunil3gs98/secretesanta-generator:v1.0.0
+ image: secretesanta-generator:v1.1.0
ports:
- containerPort: 8080
env:
From 2748e12e63ee8dd832b981f627c5f03df2a74060 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:03:23 +0530
Subject: [PATCH 30/37] Update app-deployment.yaml
---
k8-deployments/app-deployment.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
index 5314c04..2a87cff 100644
--- a/k8-deployments/app-deployment.yaml
+++ b/k8-deployments/app-deployment.yaml
@@ -10,6 +10,7 @@ spec:
selector:
matchLabels:
app: santa
+ version: blue
template:
metadata:
labels:
From f996181f7fed2a84febb32c7b4bdebc1f8a0b869 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:05:49 +0530
Subject: [PATCH 31/37] Update app-service.yaml
---
k8-deployments/app-service.yaml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/k8-deployments/app-service.yaml b/k8-deployments/app-service.yaml
index de33ef3..831b298 100644
--- a/k8-deployments/app-service.yaml
+++ b/k8-deployments/app-service.yaml
@@ -5,13 +5,10 @@ metadata:
namespace: sunil3gs98
labels:
app: santa
- annotations:
- prometheus.io/scrape: "true" # Enable scraping
- prometheus.io/path: "/actuator/prometheus" # Metrics path
- prometheus.io/port: "8080" # Port where metrics are exposed
spec:
selector:
app: santa
+ version: blue
ports:
- protocol: TCP
port: 8080
From 8ca5ddcb07075541ac7a8fcc71ced3a8b04718ac Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:20:45 +0530
Subject: [PATCH 32/37] Update db-deployment.yaml
---
k8-deployments/db-deployment.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/db-deployment.yaml b/k8-deployments/db-deployment.yaml
index 2b65597..7be42be 100644
--- a/k8-deployments/db-deployment.yaml
+++ b/k8-deployments/db-deployment.yaml
@@ -10,6 +10,7 @@ spec:
selector:
matchLabels:
app: santa-db
+ version: blue
template:
metadata:
labels:
From b80a7e217d5daca7fa2d9770460c778b5cd5c002 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 28 Sep 2024 21:21:16 +0530
Subject: [PATCH 33/37] Update db-service.yaml
---
k8-deployments/db-service.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/db-service.yaml b/k8-deployments/db-service.yaml
index 1794ac7..98bea0a 100644
--- a/k8-deployments/db-service.yaml
+++ b/k8-deployments/db-service.yaml
@@ -8,6 +8,7 @@ metadata:
spec:
selector:
app: santa-db
+ version: blue
ports:
- protocol: TCP
port: 3306
From d92a7d5f6534364498386f6739ff867ec37ec8ad Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 28 Sep 2024 22:05:26 +0530
Subject: [PATCH 34/37] Update app-deployment.yaml
---
k8-deployments/app-deployment.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
index 2a87cff..4ca0fcc 100644
--- a/k8-deployments/app-deployment.yaml
+++ b/k8-deployments/app-deployment.yaml
@@ -15,10 +15,11 @@ spec:
metadata:
labels:
app: santa
+ version: blue
spec:
containers:
- name: santa
- image: secretesanta-generator:v1.1.0
+ image: secretesanta-generator:v1.0.0
ports:
- containerPort: 8080
env:
From 6d83c67c850a7caf086f0f9bd54f0586f8853af0 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 28 Sep 2024 22:07:40 +0530
Subject: [PATCH 35/37] Update db-deployment.yaml
---
k8-deployments/db-deployment.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8-deployments/db-deployment.yaml b/k8-deployments/db-deployment.yaml
index 7be42be..5269482 100644
--- a/k8-deployments/db-deployment.yaml
+++ b/k8-deployments/db-deployment.yaml
@@ -15,6 +15,7 @@ spec:
metadata:
labels:
app: santa-db
+ version: blue
spec:
containers:
- name: mysql
From a2916c449740f1357996bb412d42ed131a159fdc Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Fri, 2 May 2025 20:14:05 +0530
Subject: [PATCH 36/37] Update app-deployment.yaml
---
k8-deployments/app-deployment.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
index 4ca0fcc..7d54dca 100644
--- a/k8-deployments/app-deployment.yaml
+++ b/k8-deployments/app-deployment.yaml
@@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: santa
- image: secretesanta-generator:v1.0.0
+ image: secretesanta-generator:v1.1.0
ports:
- containerPort: 8080
env:
From cf5b5614a9e4ba436eb5fd9c6f33ac124ae1c4f9 Mon Sep 17 00:00:00 2001
From: Sunil Gowda S <64064177+sunil3gs98@users.noreply.github.com>
Date: Sat, 3 May 2025 20:51:20 +0530
Subject: [PATCH 37/37] Update app-deployment.yaml
---
k8-deployments/app-deployment.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8-deployments/app-deployment.yaml b/k8-deployments/app-deployment.yaml
index 7d54dca..91f6243 100644
--- a/k8-deployments/app-deployment.yaml
+++ b/k8-deployments/app-deployment.yaml
@@ -19,7 +19,7 @@ spec:
spec:
containers:
- name: santa
- image: secretesanta-generator:v1.1.0
+ image: sunil3gs98/secretesanta-generator:v1.1.0
ports:
- containerPort: 8080
env: