fix generic

basic_test_fastapi/.secrets.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: redis-secret
+  name: basic-test-app-secrets
   namespace: basic-ns11
 type: Opaque
 data:
@@ -10,7 +10,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: redis-secret
+  name: basic-test-app-secrets
   namespace: basic-ns12
 type: Opaque
 data:

basic_test_fastapi/nodeport_example/delete.sh

@@ -3,9 +3,12 @@ NAMESPACE="basic-ns11"
 kubectl delete -f deploy_nodeport.yaml
 
 # Wait for the pods to be deleted
-while kubectl get pods -l run=$APP_NAME -n $NAMESPACE; do 
-  echo "Waiting for pods to terminate..."
+while true; do 
+  OUTPUT=$(kubectl get pods -l run=$APP_NAME -n $NAMESPACE 2>&1)
+  echo "$OUTPUT"
+  if [[ "$OUTPUT" == *"No resources found"* ]]; then
+    echo "All pods terminated."
+    break
+  fi
   sleep 5
 done
-
-echo "All pods terminated."

basic_test_fastapi/nodeport_example/deploy_nodeport.yaml

@@ -20,7 +20,7 @@ spec:
         - name: REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: redis-secret
+              name: basic-test-app-secrets
               key: redis-password
         args: ["--requirepass", "$(REDIS_PASSWORD)"]        
         ports:
@@ -72,7 +72,7 @@ spec:
         - name: REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: redis-secret
+              name: basic-test-app-secrets
               key: redis-password
 ---
 apiVersion: v1

basic_test_fastapi/nodeport_example/log_nodeport.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 NAMESPACE=basic-ns11
 POD_NAME=$(kubectl get pods -n $NAMESPACE -o jsonpath="{.items[0].metadata.name}")
-kubectl logs -n basic-ns11 $POD_NAME
+kubectl logs -n basic-ns11 $POD_NAME -f
 

basic_test_fastapi/src/engine.py

@@ -6,12 +6,12 @@
 
 from app_utils import safe_jsonify
 
-__VER__ = '0.2.5'
+__VER__ = '0.3.0'
 
 
 class AppPaths:
   PATH_ROOT = {"PATH": "/", "FUNC": "root"}
-  PATH_STAT = {"PATH": "/stat", "FUNC": "stat"  }
+  PATH_STAT = {"PATH": "/stats", "FUNC": "stats"  }
 
 class AppHandler:
   def __init__(self):
@@ -108,24 +108,24 @@ def handle_request(self, path):
     self.process_data()
     if path in self.__avail_paths:
       func_name = '_handle_' + self.__path_to_func[path]
-      msg = getattr(self, func_name)()
+      msg = getattr(self, func_name)(path=path)
     else:
       msg = self.__handle_generic(path)
     result = self._pack_result(msg)
     return result
 
 
-  def _handle_root(self):
+  def _handle_root(self, **kwargs):
     msg = "Handler '{}', Local/Global: {}/{}, HOSTNAME: '{}', ID: '{}'".format(
-      AppPaths.PATH_ROOT, self.__local_count, self.get_cluster_count(),
+      kwargs['path'], self.__local_count, self.get_cluster_count(),
       self.hostname, self.str_local_id
     )    
     return msg
 
-  def _handle_stat(self):
+  def _handle_stat(self, **kwargs):
     dct_result = {
       'info' : "Handler '{}', Worker HOSTNAME: '{}', ID: '{}'".format(
-        AppPaths.PATH_STAT, self.hostname, self.str_local_id
+        kwargs['path'], self.hostname, self.str_local_id
       ),
       'local_count' : self.__local_count,
       'cluster_count' : self.get_cluster_count(),
@@ -134,7 +134,7 @@ def _handle_stat(self):
     return dct_result
 
 
-  def __handle_generic(self, path):
+  def __handle_generic(self, path, **kwargs):
     msg = "Generic handler '{}', Local/Global: {}/{}, HOSTNAME: '{}', ID: '{}'".format(
       path, self.__local_count, self.get_cluster_count(),
       self.hostname, self.str_local_id

basic_test_fastapi/src/main.py

@@ -10,18 +10,17 @@
 
 @router1.get(AppPaths.PATH_ROOT['PATH'])
 async def root():
-  result = engine.handle_request(AppPaths.PATH_ROOT['PATH'])
-  return result
+  return engine.handle_request(AppPaths.PATH_ROOT['PATH'])
 
 @router1.get(AppPaths.PATH_STAT['PATH'])
 async def stat():
-  result = engine.handle_request(AppPaths.PATH_STAT['PATH'])
-  return result
+  return engine.handle_request(AppPaths.PATH_STAT['PATH'])
 
 # note: this is a catch-all route, so it should be the last route in the router
 @router1.get("/{full_path:path}", include_in_schema=False)
 async def catch_all(full_path: str):
-  result = engine.handle_request(full_path)
+  return engine.handle_request(full_path)
+
 
 
 app.include_router(router1)