You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2022/12/20 07:47:12 UTC
[dubbo-samples] branch master updated: Enhance k8s deploy script in task (#644)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new cfe55132 Enhance k8s deploy script in task (#644)
cfe55132 is described below
commit cfe55132a3014eb5bb12cb90b45bd737740015cd
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Dec 20 15:47:05 2022 +0800
Enhance k8s deploy script in task (#644)
* Add k8s deploy script for rpc basic task
* Add k8s deploy script for rpc advanced task
* Update deploy script
* Update deploy script
---
10-task/dubbo-samples-rpc-advanced/deploy/All.yml | 292 +++++++++++++++++++--
10-task/dubbo-samples-rpc-advanced/deploy/App.yml | 274 +++++++++++++++++++
.../deploy/a/Deployment.yml | 34 ++-
.../deploy/b-v1/Deployment.yml | 34 ++-
.../deploy/b-v2/Deployment.yml | 34 ++-
.../deploy/c/Deployment.yml | 34 ++-
.../deploy/d/Deployment.yml | 34 ++-
.../Deployment.yml => dubbo-admin/ConfigMap.yml} | 36 +--
.../deploy/{a => dubbo-admin}/Deployment.yml | 29 +-
.../{c/Deployment.yml => dubbo-admin/Service.yml} | 32 +--
.../deploy/{c => skywalking}/Deployment.yml | 45 +++-
.../{c/Deployment.yml => skywalking/Service.yml} | 52 ++--
12 files changed, 786 insertions(+), 144 deletions(-)
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/All.yml b/10-task/dubbo-samples-rpc-advanced/deploy/All.yml
index 4cf12996..ef6069f1 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/All.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/All.yml
@@ -85,24 +85,173 @@ spec:
targetPort: 9848
---
+# Dubbo Admin
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: dubbo-admin
+ namespace: dubbo-system
+data:
+ # Set the properties you want to override, properties not set here will be using the default values
+ # check application.properties inside dubbo-admin project for the keys supported
+ application.properties: |
+ admin.registry.address=nacos://nacos.dubbo-system.svc:8848?username=nacos&password=nacos
+ admin.config-center=nacos://nacos.dubbo-system.svc:8848?username=nacos&password=nacos
+ admin.metadata-report.address=nacos://nacos.dubbo-system.svc:8848?username=nacos&password=nacos
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: dubbo-admin
+ namespace: dubbo-system
+ labels:
+ app: dubbo-admin
+spec:
+ replicas: 2
+ selector:
+ matchLabels:
+ app: dubbo-admin
+ template:
+ metadata:
+ labels:
+ app: dubbo-admin
+ spec:
+ containers:
+ - image: apache/dubbo-admin:0.5.0
+ name: dubbo-admin
+ ports:
+ - containerPort: 38080
+ volumeMounts:
+ - mountPath: /config
+ name: application-properties
+ volumes:
+ - name: application-properties
+ configMap:
+ name: dubbo-admin
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: dubbo-admin
+ namespace: dubbo-system
+spec:
+ selector:
+ app: dubbo-admin
+ ports:
+ - protocol: TCP
+ port: 38080
+ targetPort: 38080
+---
+
+# Skywalking
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: skywalking-oap-server
+ namespace: dubbo-system
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: skywalking-oap-server
+ template:
+ metadata:
+ labels:
+ app: skywalking-oap-server
+ spec:
+ containers:
+ - name: skywalking-oap-server
+ image: apache/skywalking-oap-server:9.3.0
+ imagePullPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: skywalking-oap-dashboard
+ namespace: dubbo-system
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: skywalking-oap-dashboard
+ template:
+ metadata:
+ labels:
+ app: skywalking-oap-dashboard
+ spec:
+ containers:
+ - name: skywalking-oap-dashboard
+ image: apache/skywalking-ui:9.3.0
+ imagePullPolicy: Always
+ env:
+ - name: SW_OAP_ADDRESS
+ value: http://skywalking-oap-server.dubbo-system.svc:12800
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: skywalking-oap-server
+ namespace: dubbo-system
+spec:
+ type: ClusterIP
+ sessionAffinity: None
+ selector:
+ app: skywalking-oap-server
+ ports:
+ - port: 12800
+ name: rest
+ targetPort: 12800
+ - port: 11800
+ name: grpc
+ targetPort: 11800
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: skywalking-oap-dashboard
+ namespace: dubbo-system
+spec:
+ type: ClusterIP
+ sessionAffinity: None
+ selector:
+ app: skywalking-oap-dashboard
+ ports:
+ - port: 8080
+ name: http
+ targetPort: 8080
+---
+
# App A
apiVersion: apps/v1
kind: Deployment
metadata:
- name: a
+ name: advanced-a
namespace: dubbo-demo
spec:
replicas: 2
selector:
matchLabels:
- app: a
+ app: advanced-a
template:
metadata:
labels:
- app: a
+ app: advanced-a
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: a
+ - name: advanced-a
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_a_0.0.1
imagePullPolicy: Always
ports:
@@ -112,26 +261,49 @@ spec:
- name: dubbo-qos
containerPort: 20991
protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::a"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
---
# App B V1
apiVersion: apps/v1
kind: Deployment
metadata:
- name: b-v1
+ name: advanced-b-v1
namespace: dubbo-demo
spec:
replicas: 2
selector:
matchLabels:
- app: b-v1
+ app: advanced-b-v1
template:
metadata:
labels:
- app: b-v1
+ app: advanced-b-v1
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: b-v1
+ - name: advanced-b-v1
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_b_v1_0.0.1
imagePullPolicy: Always
ports:
@@ -141,26 +313,49 @@ spec:
- name: dubbo-qos
containerPort: 20992
protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::b"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
---
# App B V2
apiVersion: apps/v1
kind: Deployment
metadata:
- name: b-v2
+ name: advanced-b-v2
namespace: dubbo-demo
spec:
replicas: 3
selector:
matchLabels:
- app: b-v2
+ app: advanced-b-v2
template:
metadata:
labels:
- app: b-v2
+ app: advanced-b-v2
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: b-v2
+ - name: advanced-b-v2
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_b_v2_0.0.1
imagePullPolicy: Always
ports:
@@ -170,27 +365,49 @@ spec:
- name: dubbo-qos
containerPort: 20993
protocol: TCP
-
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::b"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
---
# App C
apiVersion: apps/v1
kind: Deployment
metadata:
- name: c
+ name: advanced-c
namespace: dubbo-demo
spec:
replicas: 3
selector:
matchLabels:
- app: c
+ app: advanced-c
template:
metadata:
labels:
- app: c
+ app: advanced-c
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: c
+ - name: advanced-c
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_c_0.0.1
imagePullPolicy: Always
ports:
@@ -200,26 +417,49 @@ spec:
- name: dubbo-qos
containerPort: 20994
protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::c"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
---
# App D
apiVersion: apps/v1
kind: Deployment
metadata:
- name: d
+ name: advanced-d
namespace: dubbo-demo
spec:
replicas: 3
selector:
matchLabels:
- app: d
+ app: advanced-d
template:
metadata:
labels:
- app: d
+ app: advanced-d
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: d
+ - name: advanced-d
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_d_0.0.1
imagePullPolicy: Always
ports:
@@ -229,4 +469,14 @@ spec:
- name: dubbo-qos
containerPort: 20995
protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::d"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
---
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/App.yml b/10-task/dubbo-samples-rpc-advanced/deploy/App.yml
new file mode 100644
index 00000000..b602d921
--- /dev/null
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/App.yml
@@ -0,0 +1,274 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# App A
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: advanced-a
+ namespace: dubbo-demo
+spec:
+ replicas: 2
+ selector:
+ matchLabels:
+ app: advanced-a
+ template:
+ metadata:
+ labels:
+ app: advanced-a
+ spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
+ containers:
+ - name: advanced-a
+ image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_a_0.0.1
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20881
+ protocol: TCP
+ - name: dubbo-qos
+ containerPort: 20991
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::a"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
+
+# App B V1
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: advanced-b-v1
+ namespace: dubbo-demo
+spec:
+ replicas: 2
+ selector:
+ matchLabels:
+ app: advanced-b-v1
+ template:
+ metadata:
+ labels:
+ app: advanced-b-v1
+ spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
+ containers:
+ - name: advanced-b-v1
+ image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_b_v1_0.0.1
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20882
+ protocol: TCP
+ - name: dubbo-qos
+ containerPort: 20992
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::b"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
+
+# App B V2
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: advanced-b-v2
+ namespace: dubbo-demo
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: advanced-b-v2
+ template:
+ metadata:
+ labels:
+ app: advanced-b-v2
+ spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
+ containers:
+ - name: advanced-b-v2
+ image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_b_v2_0.0.1
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20883
+ protocol: TCP
+ - name: dubbo-qos
+ containerPort: 20993
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::b"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
+
+# App C
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: advanced-c
+ namespace: dubbo-demo
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: advanced-c
+ template:
+ metadata:
+ labels:
+ app: advanced-c
+ spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
+ containers:
+ - name: advanced-c
+ image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_c_0.0.1
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20884
+ protocol: TCP
+ - name: dubbo-qos
+ containerPort: 20994
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::c"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
+
+# App D
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: advanced-d
+ namespace: dubbo-demo
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: advanced-d
+ template:
+ metadata:
+ labels:
+ app: advanced-d
+ spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
+ containers:
+ - name: advanced-d
+ image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_d_0.0.1
+ imagePullPolicy: Always
+ ports:
+ - name: dubbo
+ containerPort: 20885
+ protocol: TCP
+ - name: dubbo-qos
+ containerPort: 20995
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::d"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/a/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/a/Deployment.yml
index f3cced58..ed2f1b33 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/a/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/a/Deployment.yml
@@ -16,20 +16,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: a
+ name: advanced-a
namespace: dubbo-demo
spec:
replicas: 2
selector:
matchLabels:
- app: a
+ app: advanced-a
template:
metadata:
labels:
- app: a
+ app: advanced-a
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: a
+ - name: advanced-a
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_a_0.0.1
imagePullPolicy: Always
ports:
@@ -38,4 +51,15 @@ spec:
protocol: TCP
- name: dubbo-qos
containerPort: 20991
- protocol: TCP
\ No newline at end of file
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::a"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/b-v1/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/b-v1/Deployment.yml
index ced8c131..021aec49 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/b-v1/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/b-v1/Deployment.yml
@@ -16,20 +16,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: b-v1
+ name: advanced-b-v1
namespace: dubbo-demo
spec:
replicas: 2
selector:
matchLabels:
- app: b-v1
+ app: advanced-b-v1
template:
metadata:
labels:
- app: b-v1
+ app: advanced-b-v1
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: b-v1
+ - name: advanced-b-v1
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_b_v1_0.0.1
imagePullPolicy: Always
ports:
@@ -38,4 +51,15 @@ spec:
protocol: TCP
- name: dubbo-qos
containerPort: 20992
- protocol: TCP
\ No newline at end of file
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::b"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/b-v2/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/b-v2/Deployment.yml
index 1c23eeb7..ca582c2e 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/b-v2/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/b-v2/Deployment.yml
@@ -16,20 +16,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: b-v2
+ name: advanced-b-v2
namespace: dubbo-demo
spec:
replicas: 3
selector:
matchLabels:
- app: b-v2
+ app: advanced-b-v2
template:
metadata:
labels:
- app: b-v2
+ app: advanced-b-v2
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: b-v2
+ - name: advanced-b-v2
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_b_v2_0.0.1
imagePullPolicy: Always
ports:
@@ -38,4 +51,15 @@ spec:
protocol: TCP
- name: dubbo-qos
containerPort: 20993
- protocol: TCP
\ No newline at end of file
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::b"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
index 25999cdf..d42e5cac 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
@@ -16,20 +16,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: c
+ name: advanced-c
namespace: dubbo-demo
spec:
replicas: 3
selector:
matchLabels:
- app: c
+ app: advanced-c
template:
metadata:
labels:
- app: c
+ app: advanced-c
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: c
+ - name: advanced-c
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_c_0.0.1
imagePullPolicy: Always
ports:
@@ -38,4 +51,15 @@ spec:
protocol: TCP
- name: dubbo-qos
containerPort: 20994
- protocol: TCP
\ No newline at end of file
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::c"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/d/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/d/Deployment.yml
index 49b01386..7a43fb5b 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/d/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/d/Deployment.yml
@@ -16,20 +16,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: d
+ name: advanced-d
namespace: dubbo-demo
spec:
replicas: 3
selector:
matchLabels:
- app: d
+ app: advanced-d
template:
metadata:
labels:
- app: d
+ app: advanced-d
spec:
+ volumes:
+ - name: skywalking-agent
+ emptyDir: { }
+
+ initContainers:
+ - name: agent-container
+ image: apache/skywalking-java-agent:8.13.0-java17
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /agent
+ command: [ "/bin/sh" ]
+ args: [ "-c", "cp -R /skywalking/agent /agent/" ]
+
containers:
- - name: d
+ - name: advanced-d
image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_d_0.0.1
imagePullPolicy: Always
ports:
@@ -38,4 +51,15 @@ spec:
protocol: TCP
- name: dubbo-qos
containerPort: 20995
- protocol: TCP
\ No newline at end of file
+ protocol: TCP
+ volumeMounts:
+ - name: skywalking-agent
+ mountPath: /skywalking
+ env:
+ - name: JAVA_TOOL_OPTIONS
+ value: "-javaagent:/skywalking/agent/skywalking-agent.jar"
+ - name: SW_AGENT_NAME
+ value: "rpc-advanced::d"
+ - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ value: "skywalking-oap-server.dubbo-system.svc:11800"
+---
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/ConfigMap.yml
similarity index 57%
copy from 10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
copy to 10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/ConfigMap.yml
index 25999cdf..f1876acb 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/ConfigMap.yml
@@ -13,29 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: ConfigMap
metadata:
- name: c
- namespace: dubbo-demo
-spec:
- replicas: 3
- selector:
- matchLabels:
- app: c
- template:
- metadata:
- labels:
- app: c
- spec:
- containers:
- - name: c
- image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_c_0.0.1
- imagePullPolicy: Always
- ports:
- - name: dubbo
- containerPort: 20884
- protocol: TCP
- - name: dubbo-qos
- containerPort: 20994
- protocol: TCP
\ No newline at end of file
+ name: dubbo-admin
+ namespace: dubbo-system
+data:
+ # Set the properties you want to override, properties not set here will be using the default values
+ # check application.properties inside dubbo-admin project for the keys supported
+ application.properties: |
+ admin.registry.address=nacos://nacos.dubbo-system.svc:8848?username=nacos&password=nacos
+ admin.config-center=nacos://nacos.dubbo-system.svc:8848?username=nacos&password=nacos
+ admin.metadata-report.address=nacos://nacos.dubbo-system.svc:8848?username=nacos&password=nacos
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/a/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/Deployment.yml
similarity index 68%
copy from 10-task/dubbo-samples-rpc-advanced/deploy/a/Deployment.yml
copy to 10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/Deployment.yml
index f3cced58..e4a64856 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/a/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/Deployment.yml
@@ -16,26 +16,29 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: a
- namespace: dubbo-demo
+ name: dubbo-admin
+ namespace: dubbo-system
+ labels:
+ app: dubbo-admin
spec:
replicas: 2
selector:
matchLabels:
- app: a
+ app: dubbo-admin
template:
metadata:
labels:
- app: a
+ app: dubbo-admin
spec:
containers:
- - name: a
- image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_a_0.0.1
- imagePullPolicy: Always
+ - image: apache/dubbo-admin:0.5.0
+ name: dubbo-admin
ports:
- - name: dubbo
- containerPort: 20881
- protocol: TCP
- - name: dubbo-qos
- containerPort: 20991
- protocol: TCP
\ No newline at end of file
+ - containerPort: 38080
+ volumeMounts:
+ - mountPath: /config
+ name: application-properties
+ volumes:
+ - name: application-properties
+ configMap:
+ name: dubbo-admin
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/Service.yml
similarity index 60%
copy from 10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
copy to 10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/Service.yml
index 25999cdf..3d3b9ebd 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/dubbo-admin/Service.yml
@@ -13,29 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: Service
metadata:
- name: c
- namespace: dubbo-demo
+ name: dubbo-admin
+ namespace: dubbo-system
spec:
- replicas: 3
selector:
- matchLabels:
- app: c
- template:
- metadata:
- labels:
- app: c
- spec:
- containers:
- - name: c
- image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_c_0.0.1
- imagePullPolicy: Always
- ports:
- - name: dubbo
- containerPort: 20884
- protocol: TCP
- - name: dubbo-qos
- containerPort: 20994
- protocol: TCP
\ No newline at end of file
+ app: dubbo-admin
+ ports:
+ - protocol: TCP
+ port: 38080
+ targetPort: 38080
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/skywalking/Deployment.yml
similarity index 55%
copy from 10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
copy to 10-task/dubbo-samples-rpc-advanced/deploy/skywalking/Deployment.yml
index 25999cdf..e5bac123 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/skywalking/Deployment.yml
@@ -16,26 +16,43 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: c
- namespace: dubbo-demo
+ name: skywalking-oap-server
+ namespace: dubbo-system
spec:
- replicas: 3
+ replicas: 1
selector:
matchLabels:
- app: c
+ app: skywalking-oap-server
template:
metadata:
labels:
- app: c
+ app: skywalking-oap-server
spec:
containers:
- - name: c
- image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_c_0.0.1
+ - name: skywalking-oap-server
+ image: apache/skywalking-oap-server:9.0.0
imagePullPolicy: Always
- ports:
- - name: dubbo
- containerPort: 20884
- protocol: TCP
- - name: dubbo-qos
- containerPort: 20994
- protocol: TCP
\ No newline at end of file
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: skywalking-oap-dashboard
+ namespace: dubbo-system
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: skywalking-oap-dashboard
+ template:
+ metadata:
+ labels:
+ app: skywalking-oap-dashboard
+ spec:
+ containers:
+ - name: skywalking-oap-dashboard
+ image: apache/skywalking-ui:8.8.0
+ imagePullPolicy: Always
+ env:
+ - name: SW_OAP_ADDRESS
+ value: http://skywalking-oap-server.dubbo-system.svc:12800
\ No newline at end of file
diff --git a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml b/10-task/dubbo-samples-rpc-advanced/deploy/skywalking/Service.yml
similarity index 59%
copy from 10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
copy to 10-task/dubbo-samples-rpc-advanced/deploy/skywalking/Service.yml
index 25999cdf..a50e50de 100644
--- a/10-task/dubbo-samples-rpc-advanced/deploy/c/Deployment.yml
+++ b/10-task/dubbo-samples-rpc-advanced/deploy/skywalking/Service.yml
@@ -13,29 +13,35 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: Service
metadata:
- name: c
- namespace: dubbo-demo
+ name: skywalking-oap-server
+ namespace: dubbo-system
spec:
- replicas: 3
+ type: ClusterIP
+ sessionAffinity: None
selector:
- matchLabels:
- app: c
- template:
- metadata:
- labels:
- app: c
- spec:
- containers:
- - name: c
- image: apache/dubbo-demo:dubbo-samples-rpc-advanced_app_c_0.0.1
- imagePullPolicy: Always
- ports:
- - name: dubbo
- containerPort: 20884
- protocol: TCP
- - name: dubbo-qos
- containerPort: 20994
- protocol: TCP
\ No newline at end of file
+ app: skywalking-oap-server
+ ports:
+ - port: 12800
+ name: rest
+ targetPort: 12800
+ - port: 11800
+ name: grpc
+ targetPort: 11800
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: skywalking-oap-dashboard
+ namespace: dubbo-system
+spec:
+ type: ClusterIP
+ sessionAffinity: None
+ selector:
+ app: skywalking-oap-dashboard
+ ports:
+ - port: 8080
+ name: http
+ targetPort: 8080
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org