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

Upgrade deployment/daemonset to apps/v1 (#1207)

Browse Source
This commit is contained in:
Hang Yan
2019-12-26 16:36:11 +08:00
committed by GitHub
parent 73ec0abab2
commit bc28ffc675
101 changed files with 4186 additions and 2966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json
Vendored
+48 -32
View File
@@ -44,8 +44,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
"kompose.service.expose": "batman.example.com",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -70,37 +70,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -109,47 +116,55 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000
@@ -161,10 +176,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json
Vendored
+50 -34
View File
@@ -44,9 +44,9 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
"kompose.service.expose.tls-secret": "test-secret",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -66,37 +66,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -105,49 +112,57 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com",
"kompose.service.expose.tls-secret": "test-secret",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com",
"kompose.service.expose.tls-secret": "test-secret",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000
@@ -156,10 +171,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json
Vendored
+48 -32
View File
@@ -44,8 +44,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
"kompose.service.expose": "batman.example.com",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -65,37 +65,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -104,47 +111,55 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000
@@ -153,10 +168,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json
Vendored
+50 -34
View File
@@ -44,9 +44,9 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com,batwoman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
"kompose.service.expose.tls-secret": "test-secret",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -66,37 +66,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -105,49 +112,57 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com,batwoman.example.com",
"kompose.service.expose.tls-secret": "test-secret",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com,batwoman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "batman.example.com,batwoman.example.com",
"kompose.service.expose.tls-secret": "test-secret",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com,batwoman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000
@@ -156,10 +171,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json
Vendored
+48 -32
View File
@@ -44,8 +44,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": " batman.example.com ,, batwoman.example.com "
"kompose.service.expose": " batman.example.com ,, batwoman.example.com ",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -65,37 +65,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -104,47 +111,55 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": " batman.example.com ,, batwoman.example.com ",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": " batman.example.com ,, batwoman.example.com "
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": " batman.example.com ,, batwoman.example.com ",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": " batman.example.com ,, batwoman.example.com "
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000
@@ -153,10 +168,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json
Vendored
+48 -32
View File
@@ -44,8 +44,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "True"
"kompose.service.expose": "True",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -70,37 +70,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -109,47 +116,55 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "True",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True",
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "True",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True",
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000
@@ -161,10 +176,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json
Vendored
+48 -32
View File
@@ -44,8 +44,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "True"
"kompose.service.expose": "True",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -65,37 +65,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -104,47 +111,55 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "True",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "True"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.expose": "True",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "True"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000
@@ -153,10 +168,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},