This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new 40ab9c1 Set collector address based on satellite or oap
40ab9c1 is described below
commit 40ab9c1d604b195cd3ca5db9da79e787b60faeb8
Author: kezhenxu94 <kezhenx...@apache.org>
AuthorDate: Mon Mar 27 11:45:18 2023 +0800
Set collector address based on satellite or oap
---
deploy/platform/kubernetes/Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/deploy/platform/kubernetes/Makefile
b/deploy/platform/kubernetes/Makefile
index b4f1fb9..6ff7eb0 100644
--- a/deploy/platform/kubernetes/Makefile
+++ b/deploy/platform/kubernetes/Makefile
@@ -42,6 +42,11 @@ ifeq ($(DEBUG),true)
HELM_OPTIONS := $(HELM_OPTIONS) --dry-run
endif
+BACKEND_SERVICE := $(RELEASE)-oap.$(NAMESPACE).svc:11800
+ifneq (,$(findstring satellite,$(features)))
+ BACKEND_SERVICE := $(RELEASE)-satellite.$(NAMESPACE).svc:11800
+endif
+
.PHONY: helm
helm:
@helm version >/dev/null 2>&1 || (echo "No helm in PATH, please make
sure helm is available in PATH."; exit 1)
@@ -94,8 +99,8 @@ feature-als:
$(eval HELM_OPTIONS := $(HELM_OPTIONS) --set features.als.enabled=true)
$(eval HELM_OPTIONS := $(HELM_OPTIONS) --set istio.enabled=true)
$(eval HELM_OPTIONS := $(HELM_OPTIONS) --set
istiod.meshConfig.defaultConfig.tracing.zipkin.address=$(RELEASE)-oap.$(NAMESPACE).svc:9411)
- $(eval HELM_OPTIONS := $(HELM_OPTIONS) --set
istiod.meshConfig.defaultConfig.envoyMetricsService.address=$(RELEASE)-oap.$(NAMESPACE).svc:11800)
- $(eval HELM_OPTIONS := $(HELM_OPTIONS) --set
istiod.meshConfig.defaultConfig.envoyAccessLogService.address=$(RELEASE)-oap.$(NAMESPACE).svc:11800)
+ $(eval HELM_OPTIONS := $(HELM_OPTIONS) --set
istiod.meshConfig.defaultConfig.envoyMetricsService.address=$(BACKEND_SERVICE))
+ $(eval HELM_OPTIONS := $(HELM_OPTIONS) --set
istiod.meshConfig.defaultConfig.envoyAccessLogService.address=$(BACKEND_SERVICE))
.PHONY: feature-satellite
feature-satellite:
