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

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') {

smarketing-java/deployment/deploy.yaml.template

@@ -377,11 +377,11 @@ 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:
+  ingressClassName: nginx
   rules:
     - host: smarketing.20.249.184.228.nip.io
       http:
@@ -390,27 +390,28 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: auth-service
+                name: member
                 port:
                   number: 80
           - path: /api/store
             pathType: Prefix
             backend:
               service:
-                name: store-service
+                name: store
                 port:
                   number: 80
           - path: /api/content
             pathType: Prefix
             backend:
               service:
-                name: content-service
+                name: marketing-content
                 port:
                   number: 80
           - path: /api/recommend
             pathType: Prefix
             backend:
               service:
-                name: recommend-service
+                name: ai-recommend
                 port:
-                  number: 80
+                  number: 80
+

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