merge

Dockerfile-app

@@ -1,4 +1,4 @@
 FROM openjdk:21-jdk
 MAINTAINER egcodes
-COPY target/hsw-1.0.0.jar ./
-ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-Djava.security.egd=file:/dev/./urandom","-jar","/hsw-1.0.0.jar"]
+COPY target/hsw-0.7.2.jar ./
+ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-Djava.security.egd=file:/dev/./urandom","-jar","/hsw-0.7.2.jar"]

README.md

@@ -1,3 +1,7 @@
+# HSW BE Service
+
+Site: https://www.hackerupdates.com
+
 <img src="images/architecture.png">
 
 ## Used libraries
@@ -7,7 +11,7 @@
 * spring-boot-starter-security
 * spring-boot-starter-cache
 * spring-boot-starter-test
-* springfox-swagger-ui
+* springdoc-openapi
 * mapstruct
 * h2
 * Lombok
@@ -47,3 +51,7 @@ $ kubectl apply -f kube-postgres.yaml
 $ kubectl apply -f kube-hsw.yaml
 $ kubectl apply -f kube-nginx.yaml
 ```
+
+## Screenshots
+<img src="images/web-dark.png" width="600">
+<img src="images/web-light.png" width="600">

docker-compose.yml

@@ -21,6 +21,10 @@ services:
       - web_network
     depends_on:
       - hsw-service
+  redis-service:
+    image: redis:latest
+    networks:
+      - db_network
   postgres-service:
     image: postgres:latest
     volumes:

kube-hsw.yaml

@@ -22,16 +22,32 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hsw-service
+  labels:
+    app: hsw
 spec:
   selector:
     app: hsw
   ports:
     - protocol: TCP
+      name: http-traffic
       port: 8080
       targetPort: 8080
 
 ---
 
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: hsw-service-monitor
+spec:
+  selector:
+    matchLabels:
+      app: hsw
+  endpoints:
+    - port: http-traffic
+      path: "/api/actuator/prometheus"
+
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -48,10 +64,16 @@ spec:
     spec:
       containers:
         - name: hsw
-          image: hsw:latest
+          image: hsw:0.7.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
+          readinessProbe:
+            httpGet:
+              path: /api/actuator/health
+              port: 8080
+            initialDelaySeconds: 25
+            periodSeconds: 5
       initContainers:
         - name: init-container
           image: busybox:latest

kube-nginx.yaml

@@ -21,7 +21,7 @@ kind: Deployment
 metadata:
   name: nginx
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: nginx
@@ -32,11 +32,17 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: nginx-hsw:latest
+          image: nginx-hsw:0.7.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 80
             - containerPort: 443
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: 80
+            initialDelaySeconds: 3
+            periodSeconds: 3
       initContainers:
         - name: init-container
           image: busybox:latest

kube-postgres-pvc.yaml

@@ -10,4 +10,22 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: 25Gi
+      storage: 25Gi
+
+---
+
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: postgres-volume
+  labels:
+    type: local
+    app: postgres
+spec:
+  storageClassName: manual
+  capacity:
+    storage: 25Gi
+  accessModes:
+    - ReadWriteMany
+  hostPath:
+    path: /data/postgresql

kube-postgres.yaml

@@ -18,7 +18,7 @@ kind: Deployment
 metadata:
   name: postgres
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: postgres

kube-redis-pvc.yaml

@@ -0,0 +1,31 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: redis-volume-claim
+  labels:
+    app: redis
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Gi
+
+---
+
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: redis-volume
+  labels:
+    type: local
+    app: redis
+spec:
+  capacity:
+    storage: 10Gi
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /data/redis

kube-redis.yaml

@@ -0,0 +1,41 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-service
+spec:
+  selector:
+    app: redis
+  type: NodePort
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+        - name: redis
+          image: redis:latest
+          ports:
+          - containerPort: 6379
+          volumeMounts:
+            - name: redisdata
+              mountPath: /data
+      volumes:
+        - name: redisdata
+          persistentVolumeClaim:
+            claimName: redis-volume-claim

nginx/hackerupdates.com.conf

@@ -35,5 +35,12 @@ server {
         proxy_pass http://hsw-service:8080;
     }
 
-
+    location /api/actuator {
+        deny all;
+        return 403;
+    }
+    location /api/swagger-ui/ {
+        deny all;
+        return 403;
+    }
 }

pom.xml

@@ -12,7 +12,7 @@
 
 	<groupId>com.hackerupdates</groupId>
 	<artifactId>hsw</artifactId>
-	<version>1.0.0</version>
+	<version>0.7.2</version>
 	<name>hsw</name>
 	<description>HackerUpdates</description>
 
@@ -39,12 +39,30 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-cache</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jasypt</groupId>
+			<artifactId>jasypt</artifactId>
+			<version>1.9.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.ben-manes.caffeine</groupId>
+			<artifactId>caffeine</artifactId>
+			<version>3.1.8</version>
+		</dependency>
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
@@ -57,14 +75,9 @@
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-boot-starter</artifactId>
-			<version>3.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>3.0.0</version>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>2.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.javacrumbs.shedlock</groupId>

src/main/java/com/hackerupdates/hsw/Application.java

@@ -2,15 +2,16 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@EnableScheduling
-@EnableAsync
-@EnableTransactionManagement
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class})
+//@EnableScheduling
+//@EnableCaching
+//@EnableAsync
+//@EnableTransactionManagement
+@SpringBootApplication
 public class Application {
 
 	public static void main(String[] args) {

src/main/java/com/hackerupdates/hsw/config/CacheConfig.java

@@ -0,0 +1,16 @@
+package com.hackerupdates.hsw.config;
+
+import com.hackerupdates.hsw.constants.Constant;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class CacheConfig {
+
+    @Bean
+    public CacheManager cacheManager() {
+        return new ConcurrentMapCacheManager(Constant.CACHE_NAME_FOR_TOKEN);
+    }
+}

src/main/java/com/hackerupdates/hsw/config/RedisConfig.java

@@ -0,0 +1,19 @@
+package com.hackerupdates.hsw.config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import java.time.Duration;
+
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(
+            RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(redisConnectionFactory);
+        return template;
+    }
+}