LaconicNetwork/kompose
7
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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/controller/output-k8s-controller-template.json
Vendored
+44 -33
View File
@@ -34,20 +34,20 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "db",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.controller.type": "daemonset",
"kompose.version": "%VERSION%",
"project.logs": "/var/log/mysql"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.controller.type": "daemonset",
"project.logs": "/var/log/mysql"
}
"name": "db"
},
"spec": {
"template": {
@@ -60,64 +60,66 @@
"spec": {
"containers": [
{
"name": "db",
"image": "mysql:5.7",
"env": [
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "password"
}
],
"image": "mysql:5.7",
"imagePullPolicy": "",
"name": "db",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "wordpress:4.5",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "WORDPRESS_AUTH_KEY",
@@ -156,13 +158,22 @@
"value": "changeme"
}
],
"image": "wordpress:4.5",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 80
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/controller/output-k8s-controller-v3-template.json
Vendored
+44 -33
View File
@@ -35,19 +35,19 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mysql",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.controller.type": "daemonset",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mysql"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.controller.type": "daemonset"
}
"name": "mysql"
},
"spec": {
"template": {
@@ -60,66 +60,68 @@
"spec": {
"containers": [
{
"name": "mysql",
"image": "mysql:5.7",
"env": [
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "password"
}
],
"image": "mysql:5.7",
"imagePullPolicy": "",
"name": "mysql",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"port": "wordpress"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"name": "web"
},
"spec": {
"replicas": 3,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"port": "wordpress"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "wordpress:4",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "WORDPRESS_AUTH_KEY",
@@ -162,13 +164,22 @@
"value": "changeme"
}
],
"image": "wordpress:4",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 80
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/controller/output-k8s-daemonset-template.json
Vendored
+54 -46
View File
@@ -14,8 +14,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -96,20 +96,19 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "frontend",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
}
"name": "frontend"
},
"spec": {
"template": {
@@ -122,45 +121,48 @@
"spec": {
"containers": [
{
"name": "frontend",
"image": "gcr.io/google-samples/gb-frontend:v4",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"image": "gcr.io/google-samples/gb-frontend:v4",
"imagePullPolicy": "",
"name": "frontend",
"ports": [
{
"containerPort": 80
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-master",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis-master"
},
"spec": {
"template": {
@@ -173,8 +175,9 @@
"spec": {
"containers": [
{
"name": "redis-master",
"image": "k8s.gcr.io/redis:e2e",
"imagePullPolicy": "",
"name": "redis-master",
"ports": [
{
"containerPort": 6379
@@ -183,29 +186,31 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis-slave"
},
"spec": {
"template": {
@@ -218,30 +223,33 @@
"spec": {
"containers": [
{
"name": "redis-slave",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
"containerPort": 6379
}
],
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"image": "gcr.io/google_samples/gb-redisslave:v1",
"imagePullPolicy": "",
"name": "redis-slave",
"ports": [
{
"containerPort": 6379
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
}
]
script/test/fixtures/controller/output-k8s-deployment-template.json
Vendored
+82 -58
View File
@@ -14,8 +14,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -96,92 +96,107 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "frontend",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
}
"name": "frontend"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "frontend"
}
},
"strategy": {},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
}
},
"spec": {
"containers": [
{
"name": "frontend",
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"image": "gcr.io/google-samples/gb-frontend:v4",
"imagePullPolicy": "",
"name": "frontend",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-master",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis-master"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis-master"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
}
},
"spec": {
"containers": [
{
"name": "redis-master",
"image": "k8s.gcr.io/redis:e2e",
"imagePullPolicy": "",
"name": "redis-master",
"ports": [
{
"containerPort": 6379
@@ -190,63 +205,72 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis-slave"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis-slave"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
"containerPort": 6379
}
],
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"image": "gcr.io/google_samples/gb-redisslave:v1",
"imagePullPolicy": "",
"name": "redis-slave",
"ports": [
{
"containerPort": 6379
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/controller/output-k8s-global-deployment-template.json
Vendored
+22 -14
View File
@@ -4,44 +4,52 @@
"metadata": {},
"items": [
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "worker",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "worker"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "worker"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
}
},
"spec": {
"containers": [
{
"name": "worker",
"image": "dockersamples/examplevotingapp_worker",
"imagePullPolicy": "",
"name": "worker",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/controller/output-k8s-global-template.json
Vendored
+14 -11
View File
@@ -4,18 +4,18 @@
"metadata": {},
"items": [
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "worker",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "worker"
},
"spec": {
"template": {
@@ -28,20 +28,23 @@
"spec": {
"containers": [
{
"name": "worker",
"image": "dockersamples/examplevotingapp_worker",
"imagePullPolicy": "",
"name": "worker",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
}
]
}
}
script/test/fixtures/controller/output-k8s-rc-template.json
Vendored
+4 -4
View File
@@ -14,8 +14,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -106,8 +106,8 @@
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/controller/output-os-controller-v3-template.json
Vendored
+16 -13
View File
@@ -35,19 +35,19 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mysql",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mysql"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.controller.type": "daemonset",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mysql"
},
"name": "mysql"
},
"spec": {
"template": {
@@ -60,25 +60,28 @@
"spec": {
"containers": [
{
"name": "mysql",
"image": "mysql:5.7",
"env": [
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "password"
}
],
"image": "mysql:5.7",
"imagePullPolicy": "",
"name": "mysql",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
},
{
@@ -317,4 +320,4 @@
}
}
]
}
}