fix: update part of e2e tests

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

pkg/transformer/openshift/openshift.go

@@ -428,7 +428,9 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
 	// sort all object so Services are first
 	o.SortServicesFirst(&allobjects)
 	o.RemoveDupObjects(&allobjects)
+	if komposeObject.Namespace != "" {
 		transformer.AssignNamespaceToObjects(&allobjects, komposeObject.Namespace)
+	}
 	// o.FixWorkloadVersion(&allobjects)
 
 	return allobjects, nil

script/test/cmd/lib.sh

@@ -100,7 +100,7 @@ function convert::match_output() {
     convert::run_cmd $cmd
     exit_status=$?
     if [ $exit_status -ne 0 ]; then FAIL_MSGS=$FAIL_MSGS"exit status: $exit_status\n"; return $exit_status; fi
-    match=$(diff <(yq ea '[.] | sort_by(.metadata.name) | .[] | splitDoc' $expected_output) <(yq ea '[.] | sort_by(.metadata.name) | .[] | splitDoc' $TEMP_STDOUT))
+    match=$(diff <(yq -P 'sort_keys(..)' -o=props $expected_output) <(yq -P 'sort_keys(..)' -o=props $TEMP_STDOUT))
     echo "$match" > /tmp/diff
     if [ "$match" == "" ]; then SUCCESS_MSGS=$SUCCESS_MSGS"converted output matches\n"; return 0;
     else FAIL_MSGS=$FAIL_MSGS"converted output does not match\n"; cat /tmp/diff; rm /tmp/diff; return 1; 

script/test/cmd/tests_new.sh

@@ -250,7 +250,7 @@ convert::expect_success_and_warning "$k8s_cmd" "$k8s_output"
 convert::expect_success_and_warning "$os_cmd" "$os_output"
 
 # Test support for compose.yaml file
-k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/compose-file-support/docker-compose.yaml convert --stdout --with-kompose-annotation=false"
+k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/compose-file-support/compose.yaml convert --stdout --with-kompose-annotation=false"
 k8s_output="$KOMPOSE_ROOT/script/test/fixtures/compose-file-support/output-k8s.yaml"
 convert::expect_success "$k8s_cmd" "$k8s_output"
 
@@ -273,11 +273,6 @@ k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/network-policies/docker-c
 k8s_output="$KOMPOSE_ROOT/script/test/fixtures/network-policies/output-k8s.yaml"
 convert::expect_success "$k8s_cmd" "$k8s_output"
 
-# Test support for custom build and push images
-k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/custom-build-push/docker-compose.yaml convert --build-command 'docker build -t ahmedgrati/kompose-test ./script/test/fixtures/custom-build-push' --push-command 'docker push ahmedgrati/kompose-test' --stdout --with-kompose-annotation=false"
-k8s_output="$KOMPOSE_ROOT/script/test/fixtures/custom-build-push/output-k8s.yaml"
-convert::expect_success "$k8s_cmd" "$k8s_output"
-
 # Test support for namespace generation
 k8s_cmd="kompose -f ./script/test/fixtures/namespace/docker-compose.yaml convert --stdout --with-kompose-annotation=false -n web"
 k8s_output="$KOMPOSE_ROOT/script/test/fixtures/namespace/output-k8s.yaml"

script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -80,7 +77,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/change-in-volume/output-k8s.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -80,7 +77,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -95,7 +92,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -120,7 +116,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -180,7 +175,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/change-in-volume/output-os.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -49,7 +47,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -95,7 +92,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -120,7 +116,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -180,7 +175,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/compose-env-interpolation/output-k8s.yaml

@@ -30,20 +30,3 @@ spec:
           resources: {}
       restartPolicy: Always
 status: {}
-
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  creationTimestamp: null
-  name: compose-env-interpolation-default
-spec:
-  ingress:
-    - from:
-        - podSelector:
-            matchLabels:
-              io.kompose.network/compose-env-interpolation-default: "true"
-  podSelector:
-    matchLabels:
-      io.kompose.network/compose-env-interpolation-default: "true"
-

script/test/fixtures/compose-file-support/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -55,7 +54,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db-cm0
-  namespace: default
 
 ---
 apiVersion: apps/v1
@@ -67,7 +65,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -118,7 +115,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -132,5 +128,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
 

script/test/fixtures/configmap-volume/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -51,7 +50,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db-cm0
-  namespace: default
 
 ---
 apiVersion: apps/v1
@@ -61,7 +59,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -110,7 +107,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -124,5 +120,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
 

script/test/fixtures/configmap-volume/output-os-withlabel.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -66,7 +65,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -95,7 +93,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db-cm0
-  namespace: default
 
 ---
 apiVersion: apps.openshift.io/v1
@@ -107,7 +104,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -170,7 +166,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -198,7 +193,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -212,5 +206,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
 

script/test/fixtures/configmap-volume/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -64,7 +63,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -93,7 +91,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db-cm0
-  namespace: default
 
 ---
 apiVersion: apps.openshift.io/v1
@@ -103,7 +100,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -166,7 +162,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -194,7 +189,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -208,5 +202,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
 

script/test/fixtures/custom-build-push/Dockerfile

@@ -1,3 +0,0 @@
-FROM busybox
-
-CMD ["sleep", "4800"]

script/test/fixtures/custom-build-push/docker-compose.yaml

@@ -1,10 +0,0 @@
-version: '3.8'
-
-networks:
-  web:
-
-services:
-  nginx:
-    image: nginx
-    networks: 
-    - web

script/test/fixtures/custom-build-push/output-k8s.yaml

@@ -1,44 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: nginx
-  name: nginx
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      io.kompose.service: nginx
-  strategy: {}
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        io.kompose.network/custom-build-push-web: "true"
-        io.kompose.service: nginx
-    spec:
-      containers:
-        - image: nginx
-          name: nginx
-          resources: {}
-      restartPolicy: Always
-status: {}
-
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  creationTimestamp: null
-  name: custom-build-push-web
-spec:
-  ingress:
-    - from:
-        - podSelector:
-            matchLabels:
-              io.kompose.network/custom-build-push-web: "true"
-  podSelector:
-    matchLabels:
-      io.kompose.network/custom-build-push-web: "true"
-

script/test/fixtures/deploy/placement/output-placement-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   ports:
     - name: "6379"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/deploy/placement/output-placement-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   ports:
     - name: "6379"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -104,7 +102,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/env/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: namenode
   name: namenode
-  namespace: default
 spec:
   ports:
     - name: "50070"
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: another-namenode
   name: another-namenode
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -48,12 +46,12 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   key: BAR
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
             - name: FOO
               valueFrom:
                 configMapKeyRef:
                   key: FOO
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
           image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8
           name: another-namenode
           resources: {}
@@ -69,9 +67,8 @@ kind: ConfigMap
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: another-namenode-home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+    io.kompose.service: another-namenode-Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
-  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
-  namespace: default
 
 ---
 apiVersion: apps/v1
@@ -81,7 +78,6 @@ metadata:
   labels:
     io.kompose.service: namenode
   name: namenode
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -101,14 +97,14 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   key: BAR
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
             - name: CLUSTER_NAME
               value: test
             - name: FOO
               valueFrom:
                 configMapKeyRef:
                   key: FOO
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
           image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8
           name: namenode
           ports:

script/test/fixtures/env/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: namenode
   name: namenode
-  namespace: default
 spec:
   ports:
     - name: "50070"
@@ -29,9 +28,8 @@ kind: ConfigMap
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: another-namenode-home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+    io.kompose.service: another-namenode-Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
-  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
-  namespace: default
 
 ---
 apiVersion: apps.openshift.io/v1
@@ -41,7 +39,6 @@ metadata:
   labels:
     io.kompose.service: another-namenode
   name: another-namenode
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -61,12 +58,12 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   key: BAR
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
             - name: FOO
               valueFrom:
                 configMapKeyRef:
                   key: FOO
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
           image: ' '
           name: another-namenode
           resources: {}
@@ -98,7 +95,6 @@ metadata:
   labels:
     io.kompose.service: another-namenode
   name: another-namenode
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -123,7 +119,6 @@ metadata:
   labels:
     io.kompose.service: namenode
   name: namenode
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -143,14 +138,14 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   key: BAR
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
             - name: CLUSTER_NAME
               value: test
             - name: FOO
               valueFrom:
                 configMapKeyRef:
                   key: FOO
-                  name: home-runner-work-kompose-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
+                  name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env
           image: ' '
           name: namenode
           ports:
@@ -189,7 +184,6 @@ metadata:
   labels:
     io.kompose.service: namenode
   name: namenode
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/envvars-interpolation/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: myservice
   name: myservice
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/envvars-interpolation/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: myservice
   name: myservice
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -60,7 +59,6 @@ metadata:
   labels:
     io.kompose.service: myservice
   name: myservice
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/expose/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   ports:
     - name: "6379"
@@ -29,7 +28,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -48,7 +46,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -84,7 +81,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -125,7 +121,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ingressClassName: nginx
   rules:

script/test/fixtures/expose/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   ports:
     - name: "6379"
@@ -29,7 +28,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   ports:
     - name: "5000"
@@ -48,7 +46,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -97,7 +94,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -126,7 +122,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -176,7 +171,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -201,7 +195,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   host: batman.example.com/dev,batwoman.example.com
   port:

script/test/fixtures/external-traffic-policy/output-k8s-v1.yaml

@@ -11,7 +11,6 @@ metadata:
   labels:
     io.kompose.service: front-end-tcp
   name: front-end-tcp
-  namespace: default
 spec:
   externalTrafficPolicy: Local
   ports:
@@ -37,7 +36,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml

@@ -11,7 +11,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -37,7 +36,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -83,7 +81,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   ingressClassName: nginx
   rules:

script/test/fixtures/external-traffic-policy/output-os-v1.yaml

@@ -11,7 +11,6 @@ metadata:
   labels:
     io.kompose.service: front-end-tcp
   name: front-end-tcp
-  namespace: default
 spec:
   externalTrafficPolicy: Local
   ports:
@@ -37,7 +36,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -90,7 +88,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/external-traffic-policy/output-os-v2.yaml

@@ -11,7 +11,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -37,7 +36,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -90,7 +88,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -115,7 +112,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   host: lb
   port:

script/test/fixtures/fsgroup/output-k8s.yaml

@@ -60,20 +60,3 @@ spec:
     requests:
       storage: 100Mi
 status: {}
-
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  creationTimestamp: null
-  name: fsgroup-default
-spec:
-  ingress:
-    - from:
-        - podSelector:
-            matchLabels:
-              io.kompose.network/fsgroup-default: "true"
-  podSelector:
-    matchLabels:
-      io.kompose.network/fsgroup-default: "true"
-

script/test/fixtures/healthcheck/output-healthcheck-k8s.yaml

@@ -13,7 +13,6 @@ metadata:
   labels:
     io.kompose.service: my-group
   name: mongo
-  namespace: default
 spec:
   ports:
     - name: "27017"
@@ -39,7 +38,6 @@ metadata:
   labels:
     io.kompose.service: my-group
   name: mysql
-  namespace: default
 spec:
   ports:
     - name: "3306"
@@ -66,7 +64,6 @@ metadata:
   labels:
     io.kompose.service: postgresql
   name: postgresql
-  namespace: default
 spec:
   ports:
     - name: "5432"
@@ -90,7 +87,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   ports:
     - name: "6379"
@@ -116,7 +112,6 @@ metadata:
   labels:
     io.kompose.service: my-group
   name: my-group
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -193,7 +188,6 @@ metadata:
   labels:
     io.kompose.service: postgresql
   name: postgresql
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -252,7 +246,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/healthcheck/output-healthcheck-os.yaml

@@ -13,7 +13,6 @@ metadata:
   labels:
     io.kompose.service: mongo
   name: mongo
-  namespace: default
 spec:
   ports:
     - name: "27017"
@@ -39,7 +38,6 @@ metadata:
   labels:
     io.kompose.service: mysql
   name: mysql
-  namespace: default
 spec:
   ports:
     - name: "3306"
@@ -66,7 +64,6 @@ metadata:
   labels:
     io.kompose.service: postgresql
   name: postgresql
-  namespace: default
 spec:
   ports:
     - name: "5432"
@@ -90,7 +87,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   ports:
     - name: "6379"
@@ -116,7 +112,6 @@ metadata:
   labels:
     io.kompose.service: mongo
   name: mongo
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -177,7 +172,6 @@ metadata:
   labels:
     io.kompose.service: mongo
   name: mongo
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -209,7 +203,6 @@ metadata:
   labels:
     io.kompose.service: mysql
   name: mysql
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -270,7 +263,6 @@ metadata:
   labels:
     io.kompose.service: mysql
   name: mysql
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -303,7 +295,6 @@ metadata:
   labels:
     io.kompose.service: postgresql
   name: postgresql
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -366,7 +357,6 @@ metadata:
   labels:
     io.kompose.service: postgresql
   name: postgresql
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -396,7 +386,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -460,7 +449,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/host-port-protocol/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: nginx
   name: nginx
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: nginx
   name: nginx
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/host-port-protocol/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: nginx
   name: nginx
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: nginx
   name: nginx
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -75,7 +73,6 @@ metadata:
   labels:
     io.kompose.service: nginx
   name: nginx
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/multiple-files/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: bar
   name: bar
-  namespace: default
 spec:
   replicas: 99
   selector:
@@ -35,7 +34,6 @@ metadata:
   labels:
     io.kompose.service: foo
   name: foo
-  namespace: default
 spec:
   replicas: 3
   selector:

script/test/fixtures/multiple-files/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: bar
   name: bar
-  namespace: default
 spec:
   replicas: 99
   selector:
@@ -52,7 +51,6 @@ metadata:
   labels:
     io.kompose.service: bar
   name: bar
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -77,7 +75,6 @@ metadata:
   labels:
     io.kompose.service: foo
   name: foo
-  namespace: default
 spec:
   replicas: 3
   selector:
@@ -123,7 +120,6 @@ metadata:
   labels:
     io.kompose.service: foo
   name: foo
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/multiple-type-volumes/output-k8s.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -47,7 +46,6 @@ metadata:
   labels:
     io.kompose.service: db-data
   name: db-data
-  namespace: default
 spec:
   accessModes:
     - ReadWriteOnce
@@ -66,7 +64,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -117,7 +114,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -131,5 +127,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
 

script/test/fixtures/multiple-type-volumes/output-os.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -62,7 +61,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -87,7 +85,6 @@ metadata:
   labels:
     io.kompose.service: db-data
   name: db-data
-  namespace: default
 spec:
   accessModes:
     - ReadWriteOnce
@@ -106,7 +103,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -169,7 +165,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -197,7 +192,6 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm0
-  namespace: default
 
 ---
 apiVersion: v1
@@ -211,5 +205,4 @@ metadata:
   labels:
     io.kompose.service: web
   name: web-cm1
-  namespace: default
 

script/test/fixtures/read-only/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: test
   name: test
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: test
   name: test
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/read-only/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: test
   name: test
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: test
   name: test
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -77,7 +75,6 @@ metadata:
   labels:
     io.kompose.service: test
   name: test
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/service-group/output-k8s.yaml

@@ -4,16 +4,15 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: dispatcher-librenms
+    io.kompose.service: librenms-dispatcher
   name: librenms
-  namespace: default
 spec:
   ports:
     - name: "8000"
       port: 8000
       targetPort: 8000
   selector:
-    io.kompose.service: dispatcher-librenms
+    io.kompose.service: librenms-dispatcher
 status:
   loadBalancer: {}
 
@@ -23,14 +22,13 @@ kind: Deployment
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: dispatcher-librenms
+    io.kompose.service: librenms-dispatcher
-  name: dispatcher-librenms
+  name: librenms-dispatcher
-  namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: dispatcher-librenms
+      io.kompose.service: librenms-dispatcher
   strategy:
     type: Recreate
   template:
@@ -38,17 +36,9 @@ spec:
       creationTimestamp: null
       labels:
         io.kompose.network/service-group-default: "true"
-        io.kompose.service: dispatcher-librenms
+        io.kompose.service: librenms-dispatcher
     spec:
       containers:
-        - env:
-            - name: TZ
-          image: librenms/dispatcher:latest
-          name: dispatcher
-          resources: {}
-          volumeMounts:
-            - mountPath: /data
-              name: dispatcher-librenms-claim0
         - env:
             - name: TZ
           image: librenms/librenms:latest
@@ -60,13 +50,21 @@ spec:
           resources: {}
           volumeMounts:
             - mountPath: /data
-              name: dispatcher-librenms-claim0
+              name: librenms-dispatcher-claim0
-      hostname: librenms
+        - env:
+            - name: TZ
+          image: librenms/dispatcher:latest
+          name: dispatcher
+          resources: {}
+          volumeMounts:
+            - mountPath: /data
+              name: librenms-dispatcher-claim0
+      hostname: dispatcher
       restartPolicy: Always
       volumes:
-        - name: dispatcher-librenms-claim0
+        - name: librenms-dispatcher-claim0
           persistentVolumeClaim:
-            claimName: dispatcher-librenms-claim0
+            claimName: librenms-dispatcher-claim0
 status: {}
 
 ---
@@ -75,9 +73,8 @@ kind: PersistentVolumeClaim
 metadata:
   creationTimestamp: null
   labels:
-    io.kompose.service: dispatcher-librenms-claim0
+    io.kompose.service: librenms-dispatcher-claim0
-  name: dispatcher-librenms-claim0
+  name: librenms-dispatcher-claim0
-  namespace: default
 spec:
   accessModes:
     - ReadWriteOnce

script/test/fixtures/single-file-output/output-k8s.yaml

@@ -9,7 +9,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front_end
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -31,7 +30,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -73,7 +71,6 @@ metadata:
   labels:
     io.kompose.service: front-end
   name: front-end
-  namespace: default
 spec:
   ingressClassName: nginx
   rules:

script/test/fixtures/statefulset/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -27,7 +26,6 @@ metadata:
   labels:
     io.kompose.service: wordpress
   name: wordpress
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -48,7 +46,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -109,7 +106,6 @@ metadata:
   labels:
     io.kompose.service: wordpress
   name: wordpress
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/statefulset/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   ports:
     - name: "3306"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: wordpress
   name: wordpress
-  namespace: default
 spec:
   ports:
     - name: "8000"
@@ -44,7 +42,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -105,7 +102,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -168,7 +164,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -193,7 +188,6 @@ metadata:
   labels:
     io.kompose.service: wordpress
   name: wordpress
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -254,7 +248,6 @@ metadata:
   labels:
     io.kompose.service: wordpress
   name: wordpress
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -317,7 +310,6 @@ metadata:
   labels:
     io.kompose.service: wordpress
   name: wordpress
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/v2/output-k8s.yaml

@@ -234,22 +234,6 @@ spec:
       - 1234
 status: {}
 
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  creationTimestamp: null
-  name: v2-default
-spec:
-  ingress:
-    - from:
-        - podSelector:
-            matchLabels:
-              io.kompose.network/v2-default: "true"
-  podSelector:
-    matchLabels:
-      io.kompose.network/v2-default: "true"
-
 ---
 apiVersion: apps/v1
 kind: Deployment

script/test/fixtures/v3.0/output-k8s.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: foo
   name: foo
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -65,7 +63,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:

script/test/fixtures/v3.0/output-os.yaml

@@ -8,7 +8,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   clusterIP: None
   ports:
@@ -28,7 +27,6 @@ metadata:
   labels:
     io.kompose.service: foo
   name: foo
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -80,7 +78,6 @@ metadata:
   labels:
     io.kompose.service: foo
   name: foo
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -107,7 +104,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -160,7 +156,6 @@ metadata:
   labels:
     io.kompose.service: redis
   name: redis
-  namespace: default
 spec:
   lookupPolicy:
     local: false

script/test/fixtures/vols-subpath/output-k8s.yaml

@@ -61,20 +61,3 @@ spec:
     requests:
       storage: 100Mi
 status: {}
-
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  creationTimestamp: null
-  name: vols-subpath-default
-spec:
-  ingress:
-    - from:
-        - podSelector:
-            matchLabels:
-              io.kompose.network/vols-subpath-default: "true"
-  podSelector:
-    matchLabels:
-      io.kompose.network/vols-subpath-default: "true"
-

script/test/fixtures/volume-mounts/windows/output-k8s.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -65,7 +63,6 @@ metadata:
   labels:
     io.kompose.service: db-claim0
   name: db-claim0
-  namespace: default
 spec:
   accessModes:
     - ReadWriteOnce

script/test/fixtures/volume-mounts/windows/output-os.yaml

@@ -6,7 +6,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   ports:
     - name: "80"
@@ -25,7 +24,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -82,7 +80,6 @@ metadata:
   labels:
     io.kompose.service: db
   name: db
-  namespace: default
 spec:
   lookupPolicy:
     local: false
@@ -107,7 +104,6 @@ metadata:
   labels:
     io.kompose.service: db-claim0
   name: db-claim0
-  namespace: default
 spec:
   accessModes:
     - ReadWriteOnce