shared-dg04-Won/smarketing-backend
2
0
Fork 0
mirror of https://github.com/won-ktds/smarketing-backend.git synced 2025-12-06 07:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/won-ktds/smarketing-backend into poster-content

Browse Source
This commit is contained in:
yuhalog 2025-06-19 09:21:07 +09:00
commit 747c4a5210
4 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
smarketing-ai/deployment/Jenkinsfile vendored
View File

@ -35,24 +35,24 @@ podTemplate(
echo "Team ID: ${props.teamid}" echo "Team ID: ${props.teamid}"
} }
// stage("Check Changes") { stage("Check Changes") {
// script { script {
// def changes = sh( def changes = sh(
// script: "git diff --name-only HEAD~1 HEAD", script: "git diff --name-only HEAD~1 HEAD",
// returnStdout: true returnStdout: true
// ).trim() ).trim()
//
// echo "Changed files: ${changes}" echo "Changed files: ${changes}"
//
// if (!changes.contains("smarketing-ai/")) { if (!changes.contains("smarketing-ai/")) {
// echo "No changes in smarketing-ai, skipping build" echo "No changes in smarketing-ai, skipping build"
// currentBuild.result = 'SUCCESS' currentBuild.result = 'SUCCESS'
// error("Stopping pipeline - no changes detected") error("Stopping pipeline - no changes detected")
// } }
//
// echo "Changes detected in smarketing-ai, proceeding with build" echo "Changes detected in smarketing-ai, proceeding with build"
// } }
// } }
stage("Setup AKS") { stage("Setup AKS") {
container('azure-cli') { container('azure-cli') {

32
smarketing-java/deployment/Jenkinsfile vendored
View File

@ -43,22 +43,22 @@ podTemplate(
echo "Image Org: ${props.image_org}" echo "Image Org: ${props.image_org}"
} }
// stage("Check Changes") { stage("Check Changes") {
// script { script {
// def changes = sh( def changes = sh(
// script: "git diff --name-only HEAD~1 HEAD", script: "git diff --name-only HEAD~1 HEAD",
// returnStdout: true returnStdout: true
// ).trim() ).trim()
//
// if (!changes.contains("smarketing-java/")) { if (!changes.contains("smarketing-java/")) {
// echo "No changes in smarketing-java, skipping build" echo "No changes in smarketing-java, skipping build"
// currentBuild.result = 'SUCCESS' currentBuild.result = 'SUCCESS'
// error("Stopping pipeline - no changes detected") error("Stopping pipeline - no changes detected")
// } }
//
// echo "Changes detected in smarketing-java, proceeding with build" echo "Changes detected in smarketing-java, proceeding with build"
// } }
// } }
stage("Setup AKS") { stage("Setup AKS") {
container('azure-cli') { container('azure-cli') {

15
smarketing-java/deployment/deploy.yaml.template
View File

@ -377,11 +377,11 @@ apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: smarketing-ingress name: smarketing-ingress
namespace: ${namespace}
annotations: annotations:
kubernetes.io/ingress.class: nginx kubernetes.io/ingress.class: nginx
# nginx.ingress.kubernetes.io/rewrite-target: /$2 # 이 줄 제거
# nginx.ingress.kubernetes.io/use-regex: "true" # 이 줄 제거
spec: spec:
ingressClassName: nginx
rules: rules:
- host: smarketing.20.249.184.228.nip.io - host: smarketing.20.249.184.228.nip.io
http: http:
@ -390,27 +390,28 @@ spec:
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: auth-service name: member
port: port:
number: 80 number: 80
- path: /api/store - path: /api/store
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: store-service name: store
port: port:
number: 80 number: 80
- path: /api/content - path: /api/content
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: content-service name: marketing-content
port: port:
number: 80 number: 80
- path: /api/recommend - path: /api/recommend
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: recommend-service name: ai-recommend
port: port:
number: 80 number: 80

1
smarketing-java/deployment/deploy_env_vars
View File

@ -8,6 +8,7 @@ registry=acrdigitalgarage02.azurecr.io
image_org=smarketing image_org=smarketing
# Application Settings # Application Settings
ingress_host=smarketing.20.249.184.228.nip.io
replicas=1 replicas=1
allowed_origins=http://20.249.154.194 allowed_origins=http://20.249.154.194