From dc5d31442bac6198c662e6ea5e1c29b97ed92e22 Mon Sep 17 00:00:00 2001 From: OhSeongRak Date: Wed, 18 Jun 2025 17:47:36 +0900 Subject: [PATCH 1/6] refactor: Jenkinsfile v2 --- smarketing-ai/deployment/Jenkinsfile | 36 +++++++++++++------------- smarketing-java/deployment/Jenkinsfile | 32 +++++++++++------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/smarketing-ai/deployment/Jenkinsfile b/smarketing-ai/deployment/Jenkinsfile index 912d946..e55f855 100644 --- a/smarketing-ai/deployment/Jenkinsfile +++ b/smarketing-ai/deployment/Jenkinsfile @@ -35,24 +35,24 @@ podTemplate( echo "Team ID: ${props.teamid}" } -// stage("Check Changes") { -// script { -// def changes = sh( -// script: "git diff --name-only HEAD~1 HEAD", -// returnStdout: true -// ).trim() -// -// echo "Changed files: ${changes}" -// -// if (!changes.contains("smarketing-ai/")) { -// echo "No changes in smarketing-ai, skipping build" -// currentBuild.result = 'SUCCESS' -// error("Stopping pipeline - no changes detected") -// } -// -// echo "Changes detected in smarketing-ai, proceeding with build" -// } -// } + stage("Check Changes") { + script { + def changes = sh( + script: "git diff --name-only HEAD~1 HEAD", + returnStdout: true + ).trim() + + echo "Changed files: ${changes}" + + if (!changes.contains("smarketing-ai/")) { + echo "No changes in smarketing-ai, skipping build" + currentBuild.result = 'SUCCESS' + error("Stopping pipeline - no changes detected") + } + + echo "Changes detected in smarketing-ai, proceeding with build" + } + } stage("Setup AKS") { container('azure-cli') { diff --git a/smarketing-java/deployment/Jenkinsfile b/smarketing-java/deployment/Jenkinsfile index 26ced99..a84cf56 100644 --- a/smarketing-java/deployment/Jenkinsfile +++ b/smarketing-java/deployment/Jenkinsfile @@ -43,22 +43,22 @@ podTemplate( echo "Image Org: ${props.image_org}" } -// stage("Check Changes") { -// script { -// def changes = sh( -// script: "git diff --name-only HEAD~1 HEAD", -// returnStdout: true -// ).trim() -// -// if (!changes.contains("smarketing-java/")) { -// echo "No changes in smarketing-java, skipping build" -// currentBuild.result = 'SUCCESS' -// error("Stopping pipeline - no changes detected") -// } -// -// echo "Changes detected in smarketing-java, proceeding with build" -// } -// } + stage("Check Changes") { + script { + def changes = sh( + script: "git diff --name-only HEAD~1 HEAD", + returnStdout: true + ).trim() + + if (!changes.contains("smarketing-java/")) { + echo "No changes in smarketing-java, skipping build" + currentBuild.result = 'SUCCESS' + error("Stopping pipeline - no changes detected") + } + + echo "Changes detected in smarketing-java, proceeding with build" + } + } stage("Setup AKS") { container('azure-cli') { From de9b6c7142ffa664f24e17031aff94d2b2355f0e Mon Sep 17 00:00:00 2001 From: OhSeongRak Date: Wed, 18 Jun 2025 18:12:11 +0900 Subject: [PATCH 2/6] refactor: ingress namespace --- smarketing-java/deployment/deploy.yaml.template | 3 ++- smarketing-java/deployment/deploy_env_vars | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/smarketing-java/deployment/deploy.yaml.template b/smarketing-java/deployment/deploy.yaml.template index 04836c2..fd5df45 100644 --- a/smarketing-java/deployment/deploy.yaml.template +++ b/smarketing-java/deployment/deploy.yaml.template @@ -377,13 +377,14 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: smarketing-ingress + namespace: ${namespace} annotations: kubernetes.io/ingress.class: nginx # nginx.ingress.kubernetes.io/rewrite-target: /$2 # 이 줄 제거 # nginx.ingress.kubernetes.io/use-regex: "true" # 이 줄 제거 spec: rules: - - host: smarketing.20.249.184.228.nip.io + - host: ${ingress_host} http: paths: - path: /api/auth diff --git a/smarketing-java/deployment/deploy_env_vars b/smarketing-java/deployment/deploy_env_vars index 6cfb19e..5e90919 100644 --- a/smarketing-java/deployment/deploy_env_vars +++ b/smarketing-java/deployment/deploy_env_vars @@ -8,6 +8,7 @@ registry=acrdigitalgarage02.azurecr.io image_org=smarketing # Application Settings +ingress_host=smarketing.20.249.184.228.nip.io replicas=1 allowed_origins=http://20.249.154.194 From a6157bff26a5550862aff3ca70966bd6a3f72ca7 Mon Sep 17 00:00:00 2001 From: OhSeongRak Date: Wed, 18 Jun 2025 18:24:09 +0900 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20ingress=20=EC=B5=9C=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deployment/deploy.yaml.template | 76 +++++++++---------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/smarketing-java/deployment/deploy.yaml.template b/smarketing-java/deployment/deploy.yaml.template index fd5df45..ee6cf84 100644 --- a/smarketing-java/deployment/deploy.yaml.template +++ b/smarketing-java/deployment/deploy.yaml.template @@ -373,45 +373,37 @@ spec: type: ClusterIP --- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: smarketing-ingress - namespace: ${namespace} - annotations: - kubernetes.io/ingress.class: nginx - # nginx.ingress.kubernetes.io/rewrite-target: /$2 # 이 줄 제거 - # nginx.ingress.kubernetes.io/use-regex: "true" # 이 줄 제거 -spec: - rules: - - host: ${ingress_host} - http: - paths: - - path: /api/auth - pathType: Prefix - backend: - service: - name: auth-service - port: - number: 80 - - path: /api/store - pathType: Prefix - backend: - service: - name: store-service - port: - number: 80 - - path: /api/content - pathType: Prefix - backend: - service: - name: content-service - port: - number: 80 - - path: /api/recommend - pathType: Prefix - backend: - service: - name: recommend-service - port: - number: 80 \ No newline at end of file + + paths: + - backend: + service: + name: member + port: + number: 80 + path: /api/auth + pathType: Prefix + - backend: + service: + name: store + port: + number: 80 + path: /api/store + pathType: Prefix + - backend: + service: + name: marketing-content + port: + number: 80 + path: /api/content + pathType: Prefix + - backend: + service: + name: ai-recommend + port: + number: 80 + path: /api/recommend + pathType: Prefix +status: + loadBalancer: + ingress: + - ip: 20.249.184.228 From 90922194993c8c5eeebd989033ee7c003eb0e546 Mon Sep 17 00:00:00 2001 From: OhSeongRak Date: Wed, 18 Jun 2025 18:31:53 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20ingress=20=EC=B5=9C=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deployment/deploy.yaml.template | 74 ++++++++++--------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/smarketing-java/deployment/deploy.yaml.template b/smarketing-java/deployment/deploy.yaml.template index ee6cf84..a17dae6 100644 --- a/smarketing-java/deployment/deploy.yaml.template +++ b/smarketing-java/deployment/deploy.yaml.template @@ -373,37 +373,43 @@ spec: type: ClusterIP --- - - paths: - - backend: - service: - name: member - port: - number: 80 - path: /api/auth - pathType: Prefix - - backend: - service: - name: store - port: - number: 80 - path: /api/store - pathType: Prefix - - backend: - service: - name: marketing-content - port: - number: 80 - path: /api/content - pathType: Prefix - - backend: - service: - name: ai-recommend - port: - number: 80 - path: /api/recommend - pathType: Prefix -status: - loadBalancer: - ingress: - - ip: 20.249.184.228 +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: smarketing-ingress + annotations: + kubernetes.io/ingress.class: nginx +spec: + ingressClassName: nginx + rules: + - host: smarketing.20.249.184.228.nip.io + http: + paths: + - path: /api/auth + pathType: Prefix + backend: + service: + name: member + port: + number: 80 + - path: /api/store + pathType: Prefix + backend: + service: + name: store + port: + number: 80 + - path: /api/content + pathType: Prefix + backend: + service: + name: marketing-content + port: + number: 80 + - path: /api/recommend + pathType: Prefix + backend: + service: + name: ai-recommend + port: + number: 80 From a6599438e9d7f053ef06c629289a11acc80ceb4a Mon Sep 17 00:00:00 2001 From: OhSeongRak Date: Wed, 18 Jun 2025 18:39:24 +0900 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20ingress=20=EC=A7=84=EC=A7=9C?= =?UTF-8?q?=EC=B5=9C=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- smarketing-java/deployment/deploy.yaml.template | 1 + 1 file changed, 1 insertion(+) diff --git a/smarketing-java/deployment/deploy.yaml.template b/smarketing-java/deployment/deploy.yaml.template index a17dae6..78cc468 100644 --- a/smarketing-java/deployment/deploy.yaml.template +++ b/smarketing-java/deployment/deploy.yaml.template @@ -413,3 +413,4 @@ spec: name: ai-recommend port: number: 80 + From 8e87c05af0fa75d1be1da62457336a23249d3061 Mon Sep 17 00:00:00 2001 From: yuhalog <62270401+yuhalog@users.noreply.github.com> Date: Thu, 19 Jun 2025 09:09:55 +0900 Subject: [PATCH 6/6] Update deploy.yaml.template --- smarketing-java/deployment/deploy.yaml.template | 1 + 1 file changed, 1 insertion(+) diff --git a/smarketing-java/deployment/deploy.yaml.template b/smarketing-java/deployment/deploy.yaml.template index 78cc468..1f54a76 100644 --- a/smarketing-java/deployment/deploy.yaml.template +++ b/smarketing-java/deployment/deploy.yaml.template @@ -377,6 +377,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: smarketing-ingress + namespace: ${namespace} annotations: kubernetes.io/ingress.class: nginx spec: