Fixed integration tests issue

Author: benjaminbob21

.github/workflows/run-integration-tests-namespace-optional.yml

@@ -94,11 +94,11 @@ jobs:
 
          - name: Verify deployment in namespace1
            run: |
-              python test/integration/k8s-deploy-test.py namespace=test-namespace kind=Deployment name=test-deployment containerName=nginx:1.14.2 labels=app:test-app selectorLabels=app:test-app
+              python test/integration/k8s-deploy-test.py namespace=test-namespace kind=Deployment name=test-deployment
 
          - name: Verify deployment in default namespace
            run: |
-              python test/integration/k8s-deploy-test.py namespace=default kind=Deployment name=test-deployment-no-ns containerName=nginx:1.14.2 labels=app:test-app selectorLabels=app:test-app
+              python test/integration/k8s-deploy-test.py namespace=default kind=Deployment name=test-deployment-no-ns
 
          - name: Test - Deploys the same resource to two different namespaces without conflict
            uses: ./
@@ -111,8 +111,8 @@ jobs:
 
          - name: Verify deployment in namespace2
            run: |
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE1 }} kind=Deployment name=test-deployment-no-ns containerName=nginx:1.14.2 labels=app:test-app selectorLabels=app:test-app
-              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE2 }} kind=Deployment name=test-deployment-no-ns containerName=nginx:1.14.2 labels=app:test-app selectorLabels=app:test-app
+              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE1 }} kind=Deployment name=test-deployment-no-ns
+              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE2 }} kind=Deployment name=test-deployment-no-ns
 
          - name: Cleanup
            run: |

test/integration/k8s-deploy-test.py

@@ -195,6 +195,27 @@ def validateKeyPresence(actualDict: dict, expectedKeys: list):
 
     return True, ""
 
+def verify_deployment_namespace(namespace, kind, name):
+    try:
+        # Retrieve the deployment
+        result = subprocess.run(
+            ["kubectl", "get", kind, name, "-n", namespace, "-o", "jsonpath={.metadata.namespace}"],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        actual_namespace = result.stdout.strip()
+
+        # Check if the namespace matches the expected namespace
+        if actual_namespace == namespace:
+            print(f"Deployment {name} is in the expected namespace: {namespace}")
+        else:
+            print(f"Deployment {name} is in the wrong namespace: {actual_namespace}. Expected: {namespace}")
+            sys.exit(1)
+    except subprocess.CalledProcessError as e:
+        print(f"Failed to retrieve deployment {name} in namespace {namespace}: {e.stderr}")
+        sys.exit(1)
+
 def main():
     parsedArgs: dict = parseArgs(sys.argv[1:])
     RESULT = False
@@ -237,8 +258,8 @@ def main():
         sys.exit(msg + " " + suffix)
 
     if kind == 'Deployment':
-        RESULT, msg = verifyDeployment(
-            k8_object, parsedArgs)
+        verify_deployment_namespace(namespace, kind, name)
+        RESULT, msg = verifyDeployment(k8_object, parsedArgs)
     if kind == 'Service':
         RESULT, msg = verifyService(
             k8_object, parsedArgs)