You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2022/11/16 04:15:10 UTC
[GitHub] [skywalking-showcase] kezhenxu94 commented on a diff in pull request #90: Add `mesh-with-agent` feature for deploy agent service in service mesh
kezhenxu94 commented on code in PR #90:
URL: https://github.com/apache/skywalking-showcase/pull/90#discussion_r1023487026
##########
deploy/platform/kubernetes/features.mk:
##########
@@ -62,6 +62,25 @@ undeploy.feature-als: istioctl
$(MAKE) undeploy FEATURE_FLAGS=agent TAG=$(TAG)-agentless NAMESPACE=$(NAMESPACE)-agentless AGENTLESS=true
istioctl x uninstall --purge -y
+.PHONY: feature-mesh-with-agent
+feature-mesh-with-agent:
+
+.PHONY: deploy.feature-mesh-with-agent
+deploy.feature-mesh-with-agent: prerequisites install-cert-manager
+ @curl -Ls https://archive.apache.org/dist/skywalking/swck/${SWCK_OPERATOR_VERSION}/skywalking-swck-${SWCK_OPERATOR_VERSION}-bin.tgz | tar -zxf - -O ./config/operator-bundle.yaml | kubectl apply -f -
+ @kubectl label namespace --overwrite $(NAMESPACE) swck-injection=enabled
+ @kubectl get configmap skywalking-swck-java-agent-configmap -n skywalking-swck-system -oyaml | sed "s/127.0.0.1/$(NAMESPACE)-$(BACKEND_SERVICE).$(NAMESPACE)/" | kubectl apply -f -
+ @kubectl label namespace --overwrite $(NAMESPACE) istio-injection=enabled
+ $(MAKE) deploy FEATURE_FLAGS=agent TAG=$(TAG) NAMESPACE=$(NAMESPACE) AGENTLESS=true SHOW_TIPS=false
Review Comment:
```suggestion
$(MAKE) deploy FEATURE_FLAGS=agent TAG=$(TAG) NAMESPACE=$(NAMESPACE) SHOW_TIPS=false
```
##########
docs/readme.md:
##########
@@ -101,7 +101,8 @@ Currently, the features supported are:
| `rover` | Deploy SkyWalking Rover and detect the processes in the Kubernetes environment. | Only support deployment in the Kubernetes environment, docker is not supported. |
| `mysql` | Start a MySQL server and load generator to execute the sample SQLs periodically, set up fluent bit to fetch slow logs and export to OAP, and export their metrics to SkyWalking. | |
| `postgresql` | Start a PostgreSQL server, and load generator to execute the sample SQLs periodically, set up fluent bit to fetch slow logs and export to OAP, and export their metrics to SkyWalking. | |
-| `apisix-monitor` | Deploy OpenTelemetry and export APISIX metrics to SkyWalking for analysis and display on UI | |
+| `apisix-monitor` | Deploy OpenTelemetry and export APISIX metrics to SkyWalking for analysis and display on UI | |
+| `mesh-with-agent` | Deploy services with java agent in the service mesh environment. | OnlySupport deployment in the Kubernetes environment, docker is not supported.|
Review Comment:
```suggestion
| `mesh-with-agent` | Deploy services with java agent in the service mesh environment. | Only support deployment in the Kubernetes environment, docker is not supported.|
```
##########
deploy/platform/kubernetes/features.mk:
##########
@@ -62,6 +62,25 @@ undeploy.feature-als: istioctl
$(MAKE) undeploy FEATURE_FLAGS=agent TAG=$(TAG)-agentless NAMESPACE=$(NAMESPACE)-agentless AGENTLESS=true
istioctl x uninstall --purge -y
+.PHONY: feature-mesh-with-agent
+feature-mesh-with-agent:
+
+.PHONY: deploy.feature-mesh-with-agent
+deploy.feature-mesh-with-agent: prerequisites install-cert-manager
+ @curl -Ls https://archive.apache.org/dist/skywalking/swck/${SWCK_OPERATOR_VERSION}/skywalking-swck-${SWCK_OPERATOR_VERSION}-bin.tgz | tar -zxf - -O ./config/operator-bundle.yaml | kubectl apply -f -
+ @kubectl label namespace --overwrite $(NAMESPACE) swck-injection=enabled
+ @kubectl get configmap skywalking-swck-java-agent-configmap -n skywalking-swck-system -oyaml | sed "s/127.0.0.1/$(NAMESPACE)-$(BACKEND_SERVICE).$(NAMESPACE)/" | kubectl apply -f -
+ @kubectl label namespace --overwrite $(NAMESPACE) istio-injection=enabled
+ $(MAKE) deploy FEATURE_FLAGS=agent TAG=$(TAG) NAMESPACE=$(NAMESPACE) AGENTLESS=true SHOW_TIPS=false
+
+.PHONY: undeploy.feature-mesh-with-agent
+undeploy.feature-mesh-with-agent: istioctl
+ $(eval TAG := $(TAG)-agentless)
+ @curl -Ls https://archive.apache.org/dist/skywalking/swck/${SWCK_OPERATOR_VERSION}/skywalking-swck-${SWCK_OPERATOR_VERSION}-bin.tgz | tar -zxf - -O ./config/operator-bundle.yaml | kubectl delete --ignore-not-found -f -
+ @kubectl delete --ignore-not-found -f https://github.com/jetstack/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml
+ $(MAKE) undeploy FEATURE_FLAGS=agent TAG=$(TAG) NAMESPACE=$(NAMESPACE) AGENTLESS=true
Review Comment:
```suggestion
$(MAKE) undeploy FEATURE_FLAGS=agent TAG=$(TAG) NAMESPACE=$(NAMESPACE)
```
##########
deploy/platform/kubernetes/features.mk:
##########
@@ -62,6 +62,25 @@ undeploy.feature-als: istioctl
$(MAKE) undeploy FEATURE_FLAGS=agent TAG=$(TAG)-agentless NAMESPACE=$(NAMESPACE)-agentless AGENTLESS=true
istioctl x uninstall --purge -y
+.PHONY: feature-mesh-with-agent
+feature-mesh-with-agent:
+
+.PHONY: deploy.feature-mesh-with-agent
+deploy.feature-mesh-with-agent: prerequisites install-cert-manager
+ @curl -Ls https://archive.apache.org/dist/skywalking/swck/${SWCK_OPERATOR_VERSION}/skywalking-swck-${SWCK_OPERATOR_VERSION}-bin.tgz | tar -zxf - -O ./config/operator-bundle.yaml | kubectl apply -f -
+ @kubectl label namespace --overwrite $(NAMESPACE) swck-injection=enabled
+ @kubectl get configmap skywalking-swck-java-agent-configmap -n skywalking-swck-system -oyaml | sed "s/127.0.0.1/$(NAMESPACE)-$(BACKEND_SERVICE).$(NAMESPACE)/" | kubectl apply -f -
+ @kubectl label namespace --overwrite $(NAMESPACE) istio-injection=enabled
+ $(MAKE) deploy FEATURE_FLAGS=agent TAG=$(TAG) NAMESPACE=$(NAMESPACE) AGENTLESS=true SHOW_TIPS=false
+
+.PHONY: undeploy.feature-mesh-with-agent
+undeploy.feature-mesh-with-agent: istioctl
+ $(eval TAG := $(TAG)-agentless)
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org