You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/04/08 06:23:44 UTC
[skywalking-showcase] branch injector updated (29262ba -> ac671b1)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch injector
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
discard 29262ba Enable gateway plugin in gateway service
new ac671b1 Enable gateway plugin in gateway service
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (29262ba)
\
N -- N -- N refs/heads/injector (ac671b1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
deploy/platform/docker/docker-compose.cluster.yaml | 2 +-
deploy/platform/docker/docker-compose.single-node.yaml | 2 +-
deploy/platform/kubernetes/Makefile | 2 +-
.../platform/kubernetes/feature-cluster/resources.yaml | 14 +++++++-------
.../kubernetes/feature-single-node/resources.yaml | 14 +++++++-------
docs/readme.md | 16 ++++++++--------
6 files changed, 25 insertions(+), 25 deletions(-)
[skywalking-showcase] 01/01: Enable gateway plugin in gateway service
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch injector
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit ac671b1ca09dc12eba424dc41e9cfcf4a9fa2fcf
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Apr 8 13:55:06 2022 +0800
Enable gateway plugin in gateway service
---
.github/workflows/publish-images.yaml | 1 +
deploy/platform/docker/docker-compose.cluster.yaml | 2 +-
deploy/platform/docker/docker-compose.single-node.yaml | 2 +-
deploy/platform/kubernetes/Makefile | 2 +-
deploy/platform/kubernetes/feature-agent/resources.yaml | 1 +
.../platform/kubernetes/feature-cluster/resources.yaml | 14 +++++++-------
.../kubernetes/feature-single-node/resources.yaml | 14 +++++++-------
docs/readme.md | 16 ++++++++--------
8 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/publish-images.yaml b/.github/workflows/publish-images.yaml
index 30960a0..3633101 100644
--- a/.github/workflows/publish-images.yaml
+++ b/.github/workflows/publish-images.yaml
@@ -20,6 +20,7 @@ on:
push:
branches:
- main
+ - injector
env:
HUB: ghcr.io/apache/skywalking-showcase
diff --git a/deploy/platform/docker/docker-compose.cluster.yaml b/deploy/platform/docker/docker-compose.cluster.yaml
index a132420..89a2c71 100644
--- a/deploy/platform/docker/docker-compose.cluster.yaml
+++ b/deploy/platform/docker/docker-compose.cluster.yaml
@@ -73,7 +73,7 @@ services:
oap:
<<: *oap
- rocket-bot:
+ ui:
image: ${SW_UI_IMAGE}
networks: [ sw ]
ports:
diff --git a/deploy/platform/docker/docker-compose.single-node.yaml b/deploy/platform/docker/docker-compose.single-node.yaml
index 9445fad..b6ddbd0 100644
--- a/deploy/platform/docker/docker-compose.single-node.yaml
+++ b/deploy/platform/docker/docker-compose.single-node.yaml
@@ -58,7 +58,7 @@ services:
elasticsearch:
condition: service_healthy
- rocket-bot:
+ ui:
image: ${SW_UI_IMAGE}
networks: [ sw ]
ports:
diff --git a/deploy/platform/kubernetes/Makefile b/deploy/platform/kubernetes/Makefile
index a361a20..292cdb3 100644
--- a/deploy/platform/kubernetes/Makefile
+++ b/deploy/platform/kubernetes/Makefile
@@ -47,7 +47,7 @@ ifneq ($(SHOW_TIPS),false)
@echo
@echo "Now wait the Pods to be ready and use the following command to expose the port of SkyWalking UI"
@echo
- @echo " $$ kubectl port-forward svc/rocket-bot 8080:8080 --namespace $(NAMESPACE)"
+ @echo " $$ kubectl port-forward svc/ui 8080:8080 --namespace $(NAMESPACE)"
@echo
@echo "Then open your browser and navigate to http://localhost:8080"
@echo
diff --git a/deploy/platform/kubernetes/feature-agent/resources.yaml b/deploy/platform/kubernetes/feature-agent/resources.yaml
index e49d3df..a6a0fcc 100644
--- a/deploy/platform/kubernetes/feature-agent/resources.yaml
+++ b/deploy/platform/kubernetes/feature-agent/resources.yaml
@@ -53,6 +53,7 @@ spec:
strategy.skywalking.apache.org/inject.Container: "gateway"
strategy.skywalking.apache.org/agent.Overlay: "true"
agent.skywalking.apache.org/agent.service_name: "agent::gateway"
+ optional.skywalking.apache.org: "spring-cloud-gateway"
spec:
containers:
- name: gateway
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 9825319..19f5e95 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -265,10 +265,10 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: rocket-bot
+ name: ui
spec:
selector:
- app: rocket-bot
+ app: ui
ports:
- protocol: TCP
port: 8080
@@ -278,24 +278,24 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
- name: rocket-bot-deployment
+ name: ui-deployment
labels:
- app: rocket-bot
+ app: ui
spec:
replicas: 1
selector:
matchLabels:
- app: rocket-bot
+ app: ui
template:
metadata:
labels:
- app: rocket-bot
+ app: ui
annotations:
sidecar.istio.io/inject: "false"
spec:
serviceAccountName: skywalking-oap-sa-cluster
containers:
- - name: rocket-bot
+ - name: ui
image: ${SW_UI_IMAGE}
imagePullPolicy: Always
ports:
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index 5a4dde3..a157506 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -195,10 +195,10 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: rocket-bot
+ name: ui
spec:
selector:
- app: rocket-bot
+ app: ui
ports:
- protocol: TCP
port: 8080
@@ -208,23 +208,23 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
- name: rocket-bot-deployment
+ name: ui-deployment
labels:
- app: rocket-bot
+ app: ui
spec:
replicas: 1
selector:
matchLabels:
- app: rocket-bot
+ app: ui
template:
metadata:
labels:
- app: rocket-bot
+ app: ui
annotations:
sidecar.istio.io/inject: "false"
spec:
containers:
- - name: rocket-bot
+ - name: ui
image: ${SW_UI_IMAGE}
imagePullPolicy: Always
ports:
diff --git a/docs/readme.md b/docs/readme.md
index c0c86e3..1cb8c3f 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -7,7 +7,7 @@ SkyWalking. The music application is composed of several microservices that are
languages. Here is the architecture:
```mermaid
-%% please read this doc in our official website, otherwise the graph is not correctly rendered.
+%% please read this doc in our official website, otherwise the graph is not correctly rendered.
graph LR;
loadgen[load generator] --> ui("UI (React)") --> app("app server (NodeJS)") --> gateway("gateway (Spring)");
gateway --> songs("songs (Spring)") & rcmd("recommendations (Python)");
@@ -37,9 +37,9 @@ cd skywalking-showcase
make deploy.kubernetes
```
-This will install SkyWalking components, including OAP in cluster mode with 2 nodes, SkyWalking RocketBot UI,
-microservices with SkyWalking agent, microservices without SkyWalking agent but managed by Istio,
-2 Pods to mimic virtual machines and export metrics to SkyWalking, and enable kubernetes cluster monitoring as well as
+This will install SkyWalking components, including OAP in cluster mode with 2 nodes, SkyWalking UI,
+microservices with SkyWalking agent, microservices without SkyWalking agent but managed by Istio,
+2 Pods to mimic virtual machines and export metrics to SkyWalking, and enable kubernetes cluster monitoring as well as
SkyWalking self observability.
For more advanced deployments, check [Customization](#customization) documentation below.
@@ -79,8 +79,8 @@ Currently, the features supported are:
| Name | Description | Note |
| ----------- | ----------- | ----------- |
| `java-agent-injector` | Use the java agent injector to inject the Skywalking Java agent and deploy microservices with other SkyWalking agent enabled. | The microservices include agents for Java, NodeJS server, browser, Python. |
-| `cluster` | Deploy SkyWalking OAP in cluster mode, with 2 nodes, and SkyWalking RocketBot UI, ElasticSearch as storage. | Only one of `cluster` or `single-node` can be enabled. |
-| `single-node` | Deploy only one single node of SkyWalking OAP, and SkyWalking RocketBot UI, ElasticSearch as storage. | Only one of `cluster` or `single-node` can be enabled. |
+| `cluster` | Deploy SkyWalking OAP in cluster mode, with 2 nodes, and SkyWalking UI, ElasticSearch as storage. | Only one of `cluster` or `single-node` can be enabled. |
+| `single-node` | Deploy only one single node of SkyWalking OAP, and SkyWalking UI, ElasticSearch as storage. | Only one of `cluster` or `single-node` can be enabled. |
| `so11y` | Enable SkyWalking self observability. | This is enabled by default for platform [Docker Compose](#docker-compose). |
| `vm` | Start 2 virtual machines and export their metrics to SkyWalking. | The "virtual machines" are mimicked by Docker containers or Pods. |
| `als` | Start microservices WITHOUT SkyWalking agent enabled, and configure SkyWalking to analyze the topology and metrics from their access logs. | Command `istioctl` is required to run this feature. The agentless microservices will be running at namespace `${NAMESPACE}-agentless` |
@@ -138,8 +138,8 @@ After deploy the showcase with the satellite component, the monitoring traffic w
load balances the traffic to the OAP nodes.
```mermaid
-%% please read this doc in our official website, otherwise the graph is not correctly rendered.
+%% please read this doc in our official website, otherwise the graph is not correctly rendered.
graph LR;
agent["business app(agent)"] --> satellite("satellite") --> oap("oap");
envoy["sidecar(envoy)"] --> satellite;
-```
\ No newline at end of file
+```