From 4d7183f86c025120b2753752fdc4d6d329ee15da Mon Sep 17 00:00:00 2001
From: Hang Yan <hangyan@alauda.io>
Date: Fri, 7 Aug 2020 18:13:20 +0800
Subject: [PATCH] Update networkpolicy version (#1307)

---
 pkg/transformer/kubernetes/kubernetes.go      |   2 +-
 script/test/fixtures/v3.0/docker-compose.yaml |  15 ++-
 script/test/fixtures/v3.0/output-k8s.json     | 102 +++++++++++++++++
 script/test/fixtures/v3.0/output-os.json      | 106 ++++++++++++++++++
 4 files changed, 223 insertions(+), 2 deletions(-)

diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go
index 64f9c5cd..6ada5506 100755
--- a/pkg/transformer/kubernetes/kubernetes.go
+++ b/pkg/transformer/kubernetes/kubernetes.go
@@ -1072,7 +1072,7 @@ func (k *Kubernetes) CreateNetworkPolicy(name string, networkName string) (*netw
 	np := &networkingv1.NetworkPolicy{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "NetworkPolicy",
-			APIVersion: "extensions/v1beta1",
+			APIVersion: "networking.k8s.io/v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: networkName,
diff --git a/script/test/fixtures/v3.0/docker-compose.yaml b/script/test/fixtures/v3.0/docker-compose.yaml
index 5c2a8def..c7eef686 100644
--- a/script/test/fixtures/v3.0/docker-compose.yaml
+++ b/script/test/fixtures/v3.0/docker-compose.yaml
@@ -10,4 +10,17 @@ services:
       interval: 10s
       timeout: 1s
       retries: 5
-    restart: "unless-stopped"
\ No newline at end of file
+    restart: "unless-stopped"
+  foo:
+    image: foo:latest
+    command: sh -c "echo Hello Foo"
+    networks:
+      app: {}
+      web: {}
+networks:
+  app:
+    external:
+      name: app-network
+  web:
+    external:
+      name: web-network
\ No newline at end of file
diff --git a/script/test/fixtures/v3.0/output-k8s.json b/script/test/fixtures/v3.0/output-k8s.json
index 5511485d..c06aae0d 100644
--- a/script/test/fixtures/v3.0/output-k8s.json
+++ b/script/test/fixtures/v3.0/output-k8s.json
@@ -33,6 +33,108 @@
         "loadBalancer": {}
       }
     },
+    {
+      "kind": "Deployment",
+      "apiVersion": "apps/v1",
+      "metadata": {
+        "name": "foo",
+        "creationTimestamp": null,
+        "labels": {
+          "io.kompose.service": "foo"
+        }
+      },
+      "spec": {
+        "replicas": 1,
+        "selector": {
+          "matchLabels": {
+            "io.kompose.service": "foo"
+          }
+        },
+        "template": {
+          "metadata": {
+            "creationTimestamp": null,
+            "labels": {
+              "io.kompose.network/app-network": "true",
+              "io.kompose.network/web-network": "true",
+              "io.kompose.service": "foo"
+            }
+          },
+          "spec": {
+            "containers": [
+              {
+                "name": "foo",
+                "image": "foo:latest",
+                "args": [
+                  "sh",
+                  "-c",
+                  "echo Hello Foo"
+                ],
+                "resources": {}
+              }
+            ],
+            "restartPolicy": "Always"
+          }
+        },
+        "strategy": {}
+      },
+      "status": {}
+    },
+    {
+      "kind": "NetworkPolicy",
+      "apiVersion": "networking.k8s.io/v1",
+      "metadata": {
+        "name": "app-network",
+        "creationTimestamp": null
+      },
+      "spec": {
+        "podSelector": {
+          "matchLabels": {
+            "io.kompose.network/app-network": "true"
+          }
+        },
+        "ingress": [
+          {
+            "from": [
+              {
+                "podSelector": {
+                  "matchLabels": {
+                    "io.kompose.network/app-network": "true"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "kind": "NetworkPolicy",
+      "apiVersion": "networking.k8s.io/v1",
+      "metadata": {
+        "name": "web-network",
+        "creationTimestamp": null
+      },
+      "spec": {
+        "podSelector": {
+          "matchLabels": {
+            "io.kompose.network/web-network": "true"
+          }
+        },
+        "ingress": [
+          {
+            "from": [
+              {
+                "podSelector": {
+                  "matchLabels": {
+                    "io.kompose.network/web-network": "true"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "kind": "Deployment",
       "apiVersion": "apps/v1",
diff --git a/script/test/fixtures/v3.0/output-os.json b/script/test/fixtures/v3.0/output-os.json
index 56ab61bb..6fca20db 100644
--- a/script/test/fixtures/v3.0/output-os.json
+++ b/script/test/fixtures/v3.0/output-os.json
@@ -33,6 +33,112 @@
         "loadBalancer": {}
       }
     },
+    {
+      "kind": "DeploymentConfig",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "foo",
+        "creationTimestamp": null,
+        "labels": {
+          "io.kompose.service": "foo"
+        }
+      },
+      "spec": {
+        "strategy": {
+          "resources": {}
+        },
+        "triggers": [
+          {
+            "type": "ConfigChange"
+          },
+          {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": true,
+              "containerNames": [
+                "foo"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "foo:latest"
+              }
+            }
+          }
+        ],
+        "replicas": 1,
+        "test": false,
+        "selector": {
+          "io.kompose.service": "foo"
+        },
+        "template": {
+          "metadata": {
+            "creationTimestamp": null,
+            "labels": {
+              "io.kompose.network/app-network": "true",
+              "io.kompose.network/web-network": "true",
+              "io.kompose.service": "foo"
+            }
+          },
+          "spec": {
+            "containers": [
+              {
+                "name": "foo",
+                "image": " ",
+                "args": [
+                  "sh",
+                  "-c",
+                  "echo Hello Foo"
+                ],
+                "resources": {}
+              }
+            ],
+            "restartPolicy": "Always"
+          }
+        }
+      },
+      "status": {
+        "latestVersion": 0,
+        "observedGeneration": 0,
+        "replicas": 0,
+        "updatedReplicas": 0,
+        "availableReplicas": 0,
+        "unavailableReplicas": 0
+      }
+    },
+    {
+      "kind": "ImageStream",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "foo",
+        "creationTimestamp": null,
+        "labels": {
+          "io.kompose.service": "foo"
+        }
+      },
+      "spec": {
+        "lookupPolicy": {
+          "local": false
+        },
+        "tags": [
+          {
+            "name": "",
+            "annotations": null,
+            "from": {
+              "kind": "DockerImage",
+              "name": "foo:latest"
+            },
+            "generation": null,
+            "importPolicy": {},
+            "referencePolicy": {
+              "type": ""
+            }
+          }
+        ]
+      },
+      "status": {
+        "dockerImageRepository": ""
+      }
+    },
     {
       "kind": "DeploymentConfig",
       "apiVersion": "v1",