From bde43f260a7c7abdc658bc77755cb4c78633d9a4 Mon Sep 17 00:00:00 2001
From: Waleed Akbar <wakbar@cttc.es>
Date: Tue, 30 Jul 2024 14:43:57 +0000
Subject: [PATCH] Kafka secret added to kpi_value_api/kpi_value_writer
- improvements to accuratly read the env variables
---
deploy/kafka.sh | 2 +-
deploy/tfs.sh | 4 ++--
manifests/kpi_value_apiservice.yaml | 3 +++
manifests/kpi_value_writerservice.yaml | 3 +++
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/deploy/kafka.sh b/deploy/kafka.sh
index b2f2f1f9e..21ba89408 100755
--- a/deploy/kafka.sh
+++ b/deploy/kafka.sh
@@ -81,7 +81,7 @@ echo ">>> Checking if Apache Kafka is deployed ... "
if [ "$KFK_REDEPLOY" == "YES" ]; then
kafka_deploy
elif kubectl get --namespace ${KFK_NAMESPACE} deployments.apps &> /dev/null; then
- echo ">>> Apache Kafka already present; skipping step..."
+ echo ">>> Apache Kafka already present; skipping step."
else
kafka_deploy
fi
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index d92d789e3..4ecfaae99 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -172,9 +172,9 @@ printf "\n"
echo "Create secret with Apache Kafka kfk-kpi-data for KPI and Telemetry microservices"
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 ${KFK_NAMESPACE} --type='Opaque' \
+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_NAMESPACE}
+ --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}
printf "\n"
echo "Create secret with NATS data"
diff --git a/manifests/kpi_value_apiservice.yaml b/manifests/kpi_value_apiservice.yaml
index 74eb90f67..e4dcb0054 100644
--- a/manifests/kpi_value_apiservice.yaml
+++ b/manifests/kpi_value_apiservice.yaml
@@ -39,6 +39,9 @@ spec:
env:
- name: LOG_LEVEL
value: "INFO"
+ envFrom:
+ - secretRef:
+ name: kfk-kpi-data
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:30020"]
diff --git a/manifests/kpi_value_writerservice.yaml b/manifests/kpi_value_writerservice.yaml
index 8a8e44ec2..e21e36f48 100644
--- a/manifests/kpi_value_writerservice.yaml
+++ b/manifests/kpi_value_writerservice.yaml
@@ -39,6 +39,9 @@ spec:
env:
- name: LOG_LEVEL
value: "INFO"
+ envFrom:
+ - secretRef:
+ name: kfk-kpi-data
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:30030"]
--
GitLab