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/volume-mounts/hostpath/output-k8s-template.json
Vendored
+32 -25
View File
@@ -34,45 +34,46 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "db",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "db"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "db"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"volumes": [
{
"name": "db-hostpath0",
"hostPath": {
"path": "%HOSTPATH%"
}
}
],
"containers": [
{
"name": "db",
"image": "postgres:10.1",
"imagePullPolicy": "",
"name": "db",
"ports": [
{
"containerPort": 5432
@@ -81,17 +82,23 @@
"resources": {},
"volumeMounts": [
{
"name": "db-hostpath0",
"mountPath": "/var/lib/postgresql/data"
"mountPath": "/var/lib/postgresql/data",
"name": "db-hostpath0"
}
]
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"hostPath": {
"path": "%HOSTPATH%"
},
"name": "db-hostpath0"
}
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}
script/test/fixtures/volume-mounts/named-volume/output-k8s-template.json
Vendored
+33 -26
View File
@@ -35,47 +35,48 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.volume.size": "1Gi"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"name": "db"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "db"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.volume.size": "1Gi"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"volumes": [
{
"name": "db-data",
"persistentVolumeClaim": {
"claimName": "db-data"
}
}
],
"containers": [
{
"name": "db",
"image": "postgres:10.1",
"imagePullPolicy": "",
"name": "db",
"ports": [
{
"containerPort": 5432
@@ -84,17 +85,23 @@
"resources": {},
"volumeMounts": [
{
"name": "db-data",
"mountPath": "/var/lib/postgresql/data"
"mountPath": "/var/lib/postgresql/data",
"name": "db-data"
}
]
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "db-data",
"persistentVolumeClaim": {
"claimName": "db-data"
}
}
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}
script/test/fixtures/volume-mounts/named-volume/output-k8s-v3.json
Vendored
+45 -38
View File
@@ -35,35 +35,68 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.volume.size": "200Mi"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"name": "db"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "db"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.volume.size": "200Mi"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
}
},
"spec": {
"containers": [
{
"image": "postgres:10.1",
"imagePullPolicy": "",
"name": "db",
"ports": [
{
"containerPort": 5432
}
],
"resources": {},
"volumeMounts": [
{
"mountPath": "/var/lib/postgresql/data",
"name": "db-data"
},
{
"mountPath": "/var/lib/postgresql/config",
"name": "db-config"
}
]
}
],
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "db-data",
@@ -77,34 +110,8 @@
"claimName": "db-config"
}
}
],
"containers": [
{
"name": "db",
"image": "postgres:10.1",
"ports": [
{
"containerPort": 5432
}
],
"resources": {},
"volumeMounts": [
{
"name": "db-data",
"mountPath": "/var/lib/postgresql/data"
},
{
"name": "db-config",
"mountPath": "/var/lib/postgresql/config"
}
]
}
],
"restartPolicy": "Always"
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}
script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s-template.json
Vendored
+32 -25
View File
@@ -34,45 +34,46 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "httpd",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "httpd"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "httpd"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "httpd"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "httpd"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "httpd"
}
},
"spec": {
"volumes": [
{
"name": "httpd-claim0",
"persistentVolumeClaim": {
"claimName": "httpd-claim0"
}
}
],
"containers": [
{
"name": "httpd",
"image": "docker.io/fedora/apache",
"imagePullPolicy": "",
"name": "httpd",
"ports": [
{
"containerPort": 80
@@ -81,17 +82,23 @@
"resources": {},
"volumeMounts": [
{
"name": "httpd-claim0",
"mountPath": "/var/www/html"
"mountPath": "/var/www/html",
"name": "httpd-claim0"
}
]
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "httpd-claim0",
"persistentVolumeClaim": {
"claimName": "httpd-claim0"
}
}
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}
script/test/fixtures/volume-mounts/tmpfs/output-k8s-template.json
Vendored
+31 -24
View File
@@ -34,45 +34,44 @@
}
},
{
"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": {
"volumes": [
{
"name": "redis-master-tmpfs0",
"emptyDir": {
"medium": "Memory"
}
}
],
"containers": [
{
"name": "redis-master",
"image": "k8s.gcr.io/redis:e2e",
"imagePullPolicy": "",
"name": "redis-master",
"ports": [
{
"containerPort": 6379
@@ -81,16 +80,24 @@
"resources": {},
"volumeMounts": [
{
"name": "redis-master-tmpfs0",
"mountPath": "/tmp"
"mountPath": "/tmp",
"name": "redis-master-tmpfs0"
}
]
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"emptyDir": {
"medium": "Memory"
},
"name": "redis-master-tmpfs0"
}
]
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/volume-mounts/volumes-from/output-k8s-case.json
Vendored
+3 -3
View File
@@ -86,7 +86,7 @@
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"apiVersion": "apps/v1",
"metadata": {
"name": "bar",
"creationTimestamp": null,
@@ -192,7 +192,7 @@
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"apiVersion": "apps/v1",
"metadata": {
"name": "cat",
"creationTimestamp": null,
@@ -268,7 +268,7 @@
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"apiVersion": "apps/v1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
script/test/fixtures/volume-mounts/volumes-from/output-k8s-template.json
Vendored
+77 -63
View File
@@ -64,33 +64,66 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "nginx"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "nginx"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "",
"name": "nginx",
"ports": [
{
"containerPort": 80
}
],
"resources": {},
"volumeMounts": [
{
"mountPath": "/www/public",
"name": "nginx-claim0"
},
{
"mountPath": "/src/app",
"name": "web-claim0"
}
]
}
],
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "nginx-claim0",
@@ -104,34 +137,8 @@
"claimName": "web-claim0"
}
}
],
"containers": [
{
"name": "nginx",
"image": "nginx",
"ports": [
{
"containerPort": 80
}
],
"resources": {},
"volumeMounts": [
{
"name": "nginx-claim0",
"mountPath": "/www/public"
},
{
"name": "web-claim0",
"mountPath": "/src/app"
}
]
}
],
"restartPolicy": "Always"
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}
@@ -159,50 +166,51 @@
"status": {}
},
{
"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": {
"type": "Recreate"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"volumes": [
{
"name": "web-claim0",
"persistentVolumeClaim": {
"claimName": "web-claim0"
}
}
],
"containers": [
{
"name": "web",
"image": "centos/httpd",
"args": [
"nodemon",
"-L",
"app/bin/www"
],
"image": "centos/httpd",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 3000
@@ -211,17 +219,23 @@
"resources": {},
"volumeMounts": [
{
"name": "web-claim0",
"mountPath": "/src/app"
"mountPath": "/src/app",
"name": "web-claim0"
}
]
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "web-claim0",
"persistentVolumeClaim": {
"claimName": "web-claim0"
}
}
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}