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
commit da6d3b23b0fae5907d2e47c646edec08d255352f Author: kezhenxu94 <[email protected]> AuthorDate: Wed Nov 3 22:53:46 2021 +0800 Add stub deployment for Kubernetes --- Makefile | 9 ++++++ Makefile => deploy/platform/kubernetes/Makefile | 40 +++++-------------------- services/recommendation-service/src/app.py | 2 +- 3 files changed, 17 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 37c9c61..fcbb6c9 100644 --- a/Makefile +++ b/Makefile @@ -51,3 +51,12 @@ deploy.docker: undeploy.docker docker.build .PHONY: undeploy.docker undeploy.docker: $(MAKE) -C deploy/platform/docker undeploy + +## Kubernetes +.PHONY: deploy.kubernetes +deploy.kubernetes: undeploy.kubernetes docker.build + $(MAKE) -C deploy/platform/kubernetes deploy + +.PHONY: undeploy.kubernetes +undeploy.kubernetes: + $(MAKE) -C deploy/platform/kubernetes undeploy diff --git a/Makefile b/deploy/platform/kubernetes/Makefile similarity index 53% copy from Makefile copy to deploy/platform/kubernetes/Makefile index 37c9c61..02e539f 100644 --- a/Makefile +++ b/deploy/platform/kubernetes/Makefile @@ -16,38 +16,12 @@ # under the License. # -# Build each project under services/* +include ../../../Makefile.in -services = $(wildcard services/*) +.PHONY: deploy +deploy: + echo 'TODO' -.PHONY: $(services) -$(services): - $(MAKE) -C $@ build - -.PHONY: build -build: $(services) - -# Build Docker images - -services_docker = $(foreach svc,$(services),$(svc).docker.build) - -.PHONY: docker -docker: $(services_docker) - -.PHONY: $(services_docker) -$(services_docker): %.docker.build: % - $(MAKE) -C $< docker.build - -.PHONY: docker.build -docker.build: $(services_docker) - -# Deploy and Undeploy - -## Docker Compose -.PHONY: deploy.docker -deploy.docker: undeploy.docker docker.build - $(MAKE) -C deploy/platform/docker deploy - -.PHONY: undeploy.docker -undeploy.docker: - $(MAKE) -C deploy/platform/docker undeploy +.PHONY: undeploy +undeploy: + echo 'TODO' diff --git a/services/recommendation-service/src/app.py b/services/recommendation-service/src/app.py index 64aa0b1..ea90198 100644 --- a/services/recommendation-service/src/app.py +++ b/services/recommendation-service/src/app.py @@ -31,7 +31,7 @@ if __name__ == '__main__': @app.route('/rcmd', methods=['GET']) def application(): - r = requests.get('http://gateway/songs') + r = requests.get('http://songs/songs') recommendations = r.json() return jsonify(recommendations)
