Feat add ns generation (#1667)

* feat: add ns generation for k8s

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

* feat: add ns generation for openshift

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

* test: add functional tests

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

* fix: remove some code nits

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

---------

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

script/test/cmd/tests_new.sh

@@ -271,11 +271,19 @@ convert::expect_success "$os_cmd" "$os_output"
 # Test support for network policies generation
 k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/network-policies/docker-compose.yaml convert --generate-network-policies --stdout --with-kompose-annotation=false"
 k8s_output="$KOMPOSE_ROOT/script/test/fixtures/network-policies/output-k8s.yaml"
-convert::expect_success "$os_cmd" "$os_output"
+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"
+os_cmd="kompose -f ./script/test/fixtures/namespace/docker-compose.yaml convert --stdout --with-kompose-annotation=false -n web --provider openshift"
+os_output="$KOMPOSE_ROOT/script/test/fixtures/namespace/output-os.yaml"
+convert::expect_success "$k8s_cmd" "$k8s_output"
 convert::expect_success "$os_cmd" "$os_output"
 
 # Test support for read only root fs

script/test/fixtures/namespace/docker-compose.yaml

@@ -0,0 +1,6 @@
+version: '3'
+services:
+  web:
+    image: nginx
+    ports:
+    - 80:80

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

@@ -0,0 +1,62 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: web
+  name: web
+  namespace: web
+spec:
+  ports:
+    - name: "80"
+      port: 80
+      targetPort: 80
+  selector:
+    io.kompose.service: web
+status:
+  loadBalancer: {}
+
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  creationTimestamp: null
+  name: web
+  namespace: web
+spec: {}
+status: {}
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: web
+  name: web
+  namespace: web
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: web
+  strategy: {}
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.network/namespace-default: "true"
+        io.kompose.service: web
+    spec:
+      containers:
+        - image: nginx
+          name: web
+          ports:
+            - containerPort: 80
+              hostPort: 80
+              protocol: TCP
+          resources: {}
+      restartPolicy: Always
+status: {}
+

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

@@ -0,0 +1,104 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: web
+  name: web
+  namespace: web
+spec:
+  ports:
+    - name: "80"
+      port: 80
+      targetPort: 80
+  selector:
+    io.kompose.service: web
+status:
+  loadBalancer: {}
+
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  creationTimestamp: null
+  name: web
+  namespace: web
+spec: {}
+status: {}
+
+---
+apiVersion: apps.openshift.io/v1
+kind: DeploymentConfig
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: web
+  name: web
+  namespace: web
+spec:
+  replicas: 1
+  selector:
+    io.kompose.service: web
+  strategy:
+    resources: {}
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        io.kompose.network/namespace-default: "true"
+        io.kompose.service: web
+    spec:
+      containers:
+        - image: ' '
+          name: web
+          ports:
+            - containerPort: 80
+              hostPort: 80
+              protocol: TCP
+          resources: {}
+      restartPolicy: Always
+  test: false
+  triggers:
+    - type: ConfigChange
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - web
+        from:
+          kind: ImageStreamTag
+          name: web:latest
+      type: ImageChange
+status:
+  availableReplicas: 0
+  latestVersion: 0
+  observedGeneration: 0
+  replicas: 0
+  unavailableReplicas: 0
+  updatedReplicas: 0
+
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: web
+  name: web
+  namespace: web
+spec:
+  lookupPolicy:
+    local: false
+  tags:
+    - annotations: null
+      from:
+        kind: DockerImage
+        name: nginx
+      generation: null
+      importPolicy: {}
+      name: latest
+      referencePolicy:
+        type: ""
+status:
+  dockerImageRepository: ""
+

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

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

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

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