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 2021/11/09 04:20:37 UTC
[skywalking-showcase] branch main updated: Add missing agentless
images and ALS deploy
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 fc4db3c Add missing agentless images and ALS deploy
fc4db3c is described below
commit fc4db3c7a8e7edb3e1950a21b18c5bff924cbdea
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Nov 9 12:20:27 2021 +0800
Add missing agentless images and ALS deploy
---
deploy/platform/kubernetes/Makefile | 5 +++--
.../Makefile => deploy/platform/kubernetes/Makefile.in | 15 ++-------------
deploy/platform/kubernetes/features.mk | 12 ++++++++++--
services/load-gen/Makefile | 2 ++
services/songs-service/Makefile | 1 +
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/deploy/platform/kubernetes/Makefile b/deploy/platform/kubernetes/Makefile
index fbfabfb..8e11169 100644
--- a/deploy/platform/kubernetes/Makefile
+++ b/deploy/platform/kubernetes/Makefile
@@ -16,8 +16,8 @@
# under the License.
#
+include Makefile.in
include ../../../Makefile.in
-include features.mk
features := $(subst $(comma), ,$(FEATURE_FLAGS))
features := $(foreach f,$(features),feature-$(f))
@@ -47,7 +47,6 @@ $(undeploy_features): %: %.resources
undeploy_resources := $(foreach r,$(undeploy_features),$(r).resources)
.PHONY: $(undeploy_resources)
$(undeploy_resources): undeploy.%.resources: %
- $(info undeploying feature $<)
$(eval resources := $(wildcard $(shell pwd)/$</*))
@$(foreach resource, $(resources), docker run --rm -v "$(pwd)/$(resource)":/input \
$(foreach v,$(EXPORTED_VARS),-e $(v)) \
@@ -56,3 +55,5 @@ $(undeploy_resources): undeploy.%.resources: %
.PHONY: undeploy
undeploy: $(undeploy_features)
+
+include features.mk
diff --git a/services/load-gen/Makefile b/deploy/platform/kubernetes/Makefile.in
similarity index 77%
copy from services/load-gen/Makefile
copy to deploy/platform/kubernetes/Makefile.in
index 421b35e..bc601f3 100644
--- a/services/load-gen/Makefile
+++ b/deploy/platform/kubernetes/Makefile.in
@@ -16,17 +16,6 @@
# under the License.
#
-include ../../Makefile.in
+.EXPORT_ALL_VARIABLES:
-.PHONY: build
-build:
-
-.PHONY: docker docker.build docker.push
-
-docker: docker.build
-
-docker.build:
- docker build . -t $(HUB)/load-gen:$(TAG)
-
-docker.push: docker.build
- docker push $(HUB)/load-gen:$(TAG)
+NAMESPACE ?= default
diff --git a/deploy/platform/kubernetes/features.mk b/deploy/platform/kubernetes/features.mk
index 8d019fc..d7c3482 100644
--- a/deploy/platform/kubernetes/features.mk
+++ b/deploy/platform/kubernetes/features.mk
@@ -22,5 +22,13 @@
include ../../../Makefile.in
-feature-istio:
- @echo 'Example: deploying Istio via command line'
+feature-als:
+
+deploy.feature-als:
+ $(eval TAG := $(TAG)-agentless)
+ $(MAKE) deploy FEATURE_FLAGS=agent
+
+undeploy.feature-als:
+ $(eval TAG := $(TAG)-agentless)
+ $(MAKE) undeploy FEATURE_FLAGS=agent
+
diff --git a/services/load-gen/Makefile b/services/load-gen/Makefile
index 421b35e..c4ec4f3 100644
--- a/services/load-gen/Makefile
+++ b/services/load-gen/Makefile
@@ -30,3 +30,5 @@ docker.build:
docker.push: docker.build
docker push $(HUB)/load-gen:$(TAG)
+ docker tag $(HUB)/load-gen:$(TAG) $(HUB)/load-gen:$(TAG)-agentless
+ docker push $(HUB)/load-gen:$(TAG)-agentless
diff --git a/services/songs-service/Makefile b/services/songs-service/Makefile
index 2916b7f..3bdb669 100644
--- a/services/songs-service/Makefile
+++ b/services/songs-service/Makefile
@@ -34,3 +34,4 @@ docker.build: build
docker.push: docker.build
docker push $(HUB)/songs-service:$(TAG)
+ docker push $(HUB)/songs-service:$(TAG)-agentless