Kafka secret added to kpi_value_api/kpi_value_writer

 - improvements to accuratly read the env variables

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

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"

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"]

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"]