This commit is contained in:
Ubuntu 2025-05-28 13:51:17 +00:00
parent a99d8fb6ce
commit 542718f644
10 changed files with 585 additions and 3 deletions

View File

@ -2,6 +2,8 @@ plugins {
id 'org.springframework.boot' version '3.4.0' apply false
//id 'io.spring.dependency-management' version '1.1.6' apply false
id 'java'
id "org.sonarqube" version "5.0.0.4638" apply false
}
allprojects {
@ -15,6 +17,13 @@ subprojects {
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: 'org.sonarqube'
apply plugin: 'jacoco' // JaCoCo
jacoco {
toolVersion = "0.8.11" // JaCoCo
}
repositories {
mavenCentral()
}
@ -42,6 +51,9 @@ subprojects {
// Lombok for Tests
testCompileOnly 'org.projectlombok:lombok'
testAnnotationProcessor 'org.projectlombok:lombok'
// Actuator
implementation 'org.springframework.boot:spring-boot-starter-actuator'
}
// Test Configuration
@ -58,6 +70,29 @@ subprojects {
include '**/*Test.class'
testLogging {
events "passed", "skipped", "failed"
}
finalizedBy jacocoTestReport // JaCoCo
}
jacocoTestReport {
dependsOn test
reports {
xml.required = true // SonarQube XML
csv.required = false
html.required = true
html.outputLocation = layout.buildDirectory.dir("jacocoHtml").get().asFile
}
afterEvaluate {
classDirectories.setFrom(files(classDirectories.files.collect {
fileTree(dir: it, exclude: [
"**/config/**", //
"**/entity/**", //
"**/dto/**", // DTO
"**/*Application.class", //
"**/exception/**" //
])
}))
}
}
}

186
deployment/Jenkinsfile vendored Normal file
View File

@ -0,0 +1,186 @@
def PIPELINE_ID = "${env.BUILD_NUMBER}"
def getImageTag() {
def dateFormat = new java.text.SimpleDateFormat('yyyyMMddHHmmss')
def currentDate = new Date()
return dateFormat.format(currentDate)
}
podTemplate(
label: "${PIPELINE_ID}",
serviceAccount: 'jenkins',
containers: [
containerTemplate(name: 'podman', image: "mgoltzsche/podman", ttyEnabled: true, command: 'cat', privileged: true),
containerTemplate(name: 'gradle',
image: 'gradle:jdk17',
ttyEnabled: true,
command: 'cat',
envVars: [
envVar(key: 'DOCKER_HOST', value: 'unix:///run/podman/podman.sock'),
envVar(key: 'TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE', value: '/run/podman/podman.sock'),
envVar(key: 'TESTCONTAINERS_RYUK_DISABLED', value: 'true')
]),
containerTemplate(name: 'azure-cli', image: 'hiondal/azure-kubectl:latest', command: 'cat', ttyEnabled: true),
containerTemplate(name: 'envsubst', image: "hiondal/envsubst", command: 'sleep', args: '1h')
],
volumes: [
emptyDirVolume(mountPath: '/home/gradle/.gradle', memory: false),
emptyDirVolume(mountPath: '/root/.azure', memory: false),
emptyDirVolume(mountPath: '/run/podman', memory: false)
]
) {
node(PIPELINE_ID) {
def props
def imageTag = getImageTag()
def manifest = "deploy.yaml"
def namespace
def services = ['member', 'mysub', 'recommend']
stage("Get Source") {
checkout scm
props = readProperties file: "deployment/deploy_env_vars"
namespace = "${props.namespace}"
}
stage("Setup AKS") {
container('azure-cli') {
withCredentials([azureServicePrincipal('azure-credentials')]) {
sh """
az login --service-principal -u \$AZURE_CLIENT_ID -p \$AZURE_CLIENT_SECRET -t \$AZURE_TENANT_ID
az aks get-credentials --resource-group rg-digitalgarage-01 --name aks-digitalgarage-01 --overwrite-existing
kubectl create namespace ${namespace} --dry-run=client -o yaml | kubectl apply -f -
"""
}
}
}
stage('Build Applications & SonarQube Analysis') {
container('podman') {
sh 'podman system service -t 0 unix:///run/podman/podman.sock & sleep 2'
}
container('gradle') {
def testContainersConfig = '''docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
docker.host=unix:///run/podman/podman.sock
ryuk.container.privileged=true
testcontainers.reuse.enable=true'''
sh """
# TestContainers 설정
mkdir -p member/src/test/resources mysub-infra/src/test/resources recommend/src/test/resources
echo '${testContainersConfig}' > member/src/test/resources/testcontainers.properties
echo '${testContainersConfig}' > mysub-infra/src/test/resources/testcontainers.properties
echo '${testContainersConfig}' > recommend/src/test/resources/testcontainers.properties
"""
// 빌드 및 SonarQube 분석
withSonarQubeEnv('SonarQube') {
sh """
chmod +x gradlew
# 빌드 실행
./gradlew :member:build :mysub-infra:build :recommend:build -x test
# Member 서비스
./gradlew :member:test :member:jacocoTestReport :member:sonar \
-Dsonar.projectKey=lifesub-member-dg0400 \
-Dsonar.projectName=lifesub-member \
-Dsonar.java.binaries=build/classes/java/main \
-Dsonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml \
-Dsonar.exclusions=**/config/**,**/entity/**,**/dto/**,**/*Application.class,**/exception/**
# Recommend 서비스
./gradlew :recommend:test :recommend:jacocoTestReport :recommend:sonar \
-Dsonar.projectKey=lifesub-recommend-dg0400 \
-Dsonar.projectName=lifesub-recommend \
-Dsonar.java.binaries=build/classes/java/main \
-Dsonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml \
-Dsonar.exclusions=**/config/**,**/entity/**,**/dto/**,**/*Application.class,**/exception/**
# Mysub 서비스 (biz & infra 구조)
./gradlew :mysub-infra:test :mysub-infra:jacocoTestReport :mysub-infra:sonar \
-Dsonar.projectKey=lifesub-mysub-dg0400 \
-Dsonar.projectName=lifesub-mysub \
-Dsonar.java.binaries=build/classes/java/main \
-Dsonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml \
-Dsonar.exclusions=**/config/**,**/entity/**,**/dto/**,**/*Application.class,**/exception/**
"""
}
}
}
stage('Quality Gate') {
timeout(time: 10, unit: 'MINUTES') {
def qg = waitForQualityGate()
if (qg.status != 'OK') {
error "Pipeline aborted due to quality gate failure: ${qg.status}"
}
}
}
stage('Build & Push Images') {
container('podman') {
withCredentials([usernamePassword(
credentialsId: 'acr-credentials',
usernameVariable: 'USERNAME',
passwordVariable: 'PASSWORD'
)]) {
sh "podman login ${props.registry} --username \$USERNAME --password \$PASSWORD"
services.each { service ->
def buildDir = service == 'mysub' ? 'mysub-infra' : service
def jarFile = service == 'mysub' ? 'mysub.jar' : "${service}.jar"
sh """
podman build \
--build-arg BUILD_LIB_DIR="${buildDir}/build/libs" \
--build-arg ARTIFACTORY_FILE="${jarFile}" \
-f deployment/container/Dockerfile \
-t ${props.registry}/${props.image_org}/${service}:${imageTag} .
podman push ${props.registry}/${props.image_org}/${service}:${imageTag}
"""
}
}
}
}
stage('Generate & Apply Manifest') {
container('envsubst') {
sh """
export namespace=${namespace}
export allowed_origins=${props.allowed_origins}
export jwt_secret_key=${props.jwt_secret_key}
export postgres_user=${props.postgres_user}
export postgres_password=${props.postgres_password}
export replicas=${props.replicas}
export resources_requests_cpu=${props.resources_requests_cpu}
export resources_requests_memory=${props.resources_requests_memory}
export resources_limits_cpu=${props.resources_limits_cpu}
export resources_limits_memory=${props.resources_limits_memory}
# 이미지 경로 환경변수 설정
export member_image_path=${props.registry}/${props.image_org}/member:${imageTag}
export mysub_image_path=${props.registry}/${props.image_org}/mysub:${imageTag}
export recommend_image_path=${props.registry}/${props.image_org}/recommend:${imageTag}
# manifest 생성
envsubst < deployment/${manifest}.template > deployment/${manifest}
echo "Generated manifest file:"
cat deployment/${manifest}
"""
}
container('azure-cli') {
sh """
kubectl apply -f deployment/${manifest}
echo "Waiting for deployments to be ready..."
kubectl -n ${namespace} wait --for=condition=available deployment/member --timeout=300s
kubectl -n ${namespace} wait --for=condition=available deployment/mysub --timeout=300s
kubectl -n ${namespace} wait --for=condition=available deployment/recommend --timeout=300s
"""
}
}
}
}

View File

@ -0,0 +1,290 @@
# ConfigMap
apiVersion: v1
kind: ConfigMap
metadata:
name: common-config
namespace: ${namespace}
data:
ALLOWED_ORIGINS: ${allowed_origins}
JPA_DDL_AUTO: "update"
JPA_SHOW_SQL: "true"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: member-config
namespace: ${namespace}
data:
SERVER_PORT: "8081"
POSTGRES_HOST: "postgres-member-postgresql"
POSTGRES_PORT: "5432"
POSTGRES_DB: "member"
JWT_ACCESS_TOKEN_VALIDITY: "3600000"
JWT_REFRESH_TOKEN_VALIDITY: "86400000"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: mysub-config
namespace: ${namespace}
data:
SERVER_PORT: "8082"
POSTGRES_HOST: "postgres-mysub-postgresql"
POSTGRES_PORT: "5432"
POSTGRES_DB: "mysub"
FEE_LEVEL_COLLECTOR: "50000"
FEE_LEVEL_ADDICT: "100000"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: recommend-config
namespace: ${namespace}
data:
SERVER_PORT: "8083"
POSTGRES_HOST: "postgres-recommend-postgresql"
POSTGRES_PORT: "5432"
POSTGRES_DB: "recommend"
---
# Secrets
apiVersion: v1
kind: Secret
metadata:
name: common-secret
namespace: ${namespace}
type: Opaque
stringData:
JWT_SECRET_KEY: ${jwt_secret_key}
---
apiVersion: v1
kind: Secret
metadata:
name: database-secret
namespace: ${namespace}
type: Opaque
stringData:
POSTGRES_USER: ${postgres_user}
POSTGRES_PASSWORD: ${postgres_password}
---
# Deployments
apiVersion: apps/v1
kind: Deployment
metadata:
name: member
namespace: ${namespace}
labels:
app: member
spec:
replicas: ${replicas}
selector:
matchLabels:
app: member
template:
metadata:
labels:
app: member
spec:
imagePullSecrets:
- name: acr-secret
containers:
- name: member
image: ${member_image_path}
imagePullPolicy: Always
ports:
- containerPort: 8081
resources:
requests:
cpu: ${resources_requests_cpu}
memory: ${resources_requests_memory}
limits:
cpu: ${resources_limits_cpu}
memory: ${resources_limits_memory}
envFrom:
- configMapRef:
name: common-config
- configMapRef:
name: member-config
- secretRef:
name: common-secret
- secretRef:
name: database-secret
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: mysub
namespace: ${namespace}
labels:
app: mysub
spec:
replicas: ${replicas}
selector:
matchLabels:
app: mysub
template:
metadata:
labels:
app: mysub
spec:
imagePullSecrets:
- name: acr-secret
containers:
- name: mysub
image: ${mysub_image_path}
imagePullPolicy: Always
ports:
- containerPort: 8082
resources:
requests:
cpu: ${resources_requests_cpu}
memory: ${resources_requests_memory}
limits:
cpu: ${resources_limits_cpu}
memory: ${resources_limits_memory}
envFrom:
- configMapRef:
name: common-config
- configMapRef:
name: mysub-config
- secretRef:
name: common-secret
- secretRef:
name: database-secret
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: recommend
namespace: ${namespace}
labels:
app: recommend
spec:
replicas: ${replicas}
selector:
matchLabels:
app: recommend
template:
metadata:
labels:
app: recommend
spec:
imagePullSecrets:
- name: acr-secret
containers:
- name: recommend
image: ${recommend_image_path}
imagePullPolicy: Always
ports:
- containerPort: 8083
resources:
requests:
cpu: ${resources_requests_cpu}
memory: ${resources_requests_memory}
limits:
cpu: ${resources_limits_cpu}
memory: ${resources_limits_memory}
envFrom:
- configMapRef:
name: common-config
- configMapRef:
name: recommend-config
- secretRef:
name: common-secret
- secretRef:
name: database-secret
---
# Services
apiVersion: v1
kind: Service
metadata:
name: member-service
namespace: ${namespace}
labels:
app: member
spec:
type: ClusterIP
ports:
- port: 80
targetPort: 8081
protocol: TCP
selector:
app: member
---
apiVersion: v1
kind: Service
metadata:
name: mysub-service
namespace: ${namespace}
labels:
app: mysub
spec:
type: ClusterIP
ports:
- port: 80
targetPort: 8082
protocol: TCP
selector:
app: mysub
---
apiVersion: v1
kind: Service
metadata:
name: recommend-service
namespace: ${namespace}
labels:
app: recommend
spec:
type: ClusterIP
ports:
- port: 80
targetPort: 8083
protocol: TCP
selector:
app: recommend
---
# Ingress
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: backend-ingress
namespace: ${namespace}
annotations:
kubernetes.io/ingress.class: nginx
spec:
rules:
- host: dg0400.20.214.196.128.nip.io
http:
paths:
- path: /api/auth
pathType: Prefix
backend:
service:
name: member-service
port:
number: 80
- path: /api/mysub
pathType: Prefix
backend:
service:
name: mysub-service
port:
number: 80
- path: /api/recommend
pathType: Prefix
backend:
service:
name: recommend-service
port:
number: 80

View File

@ -0,0 +1,23 @@
# Team Settings
teamid=dg0400
root_project=lifesub
namespace=dg0400-lifesub-ns
# Container Registry Settings
registry=acrdigitalgarage01.azurecr.io
image_org=dg0400
# Application Settings
replicas=1
allowed_origins=http://20.214.195.54
# Security Settings
jwt_secret_key=8O2HQ13etL2BWZvYOiWsJ5uWFoLi6NBUG8divYVoCgtHVvlk3dqRksMl16toztDUeBTSIuOOPvHIrYq11G2BwQ
postgres_user=dg0400
postgres_password=Hi5Jessica!
# Resource Settings
resources_requests_cpu=256m
resources_requests_memory=256Mi
resources_limits_cpu=1024m
resources_limits_memory=1024Mi

View File

@ -62,7 +62,7 @@ public class SecurityConfig {
)
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(auth -> auth
.requestMatchers(HttpMethod.GET, "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**").permitAll()
.requestMatchers(HttpMethod.GET, "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**", "/actuator/**").permitAll()
.requestMatchers(HttpMethod.POST, "/api/auth/**").permitAll()
.anyRequest().authenticated()
)

View File

@ -35,3 +35,19 @@ logging:
level:
com.unicorn: DEBUG
org.hibernate.SQL: TRACE
# Actuator 설정
management:
endpoints:
web:
exposure:
include: health,info,metrics,prometheus
endpoint:
health:
show-details: always
probes:
enabled: true
health:
livenessState:
enabled: true
readinessState:
enabled: true

View File

@ -48,7 +48,7 @@ public class SecurityConfig {
)
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(auth -> auth
.requestMatchers("/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs.yaml", "/v3/api-docs/**").permitAll()
.requestMatchers("/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs.yaml", "/v3/api-docs/**", "/actuator/**").permitAll()
.anyRequest().authenticated()
)
.sessionManagement(session -> session

View File

@ -39,3 +39,19 @@ logging:
level:
com.unicorn: DEBUG
org.hibernate.SQL: TRACE
# Actuator 설정
management:
endpoints:
web:
exposure:
include: health,info,metrics,prometheus
endpoint:
health:
show-details: always
probes:
enabled: true
health:
livenessState:
enabled: true
readinessState:
enabled: true

View File

@ -39,7 +39,7 @@ public class SecurityConfig {
)
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(auth -> auth
.requestMatchers("/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs.yaml", "/v3/api-docs/**").permitAll()
.requestMatchers("/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs.yaml", "/v3/api-docs/**", "/actuator/**").permitAll()
.anyRequest().authenticated()
)
.sessionManagement(session -> session

View File

@ -33,3 +33,19 @@ logging:
com.unicorn: DEBUG
org.hibernate.SQL: TRACE
# Actuator 설정
management:
endpoints:
web:
exposure:
include: health,info,metrics,prometheus
endpoint:
health:
show-details: always
probes:
enabled: true
health:
livenessState:
enabled: true
readinessState:
enabled: true