Merge remote-tracking branch 'github/main'

jd-opensource · May 16, 2024 · 4bbf03f · 4bbf03f
2 parents 1b8a33b + 7b355d2
commit 4bbf03f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 6 deletions.
diff --git a/joylive-demo/ab.yaml → joylive-demo/deploy/ab.yaml b/joylive-demo/ab.yaml → joylive-demo/deploy/ab.yaml
diff --git a/joylive-demo/deploy/nacos.yaml b/joylive-demo/deploy/nacos.yaml
@@ -0,0 +1,40 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nacos-server
+  labels:
+    app: nacos-server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nacos-server
+  template:
+    metadata:
+      labels:
+        app: nacos-server
+    spec:
+      containers:
+        - name: nacos-server
+          image: nacos/nacos-server:latest
+          ports:
+            - containerPort: 8848
+          env:
+            - name: MODE
+              value: "standalone"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nacos-server
+spec:
+  type: NodePort
+  selector:
+    app: nacos-server
+  ports:
+    - name: http
+      port: 8848
+      targetPort: 8848
+    - name: grpc
+      port: 9848
+      targetPort: 9848
diff --git a/joylive-demo/joylive-demo-springcloud3/joylive-demo-springcloud3-consumer/deployment.yaml b/joylive-demo/joylive-demo-springcloud3/joylive-demo-springcloud3-consumer/deployment.yaml
@@ -34,7 +34,7 @@ spec:
       containers:
         - env:
             - name: NACOS_ADDR
-              value: nacos.default.svc:8848
+              value: nacos-server.nacos.svc:8848
             - name: NACOS_USERNAME
               value: nacos
             - name: NACOS_PASSWORD
@@ -101,7 +101,7 @@ spec:
       containers:
         - env:
             - name: NACOS_ADDR
-              value: nacos.default.svc:8848
+              value: nacos-server.nacos.svc:8848
             - name: NACOS_USERNAME
               value: nacos
             - name: NACOS_PASSWORD

diff --git a/joylive-demo/joylive-demo-springcloud3/joylive-demo-springcloud3-gateway/deployment.yaml b/joylive-demo/joylive-demo-springcloud3/joylive-demo-springcloud3-gateway/deployment.yaml
@@ -34,7 +34,7 @@ spec:
       containers:
         - env:
             - name: NACOS_ADDR
-              value: nacos.default.svc:8848
+              value: nacos-server.nacos.svc:8848
             - name: NACOS_USERNAME
               value: nacos
             - name: NACOS_PASSWORD
@@ -111,7 +111,7 @@ spec:
       containers:
         - env:
             - name: NACOS_ADDR
-              value: nacos.default.svc:8848
+              value: nacos-server.nacos.svc:8848
             - name: NACOS_USERNAME
               value: nacos
             - name: NACOS_PASSWORD

diff --git a/joylive-demo/joylive-demo-springcloud3/joylive-demo-springcloud3-provider/deployment.yaml b/joylive-demo/joylive-demo-springcloud3/joylive-demo-springcloud3-provider/deployment.yaml
@@ -34,7 +34,7 @@ spec:
       containers:
         - env:
             - name: NACOS_ADDR
-              value: nacos.default.svc:8848
+              value: nacos-server.nacos.svc:8848
             - name: NACOS_USERNAME
               value: nacos
             - name: NACOS_PASSWORD
@@ -101,7 +101,7 @@ spec:
       containers:
         - env:
             - name: NACOS_ADDR
-              value: nacos.default.svc:8848
+              value: nacos-server.nacos.svc:8848
             - name: NACOS_USERNAME
               value: nacos
             - name: NACOS_PASSWORD