From 7fae0639b8f7eb6f56b63b0208ff0243d8f61aa6 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 11 Nov 2024 09:18:10 +0000
Subject: [PATCH] Updated Hackfest 5 scripts
---
deploy/all.sh | 4 ++--
deploy/nats.sh | 3 +--
deploy/tfs.sh | 32 ++++++++++++++++----------------
hackfest5/redeploy-tfs.sh | 5 +++++
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/deploy/all.sh b/deploy/all.sh
index 97f4db37d..96d9e30ca 100755
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -212,8 +212,8 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
# Deploy QuestDB
./deploy/qdb.sh
-# Deploy Apache Kafka
-./deploy/kafka.sh
+## Deploy Apache Kafka
+#./deploy/kafka.sh
# Expose Dashboard
./deploy/expose_dashboard.sh
diff --git a/deploy/nats.sh b/deploy/nats.sh
index cb3dd2318..b6df8066b 100755
--- a/deploy/nats.sh
+++ b/deploy/nats.sh
@@ -69,8 +69,7 @@ function nats_deploy_single() {
echo ">>> NATS is present; skipping step."
else
echo ">>> Deploy NATS"
- helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image=nats:2.9-alpine --set config.cluster.enabled=true --set config.cluster.tls.enabled=true
-
+ helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image=nats:2.9-alpine
echo ">>> Waiting NATS statefulset to be created..."
while ! kubectl get --namespace ${NATS_NAMESPACE} statefulset/${NATS_NAMESPACE} &> /dev/null; do
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index f39609408..76e0a7383 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -112,16 +112,16 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"}
export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
-# ----- Apache Kafka ------------------------------------------------------
-
-# If not already set, set the namespace where Apache Kafka will be deployed.
-export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}
-
-# If not already set, set the port Apache Kafka server will be exposed to.
-export KFK_SERVER_PORT=${KFK_SERVER_PORT:-"9092"}
-
-# If not already set, if flag is YES, Apache Kafka will be redeployed and topic will be lost.
-export KFK_REDEPLOY=${KFK_REDEPLOY:-""}
+## ----- Apache Kafka ------------------------------------------------------
+#
+## If not already set, set the namespace where Apache Kafka will be deployed.
+#export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}
+#
+## If not already set, set the port Apache Kafka server will be exposed to.
+#export KFK_SERVER_PORT=${KFK_SERVER_PORT:-"9092"}
+#
+## If not already set, if flag is YES, Apache Kafka will be redeployed and topic will be lost.
+#export KFK_REDEPLOY=${KFK_REDEPLOY:-""}
########################################################################################################################
# Automated steps start here
@@ -153,12 +153,12 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type=
--from-literal=CRDB_SSLMODE=require
printf "\n"
-echo ">>> Create Secret with Apache Kakfa..."
-KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')
-kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
- --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
- --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}
-printf "\n"
+#echo ">>> Create Secret with Apache Kafka..."
+#KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')
+#kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
+# --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
+# --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}
+#printf "\n"
echo "Create secret with NATS data"
NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')
diff --git a/hackfest5/redeploy-tfs.sh b/hackfest5/redeploy-tfs.sh
index 13f97cc77..8ea927241 100755
--- a/hackfest5/redeploy-tfs.sh
+++ b/hackfest5/redeploy-tfs.sh
@@ -14,4 +14,9 @@
# limitations under the License.
source ~/tfs-ctrl/hackfest5/deploy_specs.sh
+
+helm3 uninstall --namespace ${NATS_NAMESPACE} ${NATS_NAMESPACE}
+kubectl delete namespace ${NATS_NAMESPACE} --ignore-not-found
+kubectl delete namespace ${KFK_NAMESPACE} --ignore-not-found
+
./deploy/all.sh
--
GitLab