Modified namespace optional test file

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
+              python test/integration/k8s-deploy-test.py namespace=test-namespace kind=Deployment name=test-deployment containerName=nginx labels=app:test-app selectorLabels=app:test-app
 
-         - name: Verify deployment in default namespace
+         - name: Verify deployment in default namespace (test_no_ns.yaml)
            run: |
-              python test/integration/k8s-deploy-test.py namespace=default kind=Deployment name=test-deployment-no-ns
+              python test/integration/k8s-deploy-test.py namespace=default kind=Deployment name=test-deployment-no-ns containerName=nginx labels=app:test-app selectorLabels=app:test-app
 
          - name: Test - Deploys the same resource to two different namespaces without conflict
            uses: ./
@@ -111,17 +111,18 @@ jobs:
 
          - name: Verify deployment in namespace2
            run: |
-              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
+              python test/integration/k8s-deploy-test.py namespace=${{ env.NAMESPACE1 }} kind=Deployment name=test-deployment-no-ns containerName=nginx 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 labels=app:test-app selectorLabels=app:test-app
 
          - name: Cleanup
            run: |
               echo "Cleaning up resources..."
-              python test/integration/k8s-deploy-delete.py 'Deployment' 'test-deployment' ${{ env.NAMESPACE1 }}
+              python test/integration/k8s-deploy-delete.py 'Deployment' 'test-deployment' test-namespace
               python test/integration/k8s-deploy-delete.py 'Deployment' 'test-deployment-no-ns' ${{ env.NAMESPACE1 }}
               python test/integration/k8s-deploy-delete.py 'Deployment' 'test-deployment-no-ns' ${{ env.NAMESPACE2 }}
               python test/integration/k8s-deploy-delete.py 'Deployment' 'test-deployment-no-ns' default
 
               kubectl delete ns ${{ env.NAMESPACE1 }}
               kubectl delete ns ${{ env.NAMESPACE2 }}
+              kubectl delete ns test-namespace
               rm -rf test_with_ns.yaml test_no_ns.yaml

test/integration/k8s-deploy-test.py

@@ -195,27 +195,6 @@ 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
@@ -258,8 +237,8 @@ def main():
         sys.exit(msg + " " + suffix)
 
     if kind == 'Deployment':
-        verify_deployment_namespace(namespace, kind, name)
-        RESULT, msg = verifyDeployment(k8_object, parsedArgs)
+        RESULT, msg = verifyDeployment(
+            k8_object, parsedArgs)
     if kind == 'Service':
         RESULT, msg = verifyService(
             k8_object, parsedArgs)
@@ -275,4 +254,4 @@ def main():
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main())