[skywalking-showcase] 01/01: Move prerequisite checks into targets

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch requirements
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git

commit 2546d4efa3fa7b2bb79c0c870dc006258f2a7e2e
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Jul 20 12:55:09 2022 +0800

    Move prerequisite checks into targets
    
    Now the prerequisites check is done as soon as the make command is run,
    which reports an error from `istioctl` / `ofn` even we don't set those
    feature flags. This patch move the checks into the targets where the
    commands are needed.
---
 .../kubernetes/feature-cluster/resources.yaml       |  5 +++--
 deploy/platform/kubernetes/features.mk              | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 70f8244..56d1209 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -249,12 +249,13 @@ spec:
               value: k8s-configmap
             - name: SW_ENVOY_METRIC_ALS_TCP_ANALYSIS
               value: "mx-mesh"
-            - name: SW_ENABLE_UPDATE_UI_TEMPLATE
-              value: "false"
             - name: SW_SLOW_DB_THRESHOLD
               value: default:0,mongodb:100
             - name: SW_ENABLE_ON_DEMAND_POD_LOG
               value: "true"
+            - name: SW_ENABLE_UPDATE_UI_TEMPLATE
+              value: "true"
+
           volumeMounts:
             - name: config-volume
               mountPath: /skywalking/ext-config
diff --git a/deploy/platform/kubernetes/features.mk b/deploy/platform/kubernetes/features.mk
index 4897de5..7ea0df4 100644
--- a/deploy/platform/kubernetes/features.mk
+++ b/deploy/platform/kubernetes/features.mk
@@ -22,12 +22,12 @@
 
 include ../../../Makefile.in
 
-ifeq (, $(shell which istioctl))
-  $(error "No istioctl in PATH, please make sure istioctl is available in PATH")
-endif
+.PHONY: istioctl
+istioctl:
+	@istioctl --version >/dev/null 2>&1 || (echo "No istioctl in PATH, please make sure istioctl is available in PATH."; exit 1)
 
 .PHONY: istio
-istio:
+istio: istioctl
 	@istioctl install -y --set profile=demo \
 		--set meshConfig.enableEnvoyAccessLogService=true `# @feature: als; enable Envoy access log service` \
 		`# @feature: als; be careful to only emit wanted metrics otherwise the traffic is HUGE` \
@@ -57,7 +57,7 @@ deploy.feature-als: prerequisites
 	$(MAKE) deploy FEATURE_FLAGS=agent TAG=$(TAG)-agentless NAMESPACE=$(NAMESPACE)-agentless AGENTLESS=true SHOW_TIPS=false
 
 .PHONY: undeploy.feature-als
-undeploy.feature-als:
+undeploy.feature-als: istioctl
 	$(eval TAG := $(TAG)-agentless)
 	$(MAKE) undeploy FEATURE_FLAGS=agent TAG=$(TAG)-agentless NAMESPACE=$(NAMESPACE)-agentless AGENTLESS=true
 	istioctl x uninstall --purge -y
@@ -108,11 +108,12 @@ undeploy.feature-java-agent-injector:
 	@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 AGENTLESS=false SHOW_TIPS=false BACKEND_SERVICE=$(BACKEND_SERVICE)
 
+.PHONY: ofn
+ofn:
+	@ofn --version >/dev/null 2>&1 || (echo "No ofn in PATH, please make sure ofn is available in PATH."; exit 1)
+
 .PHONY: open-function
-open-function: install-cert-manager
-ifeq (, $(shell which ofn))
-  $(error "No ofn in PATH, please make sure ofn is available in PATH")
-endif
+open-function: ofn install-cert-manager
 	@ofn install --knative --ingress --region-cn -y
 	@kubectl patch configmap/config-deployment -n knative-serving --type merge -p '{"data":{"registriesSkippingTagResolving":"ghcr.io"}}'
 
@@ -125,5 +126,5 @@ deploy.feature-function: open-function
 feature-function:
 
 .PHONY: undeploy.feature-function
-undeploy.feature-function:
+undeploy.feature-function: ofn
 	@ofn uninstall --all --region-cn -y