deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Update networkpolicy version (#1307)

Browse Source
This commit is contained in:
Hang Yan 2020-08-07 18:13:20 +08:00 committed by GitHub
parent d35549d03d
commit 4d7183f86c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 223 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/transformer/kubernetes/kubernetes.go
View File

@ -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,

15
script/test/fixtures/v3.0/docker-compose.yaml vendored
View File

@ -10,4 +10,17 @@ services:
interval: 10s
timeout: 1s
retries: 5
restart: "unless-stopped"
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

102
script/test/fixtures/v3.0/output-k8s.json vendored
View File

@ -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",

106
script/test/fixtures/v3.0/output-os.json vendored
View File

@ -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",