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 e3c857b Lock the cilium and CLI version (#182)
e3c857b is described below
commit e3c857bc94ec13b54bdffdb5908801b63035d71b
Author: mrproliu <[email protected]>
AuthorDate: Wed Jul 10 15:52:29 2024 +0800
Lock the cilium and CLI version (#182)
---
Makefile.in | 3 +++
deploy/platform/kubernetes/Makefile | 7 +++++--
deploy/platform/kubernetes/values.yaml | 3 +++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 695a7f9..162e290 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,5 +63,8 @@ OTEL_COLLECTOR_IMAGE_TAG ?= 0.102.1
SW_R3_IMAGE ?= ghcr.io/skyapm/r3
SW_R3_IMAGE_TAG ?= 0.1.0
+CILIUM_VERSION ?= 1.13.4
+CILIUM_CLI_VERSION ?= v0.15.0
+
# ALL variables should be listed above ^^
EXPORTED_VARS := $(filter-out <%,$(.VARIABLES))
diff --git a/deploy/platform/kubernetes/Makefile
b/deploy/platform/kubernetes/Makefile
index 33151b7..61cfcd3 100644
--- a/deploy/platform/kubernetes/Makefile
+++ b/deploy/platform/kubernetes/Makefile
@@ -216,10 +216,13 @@ feature-activemq-monitor:
cilium:
ifeq (, $(shell which cilium))
$(error "No cilium in PATH, please make sure cilium CLI is available in
PATH")
+endif
+ifeq (,$(findstring $(CILIUM_CLI_VERSION),$(shell cilium version --client)))
+ $(error "Cilium CLI version is not $(CILIUM_CLI_VERSION), please make
sure cilium CLI is $(CILIUM_CLI_VERSION))")
endif
@INSTALL_OR_UPDATE=$$(cilium status 2>&1 | grep -q "daemonsets.apps
\"cilium\" not found" && echo "install" || echo "upgrade"); \
echo "Cilium will be $$INSTALL_OR_UPDATE"; \
- cilium $$INSTALL_OR_UPDATE --set cni.exclusive=false --set
socketLB.hostNamespaceOnly=true --set hubble.tls.enabled=false
+ cilium $$INSTALL_OR_UPDATE --version $(CILIUM_VERSION) --set
cni.exclusive=false --set socketLB.hostNamespaceOnly=true --set
hubble.tls.enabled=false
# @feature: function; install open function resources
.PHONY: feature-cilium
@@ -237,7 +240,7 @@ endif
.PHONY: undeploy
undeploy:
- helm -n $(NAMESPACE) delete $(RELEASE) --wait
+ helm -n $(NAMESPACE) delete $(RELEASE) --wait || true
ifneq ($(findstring cilium,$(FEATURE_FLAGS)),)
cilium uninstall
endif
diff --git a/deploy/platform/kubernetes/values.yaml
b/deploy/platform/kubernetes/values.yaml
index 865a49b..f02cc86 100644
--- a/deploy/platform/kubernetes/values.yaml
+++ b/deploy/platform/kubernetes/values.yaml
@@ -443,3 +443,6 @@ features:
activemqMonitor:
enabled: false
+
+ cilium:
+ enabled: false
