diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 5d988e14..ed12322b 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -47,6 +47,8 @@ import ( "k8s.io/kubernetes/pkg/util/intstr" //"k8s.io/kubernetes/pkg/controller/daemon" "github.com/pkg/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/labels" ) // Kubernetes implements Transformer interface and represents Kubernetes transformer @@ -250,7 +252,8 @@ func (k *Kubernetes) CreatePVC(name string, mode string) (*api.PersistentVolumeC APIVersion: "v1", }, ObjectMeta: api.ObjectMeta{ - Name: name, + Name: name, + Labels: transformer.ConfigLabels(name), }, Spec: api.PersistentVolumeClaimSpec{ Resources: api.ResourceRequirements{ @@ -702,40 +705,67 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C } for _, v := range objects { + label := labels.SelectorFromSet(labels.Set(map[string]string{transformer.Selector: v.(meta.Object).GetName()})) + options := api.ListOptions{LabelSelector: label} + komposeLabel := map[string]string{transformer.Selector: v.(meta.Object).GetName()} switch t := v.(type) { case *extensions.Deployment: //delete deployment - rpDeployment, err := kubectl.ReaperFor(extensions.Kind("Deployment"), client) + deployment, err := client.Deployments(namespace).List(options) if err != nil { return err } - //FIXME: gracePeriod is nil - err = rpDeployment.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) - if err != nil { - return err + for _, l := range deployment.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + rpDeployment, err := kubectl.ReaperFor(extensions.Kind("Deployment"), client) + if err != nil { + return err + } + //FIXME: gracePeriod is nil + err = rpDeployment.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) + if err != nil { + return err + } + log.Infof("Successfully deleted Deployment: %s", t.Name) + } } - log.Infof("Successfully deleted Deployment: %s", t.Name) case *api.Service: //delete svc - rpService, err := kubectl.ReaperFor(api.Kind("Service"), client) + svc, err := client.Services(namespace).List(options) if err != nil { return err } - //FIXME: gracePeriod is nil - err = rpService.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) - if err != nil { - return err + for _, l := range svc.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + rpService, err := kubectl.ReaperFor(api.Kind("Service"), client) + if err != nil { + return err + } + //FIXME: gracePeriod is nil + err = rpService.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) + if err != nil { + return err + } + log.Infof("Successfully deleted Service: %s", t.Name) + } } - log.Infof("Successfully deleted Service: %s", t.Name) case *api.PersistentVolumeClaim: // delete pvc - err = client.PersistentVolumeClaims(namespace).Delete(t.Name) + pvc, err := client.PersistentVolumeClaims(namespace).List(options) if err != nil { return err } - log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name) + for _, l := range pvc.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + err = client.PersistentVolumeClaims(namespace).Delete(t.Name) + if err != nil { + return err + } + log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name) + } + } case *extensions.Ingress: // delete ingress @@ -745,23 +775,41 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C APIVersion: "extensions/v1beta1", }, } - err = client.Ingress(namespace).Delete(t.Name, ingDeleteOptions) + ingress, err := client.Ingress(namespace).List(options) if err != nil { return err } - log.Infof("Successfully deleted Ingress: %s", t.Name) + for _, l := range ingress.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + + err = client.Ingress(namespace).Delete(t.Name, ingDeleteOptions) + if err != nil { + return err + } + log.Infof("Successfully deleted Ingress: %s", t.Name) + } + } case *api.Pod: - rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), client) + //delete pod + pod, err := client.Pods(namespace).List(options) if err != nil { return err } - //FIXME: gracePeriod is nil - err = rpPod.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) - if err != nil { - return err + for _, l := range pod.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), client) + if err != nil { + return err + } + //FIXME: gracePeriod is nil + err = rpPod.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) + if err != nil { + return err + } + log.Infof("Successfully deleted Pod: %s", t.Name) + } } - log.Infof("Successfully deleted Pod: %s", t.Name) } } return nil diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 293d25d0..682ba7ad 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -39,14 +39,18 @@ import ( "time" + "github.com/kubernetes-incubator/kompose/pkg/transformer" buildapi "github.com/openshift/origin/pkg/build/api" deployapi "github.com/openshift/origin/pkg/deploy/api" deploymentconfigreaper "github.com/openshift/origin/pkg/deploy/cmd" imageapi "github.com/openshift/origin/pkg/image/api" routeapi "github.com/openshift/origin/pkg/route/api" "github.com/pkg/errors" + "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/kubectl" + "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" + "reflect" ) // OpenShift implements Transformer interface and represents OpenShift transformer @@ -161,7 +165,8 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig) APIVersion: "v1", }, ObjectMeta: api.ObjectMeta{ - Name: name, + Name: name, + Labels: transformer.ConfigLabels(name), }, Spec: imageapi.ImageStreamSpec{ Tags: tags, @@ -231,15 +236,15 @@ func (o *OpenShift) initDeploymentConfig(name string, service kobject.ServiceCon }, ObjectMeta: api.ObjectMeta{ Name: name, - Labels: map[string]string{"service": name}, + Labels: transformer.ConfigLabels(name), }, Spec: deployapi.DeploymentConfigSpec{ Replicas: int32(replicas), - Selector: map[string]string{"service": name}, + Selector: transformer.ConfigLabels(name), //UniqueLabelKey: p.Name, Template: &api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ - Labels: map[string]string{"service": name}, + Labels: transformer.ConfigLabels(name), }, Spec: o.InitPodSpec(name, " "), }, @@ -495,7 +500,6 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co if err != nil { return errors.Wrap(err, "o.Transform failed") } - oclient, err := o.getOpenShiftClient() if err != nil { return err @@ -506,71 +510,132 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co } for _, v := range objects { + label := labels.SelectorFromSet(labels.Set(map[string]string{transformer.Selector: v.(meta.Object).GetName()})) + options := api.ListOptions{LabelSelector: label} + komposeLabel := map[string]string{transformer.Selector: v.(meta.Object).GetName()} switch t := v.(type) { case *imageapi.ImageStream: //delete imageStream - err = oclient.ImageStreams(namespace).Delete(t.Name) + imageStream, err := oclient.ImageStreams(namespace).List(options) if err != nil { return err } - log.Infof("Successfully deleted ImageStream: %s", t.Name) + for _, l := range imageStream.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + err = oclient.ImageStreams(namespace).Delete(t.Name) + if err != nil { + return err + } + log.Infof("Successfully deleted ImageStream: %s", t.Name) + } + } case *buildapi.BuildConfig: - err := oclient.BuildConfigs(namespace).Delete(t.Name) + //options := api.ListOptions{LabelSelector: label} + buildConfig, err := oclient.BuildConfigs(namespace).List(options) if err != nil { return err } - log.Infof("Successfully deleted BuildConfig: %s", t.Name) + for _, l := range buildConfig.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + err := oclient.BuildConfigs(namespace).Delete(t.Name) + if err != nil { + return err + } + log.Infof("Successfully deleted BuildConfig: %s", t.Name) + } + } case *deployapi.DeploymentConfig: // delete deploymentConfig - dcreaper := deploymentconfigreaper.NewDeploymentConfigReaper(oclient, kclient) - err := dcreaper.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) + deploymentConfig, err := oclient.DeploymentConfigs(namespace).List(options) if err != nil { return err } - log.Infof("Successfully deleted DeploymentConfig: %s", t.Name) + for _, l := range deploymentConfig.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + dcreaper := deploymentconfigreaper.NewDeploymentConfigReaper(oclient, kclient) + err := dcreaper.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) + if err != nil { + return err + } + log.Infof("Successfully deleted DeploymentConfig: %s", t.Name) + } + } case *api.Service: //delete svc - rpService, err := kubectl.ReaperFor(api.Kind("Service"), kclient) + svc, err := kclient.Services(namespace).List(options) if err != nil { return err } - //FIXME: gracePeriod is nil - err = rpService.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) - if err != nil { - return err + for _, l := range svc.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + rpService, err := kubectl.ReaperFor(api.Kind("Service"), kclient) + if err != nil { + return err + } + //FIXME: gracePeriod is nil + err = rpService.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) + if err != nil { + return err + } + log.Infof("Successfully deleted Service: %s", t.Name) + } } - log.Infof("Successfully deleted Service: %s", t.Name) case *api.PersistentVolumeClaim: // delete pvc - err = kclient.PersistentVolumeClaims(namespace).Delete(t.Name) + pvc, err := kclient.PersistentVolumeClaims(namespace).List(options) if err != nil { return err } - log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name) + for _, l := range pvc.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + err = kclient.PersistentVolumeClaims(namespace).Delete(t.Name) + if err != nil { + return err + } + log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name) + } + } case *routeapi.Route: // delete route - err = oclient.Routes(namespace).Delete(t.Name) + route, err := oclient.Routes(namespace).List(options) if err != nil { return err } - log.Infof("Successfully deleted Route: %s", t.Name) + for _, l := range route.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + err = oclient.Routes(namespace).Delete(t.Name) + if err != nil { + return err + } + log.Infof("Successfully deleted Route: %s", t.Name) + } + } case *api.Pod: - rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), kclient) + //delete pods + pod, err := kclient.Pods(namespace).List(options) if err != nil { return err } - //FIXME: gracePeriod is nil - err = rpPod.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) - if err != nil { - return err + for _, l := range pod.Items { + if reflect.DeepEqual(l.Labels, komposeLabel) { + rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), kclient) + if err != nil { + return err + } + //FIXME: gracePeriod is nil + err = rpPod.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) + if err != nil { + return err + } + log.Infof("Successfully deleted Pod: %s", t.Name) + } } - log.Infof("Successfully deleted Pod: %s", t.Name) } } return nil diff --git a/pkg/transformer/utils.go b/pkg/transformer/utils.go index c5ebfc18..2d577109 100644 --- a/pkg/transformer/utils.go +++ b/pkg/transformer/utils.go @@ -37,6 +37,7 @@ import ( ) const letterBytes = "abcdefghijklmnopqrstuvwxyz0123456789" +const Selector = "io.kompose.service" // RandStringBytes generates randomly n-character string func RandStringBytes(n int) string { @@ -116,7 +117,7 @@ func isPath(substring string) bool { // ConfigLabels configures label func ConfigLabels(name string) map[string]string { - return map[string]string{"service": name} + return map[string]string{Selector: name} } // ConfigAnnotations configures annotations diff --git a/script/test/fixtures/bundles/dab/output-k8s.json b/script/test/fixtures/bundles/dab/output-k8s.json index a9564ec5..bccaf809 100644 --- a/script/test/fixtures/bundles/dab/output-k8s.json +++ b/script/test/fixtures/bundles/dab/output-k8s.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -68,7 +68,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -104,7 +104,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { diff --git a/script/test/fixtures/bundles/dsb/output-k8s.json b/script/test/fixtures/bundles/dsb/output-k8s.json index 7cc2d4a9..32a20ce8 100644 --- a/script/test/fixtures/bundles/dsb/output-k8s.json +++ b/script/test/fixtures/bundles/dsb/output-k8s.json @@ -3,33 +3,6 @@ "apiVersion": "v1", "metadata": {}, "items": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "worker", - "creationTimestamp": null, - "labels": { - "service": "worker" - } - }, - "spec": { - "ports": [ - { - "name": "headless", - "port": 55555, - "targetPort": 0 - } - ], - "selector": { - "service": "worker" - }, - "clusterIP": "None" - }, - "status": { - "loadBalancer": {} - } - }, { "kind": "Service", "apiVersion": "v1", @@ -37,7 +10,7 @@ "name": "db", "creationTimestamp": null, "labels": { - "service": "db" + "io.kompose.service": "db" }, "annotations": { "com.example.description": "Postgres Database" @@ -52,7 +25,7 @@ } ], "selector": { - "service": "db" + "io.kompose.service": "db" } }, "status": { @@ -66,7 +39,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -78,7 +51,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -92,7 +65,7 @@ "name": "result", "creationTimestamp": null, "labels": { - "service": "result" + "io.kompose.service": "result" } }, "spec": { @@ -104,7 +77,7 @@ } ], "selector": { - "service": "result" + "io.kompose.service": "result" } }, "status": { @@ -118,7 +91,7 @@ "name": "vote", "creationTimestamp": null, "labels": { - "service": "vote" + "io.kompose.service": "vote" }, "annotations": { "com.example.description": "Vote" @@ -133,7 +106,7 @@ } ], "selector": { - "service": "vote" + "io.kompose.service": "vote" } }, "status": { @@ -141,35 +114,31 @@ } }, { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", + "kind": "Service", + "apiVersion": "v1", "metadata": { "name": "worker", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "worker" + } }, "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "worker" - } - }, - "spec": { - "containers": [ - { - "name": "worker", - "image": "docker/example-voting-app-worker", - "resources": {} - } - ], - "restartPolicy": "Always" + "ports": [ + { + "name": "headless", + "port": 55555, + "targetPort": 0 } + ], + "selector": { + "io.kompose.service": "worker" }, - "strategy": {} + "clusterIP": "None" }, - "status": {} + "status": { + "loadBalancer": {} + } }, { "kind": "Deployment", @@ -187,7 +156,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "db" + "io.kompose.service": "db" } }, "spec": { @@ -223,7 +192,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -259,7 +228,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "result" + "io.kompose.service": "result" } }, "spec": { @@ -298,7 +267,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "vote" + "io.kompose.service": "vote" } }, "spec": { @@ -320,6 +289,37 @@ "strategy": {} }, "status": {} + }, + { + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", + "metadata": { + "name": "worker", + "creationTimestamp": null + }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "worker" + } + }, + "spec": { + "containers": [ + { + "name": "worker", + "image": "docker/example-voting-app-worker", + "resources": {} + } + ], + "restartPolicy": "Always" + } + }, + "strategy": {} + }, + "status": {} } ] } diff --git a/script/test/fixtures/entrypoint-command/output-k8s.json b/script/test/fixtures/entrypoint-command/output-k8s.json index 3c402e50..0faa005d 100644 --- a/script/test/fixtures/entrypoint-command/output-k8s.json +++ b/script/test/fixtures/entrypoint-command/output-k8s.json @@ -3,6 +3,33 @@ "apiVersion": "v1", "metadata": {}, "items": [ + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "base", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "base" + } + }, + "spec": { + "ports": [ + { + "name": "headless", + "port": 55555, + "targetPort": 0 + } + ], + "selector": { + "io.kompose.service": "base" + }, + "clusterIP": "None" + }, + "status": { + "loadBalancer": {} + } + }, { "kind": "Deployment", "apiVersion": "extensions/v1beta1", @@ -16,7 +43,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "base" + "io.kompose.service": "base" } }, "spec": { @@ -39,33 +66,6 @@ "strategy": {} }, "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "base", - "creationTimestamp": null, - "labels": { - "service": "base" - } - }, - "spec": { - "ports": [ - { - "name": "headless", - "port": 55555, - "targetPort": 0 - } - ], - "selector": { - "service": "base" - }, - "clusterIP": "None" - }, - "status": { - "loadBalancer": {} - } } ] } diff --git a/script/test/fixtures/entrypoint-command/output-os.json b/script/test/fixtures/entrypoint-command/output-os.json index 9e8918ce..fdc03ad0 100644 --- a/script/test/fixtures/entrypoint-command/output-os.json +++ b/script/test/fixtures/entrypoint-command/output-os.json @@ -10,7 +10,7 @@ "name": "base", "creationTimestamp": null, "labels": { - "service": "base" + "io.kompose.service": "base" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "base" + "io.kompose.service": "base" }, "clusterIP": "None" }, @@ -37,7 +37,7 @@ "name": "base", "creationTimestamp": null, "labels": { - "service": "base" + "io.kompose.service": "base" } }, "spec": { @@ -65,13 +65,13 @@ "replicas": 1, "test": false, "selector": { - "service": "base" + "io.kompose.service": "base" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "base" + "io.kompose.service": "base" } }, "spec": { @@ -99,7 +99,10 @@ "apiVersion": "v1", "metadata": { "name": "base", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "base" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/envvars-separators/output-k8s.json b/script/test/fixtures/envvars-separators/output-k8s.json index 42d691a9..1b02cbaa 100644 --- a/script/test/fixtures/envvars-separators/output-k8s.json +++ b/script/test/fixtures/envvars-separators/output-k8s.json @@ -10,7 +10,7 @@ "name": "hygieia-api", "creationTimestamp": null, "labels": { - "service": "hygieia-api" + "io.kompose.service": "hygieia-api" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "hygieia-api" + "io.kompose.service": "hygieia-api" } }, "status": { @@ -36,7 +36,7 @@ "name": "hygieia-bitbucket-scm-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-bitbucket-scm-collector" + "io.kompose.service": "hygieia-bitbucket-scm-collector" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "hygieia-bitbucket-scm-collector" + "io.kompose.service": "hygieia-bitbucket-scm-collector" }, "clusterIP": "None" }, @@ -63,7 +63,7 @@ "name": "hygieia-chat-ops-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-chat-ops-collector" + "io.kompose.service": "hygieia-chat-ops-collector" } }, "spec": { @@ -75,7 +75,7 @@ } ], "selector": { - "service": "hygieia-chat-ops-collector" + "io.kompose.service": "hygieia-chat-ops-collector" }, "clusterIP": "None" }, @@ -90,7 +90,7 @@ "name": "hygieia-github-scm-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-github-scm-collector" + "io.kompose.service": "hygieia-github-scm-collector" } }, "spec": { @@ -102,7 +102,7 @@ } ], "selector": { - "service": "hygieia-github-scm-collector" + "io.kompose.service": "hygieia-github-scm-collector" }, "clusterIP": "None" }, @@ -117,7 +117,7 @@ "name": "hygieia-jenkins-build-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-jenkins-build-collector" + "io.kompose.service": "hygieia-jenkins-build-collector" } }, "spec": { @@ -129,7 +129,7 @@ } ], "selector": { - "service": "hygieia-jenkins-build-collector" + "io.kompose.service": "hygieia-jenkins-build-collector" }, "clusterIP": "None" }, @@ -144,7 +144,7 @@ "name": "hygieia-jenkins-cucumber-test-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-jenkins-cucumber-test-collector" + "io.kompose.service": "hygieia-jenkins-cucumber-test-collector" } }, "spec": { @@ -156,7 +156,7 @@ } ], "selector": { - "service": "hygieia-jenkins-cucumber-test-collector" + "io.kompose.service": "hygieia-jenkins-cucumber-test-collector" }, "clusterIP": "None" }, @@ -171,7 +171,7 @@ "name": "hygieia-jira-feature-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-jira-feature-collector" + "io.kompose.service": "hygieia-jira-feature-collector" } }, "spec": { @@ -183,7 +183,7 @@ } ], "selector": { - "service": "hygieia-jira-feature-collector" + "io.kompose.service": "hygieia-jira-feature-collector" }, "clusterIP": "None" }, @@ -198,7 +198,7 @@ "name": "hygieia-sonar-codequality-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-sonar-codequality-collector" + "io.kompose.service": "hygieia-sonar-codequality-collector" } }, "spec": { @@ -210,7 +210,7 @@ } ], "selector": { - "service": "hygieia-sonar-codequality-collector" + "io.kompose.service": "hygieia-sonar-codequality-collector" }, "clusterIP": "None" }, @@ -225,7 +225,7 @@ "name": "hygieia-subversion-scm-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-subversion-scm-collector" + "io.kompose.service": "hygieia-subversion-scm-collector" } }, "spec": { @@ -237,7 +237,7 @@ } ], "selector": { - "service": "hygieia-subversion-scm-collector" + "io.kompose.service": "hygieia-subversion-scm-collector" }, "clusterIP": "None" }, @@ -252,7 +252,7 @@ "name": "hygieia-udeploy-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-udeploy-collector" + "io.kompose.service": "hygieia-udeploy-collector" } }, "spec": { @@ -264,7 +264,7 @@ } ], "selector": { - "service": "hygieia-udeploy-collector" + "io.kompose.service": "hygieia-udeploy-collector" }, "clusterIP": "None" }, @@ -279,7 +279,7 @@ "name": "hygieia-ui", "creationTimestamp": null, "labels": { - "service": "hygieia-ui" + "io.kompose.service": "hygieia-ui" } }, "spec": { @@ -291,7 +291,7 @@ } ], "selector": { - "service": "hygieia-ui" + "io.kompose.service": "hygieia-ui" } }, "status": { @@ -305,7 +305,7 @@ "name": "hygieia-versionone-collector", "creationTimestamp": null, "labels": { - "service": "hygieia-versionone-collector" + "io.kompose.service": "hygieia-versionone-collector" } }, "spec": { @@ -317,7 +317,7 @@ } ], "selector": { - "service": "hygieia-versionone-collector" + "io.kompose.service": "hygieia-versionone-collector" }, "clusterIP": "None" }, @@ -332,7 +332,7 @@ "name": "mongodb", "creationTimestamp": null, "labels": { - "service": "mongodb" + "io.kompose.service": "mongodb" } }, "spec": { @@ -344,7 +344,7 @@ } ], "selector": { - "service": "mongodb" + "io.kompose.service": "mongodb" } }, "status": { @@ -364,7 +364,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-api" + "io.kompose.service": "hygieia-api" } }, "spec": { @@ -408,7 +408,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-api-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-api-claim0" + } }, "spec": { "accessModes": [ @@ -435,7 +438,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-bitbucket-scm-collector" + "io.kompose.service": "hygieia-bitbucket-scm-collector" } }, "spec": { @@ -474,7 +477,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-bitbucket-scm-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-bitbucket-scm-collector-claim0" + } }, "spec": { "accessModes": [ @@ -501,7 +507,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-chat-ops-collector" + "io.kompose.service": "hygieia-chat-ops-collector" } }, "spec": { @@ -540,7 +546,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-chat-ops-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-chat-ops-collector-claim0" + } }, "spec": { "accessModes": [ @@ -567,7 +576,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-github-scm-collector" + "io.kompose.service": "hygieia-github-scm-collector" } }, "spec": { @@ -606,7 +615,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-github-scm-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-github-scm-collector-claim0" + } }, "spec": { "accessModes": [ @@ -633,7 +645,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-jenkins-build-collector" + "io.kompose.service": "hygieia-jenkins-build-collector" } }, "spec": { @@ -672,7 +684,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-jenkins-build-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-jenkins-build-collector-claim0" + } }, "spec": { "accessModes": [ @@ -699,7 +714,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-jenkins-cucumber-test-collector" + "io.kompose.service": "hygieia-jenkins-cucumber-test-collector" } }, "spec": { @@ -738,7 +753,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-jenkins-cucumber-test-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-jenkins-cucumber-test-collector-claim0" + } }, "spec": { "accessModes": [ @@ -765,7 +783,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-jira-feature-collector" + "io.kompose.service": "hygieia-jira-feature-collector" } }, "spec": { @@ -814,7 +832,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-jira-feature-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-jira-feature-collector-claim0" + } }, "spec": { "accessModes": [ @@ -841,7 +862,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-sonar-codequality-collector" + "io.kompose.service": "hygieia-sonar-codequality-collector" } }, "spec": { @@ -880,7 +901,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-sonar-codequality-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-sonar-codequality-collector-claim0" + } }, "spec": { "accessModes": [ @@ -907,7 +931,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-subversion-scm-collector" + "io.kompose.service": "hygieia-subversion-scm-collector" } }, "spec": { @@ -946,7 +970,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-subversion-scm-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-subversion-scm-collector-claim0" + } }, "spec": { "accessModes": [ @@ -973,7 +1000,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-udeploy-collector" + "io.kompose.service": "hygieia-udeploy-collector" } }, "spec": { @@ -1026,7 +1053,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-udeploy-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-udeploy-collector-claim0" + } }, "spec": { "accessModes": [ @@ -1053,7 +1083,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-ui" + "io.kompose.service": "hygieia-ui" } }, "spec": { @@ -1089,7 +1119,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "hygieia-versionone-collector" + "io.kompose.service": "hygieia-versionone-collector" } }, "spec": { @@ -1128,7 +1158,10 @@ "apiVersion": "v1", "metadata": { "name": "hygieia-versionone-collector-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "hygieia-versionone-collector-claim0" + } }, "spec": { "accessModes": [ @@ -1155,7 +1188,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "mongodb" + "io.kompose.service": "mongodb" } }, "spec": { @@ -1203,7 +1236,10 @@ "apiVersion": "v1", "metadata": { "name": "mongodb-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mongodb-claim0" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/etherpad/output-k8s.json b/script/test/fixtures/etherpad/output-k8s.json index df482315..20fdd6e7 100644 --- a/script/test/fixtures/etherpad/output-k8s.json +++ b/script/test/fixtures/etherpad/output-k8s.json @@ -10,7 +10,7 @@ "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "status": { @@ -36,7 +36,7 @@ "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "status": { @@ -68,7 +68,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -82,6 +82,10 @@ } ], "env": [ + { + "name": "DB_USER", + "value": "etherpad" + }, { "name": "DB_DBID", "value": "etherpad" @@ -97,10 +101,6 @@ { "name": "DB_PORT", "value": "3306" - }, - { - "name": "DB_USER", - "value": "etherpad" } ], "resources": {} @@ -126,7 +126,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -178,8 +178,8 @@ } }, "strategy": { - "type": "Recreate" - } + "type": "Recreate" + } }, "status": {} }, @@ -188,7 +188,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb-claim0" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/etherpad/output-os.json b/script/test/fixtures/etherpad/output-os.json index 10c28be7..b41d0a46 100644 --- a/script/test/fixtures/etherpad/output-os.json +++ b/script/test/fixtures/etherpad/output-os.json @@ -10,7 +10,7 @@ "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "status": { @@ -36,7 +36,7 @@ "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "status": { @@ -62,7 +62,7 @@ "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -90,13 +90,13 @@ "replicas": 1, "test": false, "selector": { - "service": "etherpad" + "io.kompose.service": "etherpad" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -110,14 +110,6 @@ } ], "env": [ - { - "name": "DB_PORT", - "value": "3306" - }, - { - "name": "DB_USER", - "value": "etherpad" - }, { "name": "DB_DBID", "value": "etherpad" @@ -129,6 +121,14 @@ { "name": "DB_PASS", "value": "etherpad" + }, + { + "name": "DB_PORT", + "value": "3306" + }, + { + "name": "DB_USER", + "value": "etherpad" } ], "resources": {} @@ -145,7 +145,10 @@ "apiVersion": "v1", "metadata": { "name": "etherpad", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "etherpad" + } }, "spec": { "tags": [ @@ -172,13 +175,13 @@ "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { "strategy": { - "resources": {}, - "type": "Recreate" + "type": "Recreate", + "resources": {} }, "triggers": [ { @@ -201,13 +204,13 @@ "replicas": 1, "test": false, "selector": { - "service": "mariadb" + "io.kompose.service": "mariadb" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -229,14 +232,6 @@ } ], "env": [ - { - "name": "MYSQL_ROOT_PASSWORD", - "value": "etherpad" - }, - { - "name": "MYSQL_USER", - "value": "etherpad" - }, { "name": "MYSQL_DATABASE", "value": "etherpad" @@ -244,6 +239,14 @@ { "name": "MYSQL_PASSWORD", "value": "etherpad" + }, + { + "name": "MYSQL_ROOT_PASSWORD", + "value": "etherpad" + }, + { + "name": "MYSQL_USER", + "value": "etherpad" } ], "resources": {}, @@ -266,7 +269,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb" + } }, "spec": { "tags": [ @@ -291,7 +297,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb-claim0" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json index aca191d3..f72f2006 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "batman.example.com" @@ -56,7 +56,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -76,7 +76,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -115,7 +115,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json index 89ba43d3..6783c958 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json @@ -3,6 +3,32 @@ "apiVersion": "v1", "metadata": {}, "items": [ + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "ports": [ + { + "name": "6379", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "io.kompose.service": "redis" + } + }, + "status": { + "loadBalancer": {} + } + }, { "kind": "Service", "apiVersion": "v1", @@ -10,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "batman.example.com" @@ -25,7 +51,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -33,30 +59,40 @@ } }, { - "kind": "Service", - "apiVersion": "v1", + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", "metadata": { "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } + "creationTimestamp": null }, "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 + "replicas": 1, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "containers": [ + { + "name": "redis", + "image": "redis:3.0", + "ports": [ + { + "containerPort": 6379 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" } - ], - "selector": { - "service": "redis" - } + }, + "strategy": {} }, - "status": { - "loadBalancer": {} - } + "status": {} }, { "kind": "Deployment", @@ -74,7 +110,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -124,42 +160,6 @@ "status": { "loadBalancer": {} } - }, - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "redis", - "creationTimestamp": null - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": "redis:3.0", - "ports": [ - { - "containerPort": 6379 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} } ] } diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json index c91a3c57..cbfc73e0 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "True" @@ -56,7 +56,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -76,7 +76,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -115,7 +115,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json index e6fb0b09..4377e065 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "True" @@ -51,7 +51,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -71,7 +71,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -110,7 +110,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json index 3077c918..d69facd4 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json @@ -3,6 +3,32 @@ "apiVersion": "v1", "metadata": {}, "items": [ + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "ports": [ + { + "name": "6379", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "io.kompose.service": "redis" + } + }, + "status": { + "loadBalancer": {} + } + }, { "kind": "Service", "apiVersion": "v1", @@ -10,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "batman.example.com" @@ -30,39 +56,104 @@ } ], "selector": { - "service": "web" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "service": "redis" + "io.kompose.service": "web" } }, "status": { "loadBalancer": {} } }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "redis" + ], + "from": { + "kind": "ImageStreamTag", + "name": "redis:3.0" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "io.kompose.service": "redis" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "containers": [ + { + "name": "redis", + "image": " ", + "ports": [ + { + "containerPort": 6379 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "tags": [ + { + "name": "3.0", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "redis:3.0" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, { "kind": "DeploymentConfig", "apiVersion": "v1", @@ -70,7 +161,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "batman.example.com" @@ -101,13 +192,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -137,7 +228,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ @@ -178,94 +272,6 @@ "status": { "ingress": null } - }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": [ - { - "type": "ConfigChange" - }, - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:3.0" - } - } - } - ], - "replicas": 1, - "test": false, - "selector": { - "service": "redis" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": " ", - "ports": [ - { - "containerPort": 6379 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null - }, - "spec": { - "tags": [ - { - "name": "3.0", - "annotations": null, - "from": { - "kind": "DockerImage", - "name": "redis:3.0" - }, - "generation": null, - "importPolicy": {} - } - ] - }, - "status": { - "dockerImageRepository": "" - } } ] } diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json index 0ffcd738..4dfbae43 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "batman.example.com" @@ -51,7 +51,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -65,7 +65,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -93,13 +93,13 @@ "replicas": 1, "test": false, "selector": { - "service": "redis" + "io.kompose.service": "redis" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -126,7 +126,10 @@ "apiVersion": "v1", "metadata": { "name": "redis", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } }, "spec": { "tags": [ @@ -153,7 +156,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "batman.example.com" @@ -184,13 +187,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -217,7 +220,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json index 64daed48..989ef147 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "True" @@ -56,7 +56,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -70,7 +70,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -98,13 +98,13 @@ "replicas": 1, "test": false, "selector": { - "service": "redis" + "io.kompose.service": "redis" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -131,7 +131,10 @@ "apiVersion": "v1", "metadata": { "name": "redis", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } }, "spec": { "tags": [ @@ -158,7 +161,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "True" @@ -189,13 +192,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -225,7 +228,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json index e1f0d64b..2424ddfa 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "True" @@ -51,7 +51,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -65,7 +65,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -93,13 +93,13 @@ "replicas": 1, "test": false, "selector": { - "service": "redis" + "io.kompose.service": "redis" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -126,7 +126,10 @@ "apiVersion": "v1", "metadata": { "name": "redis", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } }, "spec": { "tags": [ @@ -153,7 +156,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" }, "annotations": { "kompose.service.expose": "True" @@ -184,13 +187,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -217,7 +220,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/gitlab/output-k8s.json b/script/test/fixtures/gitlab/output-k8s.json index 7ef42ef4..d09e8015 100644 --- a/script/test/fixtures/gitlab/output-k8s.json +++ b/script/test/fixtures/gitlab/output-k8s.json @@ -3,6 +3,170 @@ "apiVersion": "v1", "metadata": {}, "items": [ + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "gitlab", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "gitlab" + } + }, + "spec": { + "ports": [ + { + "name": "30000", + "port": 30000, + "targetPort": 80 + }, + { + "name": "30001", + "port": 30001, + "targetPort": 443 + }, + { + "name": "30002", + "port": 30002, + "targetPort": 22 + } + ], + "selector": { + "io.kompose.service": "gitlab" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "postgresql", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "postgresql" + } + }, + "spec": { + "ports": [ + { + "name": "5432", + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "io.kompose.service": "postgresql" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "ports": [ + { + "name": "6379", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "io.kompose.service": "redis" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", + "metadata": { + "name": "gitlab", + "creationTimestamp": null + }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "gitlab" + } + }, + "spec": { + "containers": [ + { + "name": "gitlab", + "image": "swordphilic/gitlab", + "ports": [ + { + "containerPort": 80 + }, + { + "containerPort": 443 + }, + { + "containerPort": 22 + } + ], + "env": [ + { + "name": "REDIS_PORT", + "value": "6379" + }, + { + "name": "DB_HOST", + "value": "postgresql" + }, + { + "name": "DB_NAME", + "value": "gitlab" + }, + { + "name": "DB_PASS", + "value": "gitlab" + }, + { + "name": "DB_PORT", + "value": "5432" + }, + { + "name": "DB_TYPE", + "value": "postgres" + }, + { + "name": "DB_USER", + "value": "gitlab" + }, + { + "name": "REDIS_HOST", + "value": "redis" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + }, + "strategy": {} + }, + "status": {} + }, { "kind": "Deployment", "apiVersion": "extensions/v1beta1", @@ -16,7 +180,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "postgresql" + "io.kompose.service": "postgresql" } }, "spec": { @@ -53,32 +217,6 @@ }, "status": {} }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "postgresql", - "creationTimestamp": null, - "labels": { - "service": "postgresql" - } - }, - "spec": { - "ports": [ - { - "name": "5432", - "port": 5432, - "targetPort": 5432 - } - ], - "selector": { - "service": "postgresql" - } - }, - "status": { - "loadBalancer": {} - } - }, { "kind": "Deployment", "apiVersion": "extensions/v1beta1", @@ -92,7 +230,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -114,144 +252,6 @@ "strategy": {} }, "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "service": "redis" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "gitlab", - "creationTimestamp": null - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "gitlab" - } - }, - "spec": { - "containers": [ - { - "name": "gitlab", - "image": "swordphilic/gitlab", - "ports": [ - { - "containerPort": 80 - }, - { - "containerPort": 443 - }, - { - "containerPort": 22 - } - ], - "env": [ - { - "name": "DB_TYPE", - "value": "postgres" - }, - { - "name": "DB_USER", - "value": "gitlab" - }, - { - "name": "REDIS_HOST", - "value": "redis" - }, - { - "name": "REDIS_PORT", - "value": "6379" - }, - { - "name": "DB_HOST", - "value": "postgresql" - }, - { - "name": "DB_NAME", - "value": "gitlab" - }, - { - "name": "DB_PASS", - "value": "gitlab" - }, - { - "name": "DB_PORT", - "value": "5432" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "gitlab", - "creationTimestamp": null, - "labels": { - "service": "gitlab" - } - }, - "spec": { - "ports": [ - { - "name": "30000", - "port": 30000, - "targetPort": 80 - }, - { - "name": "30001", - "port": 30001, - "targetPort": 443 - }, - { - "name": "30002", - "port": 30002, - "targetPort": 22 - } - ], - "selector": { - "service": "gitlab" - } - }, - "status": { - "loadBalancer": {} - } } ] } diff --git a/script/test/fixtures/gitlab/output-os.json b/script/test/fixtures/gitlab/output-os.json index 79f278f4..c1272125 100644 --- a/script/test/fixtures/gitlab/output-os.json +++ b/script/test/fixtures/gitlab/output-os.json @@ -3,6 +3,58 @@ "apiVersion": "v1", "metadata": {}, "items": [ + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "postgresql", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "postgresql" + } + }, + "spec": { + "ports": [ + { + "name": "5432", + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "io.kompose.service": "postgresql" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "ports": [ + { + "name": "6379", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "io.kompose.service": "redis" + } + }, + "status": { + "loadBalancer": {} + } + }, { "kind": "Service", "apiVersion": "v1", @@ -10,7 +62,7 @@ "name": "gitlab", "creationTimestamp": null, "labels": { - "service": "gitlab" + "io.kompose.service": "gitlab" } }, "spec": { @@ -32,193 +84,13 @@ } ], "selector": { - "service": "gitlab" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "postgresql", - "creationTimestamp": null, - "labels": { - "service": "postgresql" - } - }, - "spec": { - "ports": [ - { - "name": "5432", - "port": 5432, - "targetPort": 5432 - } - ], - "selector": { - "service": "postgresql" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "service": "redis" + "io.kompose.service": "gitlab" } }, "status": { "loadBalancer": {} } }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "gitlab", - "creationTimestamp": null, - "labels": { - "service": "gitlab" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": [ - { - "type": "ConfigChange" - }, - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "gitlab" - ], - "from": { - "kind": "ImageStreamTag", - "name": "gitlab:latest" - } - } - } - ], - "replicas": 1, - "test": false, - "selector": { - "service": "gitlab" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "gitlab" - } - }, - "spec": { - "containers": [ - { - "name": "gitlab", - "image": " ", - "ports": [ - { - "containerPort": 80 - }, - { - "containerPort": 443 - }, - { - "containerPort": 22 - } - ], - "env": [ - { - "name": "DB_NAME", - "value": "gitlab" - }, - { - "name": "DB_PASS", - "value": "gitlab" - }, - { - "name": "DB_PORT", - "value": "5432" - }, - { - "name": "DB_TYPE", - "value": "postgres" - }, - { - "name": "DB_USER", - "value": "gitlab" - }, - { - "name": "REDIS_HOST", - "value": "redis" - }, - { - "name": "REDIS_PORT", - "value": "6379" - }, - { - "name": "DB_HOST", - "value": "postgresql" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "gitlab", - "creationTimestamp": null - }, - "spec": { - "tags": [ - { - "name": "latest", - "annotations": null, - "from": { - "kind": "DockerImage", - "name": "swordphilic/gitlab" - }, - "generation": null, - "importPolicy": {} - } - ] - }, - "status": { - "dockerImageRepository": "" - } - }, { "kind": "DeploymentConfig", "apiVersion": "v1", @@ -226,7 +98,7 @@ "name": "postgresql", "creationTimestamp": null, "labels": { - "service": "postgresql" + "io.kompose.service": "postgresql" } }, "spec": { @@ -254,13 +126,13 @@ "replicas": 1, "test": false, "selector": { - "service": "postgresql" + "io.kompose.service": "postgresql" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "postgresql" + "io.kompose.service": "postgresql" } }, "spec": { @@ -301,7 +173,10 @@ "apiVersion": "v1", "metadata": { "name": "postgresql", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "postgresql" + } }, "spec": { "tags": [ @@ -328,7 +203,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -356,13 +231,13 @@ "replicas": 1, "test": false, "selector": { - "service": "redis" + "io.kompose.service": "redis" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -389,7 +264,10 @@ "apiVersion": "v1", "metadata": { "name": "redis", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } }, "spec": { "tags": [ @@ -408,6 +286,137 @@ "status": { "dockerImageRepository": "" } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "gitlab", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "gitlab" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "gitlab" + ], + "from": { + "kind": "ImageStreamTag", + "name": "gitlab:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "io.kompose.service": "gitlab" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "gitlab" + } + }, + "spec": { + "containers": [ + { + "name": "gitlab", + "image": " ", + "ports": [ + { + "containerPort": 80 + }, + { + "containerPort": 443 + }, + { + "containerPort": 22 + } + ], + "env": [ + { + "name": "DB_TYPE", + "value": "postgres" + }, + { + "name": "DB_USER", + "value": "gitlab" + }, + { + "name": "REDIS_HOST", + "value": "redis" + }, + { + "name": "REDIS_PORT", + "value": "6379" + }, + { + "name": "DB_HOST", + "value": "postgresql" + }, + { + "name": "DB_NAME", + "value": "gitlab" + }, + { + "name": "DB_PASS", + "value": "gitlab" + }, + { + "name": "DB_PORT", + "value": "5432" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "gitlab", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "gitlab" + } + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "swordphilic/gitlab" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } } ] } diff --git a/script/test/fixtures/keyonly-envs/output-k8s.json b/script/test/fixtures/keyonly-envs/output-k8s.json index fc822ddb..5605984a 100644 --- a/script/test/fixtures/keyonly-envs/output-k8s.json +++ b/script/test/fixtures/keyonly-envs/output-k8s.json @@ -10,7 +10,7 @@ "name": "frontend", "creationTimestamp": null, "labels": { - "service": "frontend" + "io.kompose.service": "frontend" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "frontend" + "io.kompose.service": "frontend" } }, "status": { @@ -36,7 +36,7 @@ "name": "redis-master", "creationTimestamp": null, "labels": { - "service": "redis-master" + "io.kompose.service": "redis-master" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "redis-master" + "io.kompose.service": "redis-master" } }, "status": { @@ -62,7 +62,7 @@ "name": "redis-slave", "creationTimestamp": null, "labels": { - "service": "redis-slave" + "io.kompose.service": "redis-slave" } }, "spec": { @@ -74,7 +74,7 @@ } ], "selector": { - "service": "redis-slave" + "io.kompose.service": "redis-slave" } }, "status": { @@ -94,7 +94,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "frontend" + "io.kompose.service": "frontend" } }, "spec": { @@ -108,14 +108,6 @@ } ], "env": [ - { - "name": "GET_HOSTS_FROM", - "value": "dns" - }, - { - "name": "RACK_ENV", - "value": "development" - }, { "name": "SESSION_SECRET", "value": "session" @@ -123,6 +115,14 @@ { "name": "SHOW", "value": "true" + }, + { + "name": "GET_HOSTS_FROM", + "value": "dns" + }, + { + "name": "RACK_ENV", + "value": "development" } ], "resources": {} @@ -148,7 +148,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis-master" + "io.kompose.service": "redis-master" } }, "spec": { @@ -184,7 +184,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis-slave" + "io.kompose.service": "redis-slave" } }, "spec": { diff --git a/script/test/fixtures/mem-limit/output-k8s.json b/script/test/fixtures/mem-limit/output-k8s.json index 7bac65ad..dd7828d3 100644 --- a/script/test/fixtures/mem-limit/output-k8s.json +++ b/script/test/fixtures/mem-limit/output-k8s.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -28,7 +28,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -48,7 +48,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { diff --git a/script/test/fixtures/mem-limit/output-mb-k8s.json b/script/test/fixtures/mem-limit/output-mb-k8s.json index 7796091c..868a3681 100644 --- a/script/test/fixtures/mem-limit/output-mb-k8s.json +++ b/script/test/fixtures/mem-limit/output-mb-k8s.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -28,7 +28,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -48,7 +48,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { diff --git a/script/test/fixtures/multiple-compose-files/output-k8s.json b/script/test/fixtures/multiple-compose-files/output-k8s.json index ca544dd7..18c834d3 100644 --- a/script/test/fixtures/multiple-compose-files/output-k8s.json +++ b/script/test/fixtures/multiple-compose-files/output-k8s.json @@ -10,7 +10,7 @@ "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -27,7 +27,7 @@ } ], "selector": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "status": { @@ -41,7 +41,7 @@ "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -58,7 +58,7 @@ } ], "selector": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "status": { @@ -78,7 +78,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -95,10 +95,6 @@ } ], "env": [ - { - "name": "DB_USER", - "value": "openshift" - }, { "name": "DB_DBID", "value": "openshift" @@ -114,6 +110,10 @@ { "name": "DB_PORT", "value": "openshift" + }, + { + "name": "DB_USER", + "value": "openshift" } ], "resources": {} @@ -139,7 +139,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -170,10 +170,6 @@ } ], "env": [ - { - "name": "MYSQL_PASSWORD", - "value": "openshift" - }, { "name": "MYSQL_ROOT_PASSWORD", "value": "openshift" @@ -185,6 +181,10 @@ { "name": "MYSQL_DATABASE", "value": "openshift" + }, + { + "name": "MYSQL_PASSWORD", + "value": "openshift" } ], "resources": {}, @@ -204,8 +204,8 @@ } }, "strategy": { - "type": "Recreate" - } + "type": "Recreate" + } }, "status": {} }, @@ -214,7 +214,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb-claim0" + } }, "spec": { "accessModes": [ @@ -233,7 +236,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb-claim1", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb-claim1" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/multiple-compose-files/output-openshift.json b/script/test/fixtures/multiple-compose-files/output-openshift.json index 4c10ee22..1d97edee 100644 --- a/script/test/fixtures/multiple-compose-files/output-openshift.json +++ b/script/test/fixtures/multiple-compose-files/output-openshift.json @@ -10,7 +10,7 @@ "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -27,7 +27,7 @@ } ], "selector": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "status": { @@ -41,7 +41,7 @@ "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -58,7 +58,7 @@ } ], "selector": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "status": { @@ -72,7 +72,7 @@ "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -100,13 +100,13 @@ "replicas": 1, "test": false, "selector": { - "service": "etherpad" + "io.kompose.service": "etherpad" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "etherpad" + "io.kompose.service": "etherpad" } }, "spec": { @@ -123,6 +123,14 @@ } ], "env": [ + { + "name": "DB_PORT", + "value": "openshift" + }, + { + "name": "DB_USER", + "value": "openshift" + }, { "name": "DB_DBID", "value": "openshift" @@ -134,14 +142,6 @@ { "name": "DB_PASS", "value": "openshift" - }, - { - "name": "DB_PORT", - "value": "openshift" - }, - { - "name": "DB_USER", - "value": "openshift" } ], "resources": {} @@ -158,7 +158,10 @@ "apiVersion": "v1", "metadata": { "name": "etherpad", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "etherpad" + } }, "spec": { "tags": [ @@ -185,12 +188,12 @@ "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { "strategy": { - "type": "Recreate", + "type": "Recreate", "resources": {} }, "triggers": [ @@ -214,13 +217,13 @@ "replicas": 1, "test": false, "selector": { - "service": "mariadb" + "io.kompose.service": "mariadb" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "mariadb" + "io.kompose.service": "mariadb" } }, "spec": { @@ -251,10 +254,6 @@ } ], "env": [ - { - "name": "MYSQL_DATABASE", - "value": "openshift" - }, { "name": "MYSQL_PASSWORD", "value": "openshift" @@ -266,6 +265,10 @@ { "name": "MYSQL_USER", "value": "openshift" + }, + { + "name": "MYSQL_DATABASE", + "value": "openshift" } ], "resources": {}, @@ -292,7 +295,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb" + } }, "spec": { "tags": [ @@ -317,7 +323,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb-claim0" + } }, "spec": { "accessModes": [ @@ -336,7 +345,10 @@ "apiVersion": "v1", "metadata": { "name": "mariadb-claim1", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "mariadb-claim1" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/ngnix-node-redis/output-k8s.json b/script/test/fixtures/ngnix-node-redis/output-k8s.json index 60492734..707ab180 100644 --- a/script/test/fixtures/ngnix-node-redis/output-k8s.json +++ b/script/test/fixtures/ngnix-node-redis/output-k8s.json @@ -4,48 +4,39 @@ "metadata": {}, "items": [ { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", + "kind": "Service", + "apiVersion": "v1", "metadata": { - "name": "node2", - "creationTimestamp": null + "name": "nginx", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "nginx" + } }, "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "node2" - } - }, - "spec": { - "containers": [ - { - "name": "node2", - "ports": [ - { - "containerPort": 8080 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" + "ports": [ + { + "name": "80", + "port": 80, + "targetPort": 80 } - }, - "strategy": {} + ], + "selector": { + "io.kompose.service": "nginx" + } }, - "status": {} + "status": { + "loadBalancer": {} + } }, { "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "node2", + "name": "node1", "creationTimestamp": null, "labels": { - "service": "node2" + "io.kompose.service": "node1" } }, "spec": { @@ -57,56 +48,21 @@ } ], "selector": { - "service": "node2" + "io.kompose.service": "node1" } }, "status": { "loadBalancer": {} } }, - { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "node3", - "creationTimestamp": null - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "node3" - } - }, - "spec": { - "containers": [ - { - "name": "node3", - "ports": [ - { - "containerPort": 8080 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - }, - "strategy": {} - }, - "status": {} - }, { "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "node3", + "name": "node2", "creationTimestamp": null, "labels": { - "service": "node3" + "io.kompose.service": "node2" } }, "spec": { @@ -118,7 +74,7 @@ } ], "selector": { - "service": "node3" + "io.kompose.service": "node2" } }, "status": { @@ -126,40 +82,30 @@ } }, { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", + "kind": "Service", + "apiVersion": "v1", "metadata": { - "name": "redis", - "creationTimestamp": null + "name": "node3", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "node3" + } }, "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": "redis", - "ports": [ - { - "containerPort": 6379 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" + "ports": [ + { + "name": "8080", + "port": 8080, + "targetPort": 8080 } - }, - "strategy": {} + ], + "selector": { + "io.kompose.service": "node3" + } }, - "status": {} + "status": { + "loadBalancer": {} + } }, { "kind": "Service", @@ -168,7 +114,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -180,7 +126,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -200,7 +146,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { @@ -222,32 +168,6 @@ }, "status": {} }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "nginx", - "creationTimestamp": null, - "labels": { - "service": "nginx" - } - }, - "spec": { - "ports": [ - { - "name": "80", - "port": 80, - "targetPort": 80 - } - ], - "selector": { - "service": "nginx" - } - }, - "status": { - "loadBalancer": {} - } - }, { "kind": "Deployment", "apiVersion": "extensions/v1beta1", @@ -261,7 +181,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "node1" + "io.kompose.service": "node1" } }, "spec": { @@ -284,30 +204,110 @@ "status": {} }, { - "kind": "Service", - "apiVersion": "v1", + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", "metadata": { - "name": "node1", - "creationTimestamp": null, - "labels": { - "service": "node1" - } + "name": "node2", + "creationTimestamp": null }, "spec": { - "ports": [ - { - "name": "8080", - "port": 8080, - "targetPort": 8080 + "replicas": 1, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "node2" + } + }, + "spec": { + "containers": [ + { + "name": "node2", + "ports": [ + { + "containerPort": 8080 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" } - ], - "selector": { - "service": "node1" - } + }, + "strategy": {} }, - "status": { - "loadBalancer": {} - } + "status": {} + }, + { + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", + "metadata": { + "name": "node3", + "creationTimestamp": null + }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "node3" + } + }, + "spec": { + "containers": [ + { + "name": "node3", + "ports": [ + { + "containerPort": 8080 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + }, + "strategy": {} + }, + "status": {} + }, + { + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", + "metadata": { + "name": "redis", + "creationTimestamp": null + }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "containers": [ + { + "name": "redis", + "image": "redis", + "ports": [ + { + "containerPort": 6379 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + }, + "strategy": {} + }, + "status": {} } ] } diff --git a/script/test/fixtures/ngnix-node-redis/output-os.json b/script/test/fixtures/ngnix-node-redis/output-os.json index 77a03048..ab278cbc 100644 --- a/script/test/fixtures/ngnix-node-redis/output-os.json +++ b/script/test/fixtures/ngnix-node-redis/output-os.json @@ -3,58 +3,6 @@ "apiVersion": "v1", "metadata": {}, "items": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "node3", - "creationTimestamp": null, - "labels": { - "service": "node3" - } - }, - "spec": { - "ports": [ - { - "name": "8080", - "port": 8080, - "targetPort": 8080 - } - ], - "selector": { - "service": "node3" - } - }, - "status": { - "loadBalancer": {} - } - }, - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "service": "redis" - } - }, - "status": { - "loadBalancer": {} - } - }, { "kind": "Service", "apiVersion": "v1", @@ -62,7 +10,7 @@ "name": "nginx", "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { @@ -74,7 +22,7 @@ } ], "selector": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "status": { @@ -88,7 +36,7 @@ "name": "node1", "creationTimestamp": null, "labels": { - "service": "node1" + "io.kompose.service": "node1" } }, "spec": { @@ -100,7 +48,7 @@ } ], "selector": { - "service": "node1" + "io.kompose.service": "node1" } }, "status": { @@ -114,7 +62,7 @@ "name": "node2", "creationTimestamp": null, "labels": { - "service": "node2" + "io.kompose.service": "node2" } }, "spec": { @@ -126,7 +74,7 @@ } ], "selector": { - "service": "node2" + "io.kompose.service": "node2" } }, "status": { @@ -134,208 +82,55 @@ } }, { - "kind": "DeploymentConfig", + "kind": "Service", "apiVersion": "v1", "metadata": { "name": "node3", "creationTimestamp": null, "labels": { - "service": "node3" + "io.kompose.service": "node3" } }, "spec": { - "strategy": { - "resources": {} - }, - "triggers": [ + "ports": [ { - "type": "ConfigChange" - }, - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "node3" - ], - "from": { - "kind": "ImageStreamTag", - "name": "node3:latest" - } - } + "name": "8080", + "port": 8080, + "targetPort": 8080 } ], - "replicas": 1, - "test": false, "selector": { - "service": "node3" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "node3" - } - }, - "spec": { - "containers": [ - { - "name": "node3", - "image": " ", - "ports": [ - { - "containerPort": 8080 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } + "io.kompose.service": "node3" } }, - "status": {} - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "node3", - "creationTimestamp": null - }, - "spec": {}, "status": { - "dockerImageRepository": "" + "loadBalancer": {} } }, { - "kind": "BuildConfig", - "apiVersion": "v1", - "metadata": { - "name": "node3", - "creationTimestamp": null - }, - "spec": { - "triggers": [ - { - "type": "ConfigChange" - }, - { - "type": "ImageChange" - } - ], - "runPolicy": "Serial", - "source": { - "type": "Git", - "git": { - "uri": "https://github.com/kubernetes-incubator/kompose.git", - "ref": "master" - }, - "contextDir": "script/test/fixtures/ngnix-node-redis/node" - }, - "strategy": { - "type": "Docker", - "dockerStrategy": {} - }, - "output": { - "to": { - "kind": "ImageStreamTag", - "name": "node3:latest" - } - }, - "resources": {}, - "postCommit": {} - }, - "status": { - "lastVersion": 0 - } - }, - { - "kind": "DeploymentConfig", + "kind": "Service", "apiVersion": "v1", "metadata": { "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { - "strategy": { - "resources": {} - }, - "triggers": [ + "ports": [ { - "type": "ConfigChange" - }, - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:latest" - } - } + "name": "6379", + "port": 6379, + "targetPort": 6379 } ], - "replicas": 1, - "test": false, "selector": { - "service": "redis" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": " ", - "ports": [ - { - "containerPort": 6379 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } + "io.kompose.service": "redis" } }, - "status": {} - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null - }, - "spec": { - "tags": [ - { - "name": "latest", - "annotations": null, - "from": { - "kind": "DockerImage", - "name": "redis" - }, - "generation": null, - "importPolicy": {} - } - ] - }, "status": { - "dockerImageRepository": "" + "loadBalancer": {} } }, { @@ -379,7 +174,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { @@ -433,8 +228,8 @@ "source": { "type": "Git", "git": { - "uri": "https://github.com/kubernetes-incubator/kompose.git", - "ref": "master" + "uri": "git@github.com:procrypt/kompose.git", + "ref": "empty_vols" }, "contextDir": "script/test/fixtures/ngnix-node-redis/nginx" }, @@ -449,7 +244,8 @@ } }, "resources": {}, - "postCommit": {} + "postCommit": {}, + "nodeSelector": null }, "status": { "lastVersion": 0 @@ -496,7 +292,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "node1" + "io.kompose.service": "node1" } }, "spec": { @@ -550,8 +346,8 @@ "source": { "type": "Git", "git": { - "uri": "https://github.com/kubernetes-incubator/kompose.git", - "ref": "master" + "uri": "git@github.com:procrypt/kompose.git", + "ref": "empty_vols" }, "contextDir": "script/test/fixtures/ngnix-node-redis/node" }, @@ -566,7 +362,8 @@ } }, "resources": {}, - "postCommit": {} + "postCommit": {}, + "nodeSelector": null }, "status": { "lastVersion": 0 @@ -613,7 +410,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "node2" + "io.kompose.service": "node2" } }, "spec": { @@ -667,8 +464,8 @@ "source": { "type": "Git", "git": { - "uri": "https://github.com/kubernetes-incubator/kompose.git", - "ref": "master" + "uri": "git@github.com:procrypt/kompose.git", + "ref": "empty_vols" }, "contextDir": "script/test/fixtures/ngnix-node-redis/node" }, @@ -683,11 +480,218 @@ } }, "resources": {}, - "postCommit": {} + "postCommit": {}, + "nodeSelector": null }, "status": { "lastVersion": 0 } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "node3", + "creationTimestamp": null, + "labels": { + "service": "node3" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "node3" + ], + "from": { + "kind": "ImageStreamTag", + "name": "node3:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "service": "node3" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "node3" + } + }, + "spec": { + "containers": [ + { + "name": "node3", + "image": " ", + "ports": [ + { + "containerPort": 8080 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "node3", + "creationTimestamp": null + }, + "spec": {}, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "BuildConfig", + "apiVersion": "v1", + "metadata": { + "name": "node3", + "creationTimestamp": null + }, + "spec": { + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange" + } + ], + "runPolicy": "Serial", + "source": { + "type": "Git", + "git": { + "uri": "git@github.com:procrypt/kompose.git", + "ref": "empty_vols" + }, + "contextDir": "script/test/fixtures/ngnix-node-redis/node" + }, + "strategy": { + "type": "Docker", + "dockerStrategy": {} + }, + "output": { + "to": { + "kind": "ImageStreamTag", + "name": "node3:latest" + } + }, + "resources": {}, + "postCommit": {}, + "nodeSelector": null + }, + "status": { + "lastVersion": 0 + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "service": "redis" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "redis" + ], + "from": { + "kind": "ImageStreamTag", + "name": "redis:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "service": "redis" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "containers": [ + { + "name": "redis", + "image": " ", + "ports": [ + { + "containerPort": 6379 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "redis" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } } ] } diff --git a/script/test/fixtures/ports-with-ip/output-k8s.json b/script/test/fixtures/ports-with-ip/output-k8s.json index 5fe006fb..07de3f8b 100644 --- a/script/test/fixtures/ports-with-ip/output-k8s.json +++ b/script/test/fixtures/ports-with-ip/output-k8s.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -28,7 +28,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -42,7 +42,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -54,7 +54,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -74,7 +74,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -114,7 +114,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { diff --git a/script/test/fixtures/ports-with-proto/output-k8s.json b/script/test/fixtures/ports-with-proto/output-k8s.json index b8ed1cf9..c62891b8 100644 --- a/script/test/fixtures/ports-with-proto/output-k8s.json +++ b/script/test/fixtures/ports-with-proto/output-k8s.json @@ -3,32 +3,6 @@ "apiVersion": "v1", "metadata": {}, "items": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "web", - "creationTimestamp": null, - "labels": { - "service": "web" - } - }, - "spec": { - "ports": [ - { - "name": "5000", - "port": 5000, - "targetPort": 5000 - } - ], - "selector": { - "service": "web" - } - }, - "status": { - "loadBalancer": {} - } - }, { "kind": "Service", "apiVersion": "v1", @@ -36,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -54,7 +28,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -62,40 +36,30 @@ } }, { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", + "kind": "Service", + "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "web" - } - }, - "spec": { - "containers": [ - { - "name": "web", - "image": "tuna/docker-counter23", - "ports": [ - { - "containerPort": 5000 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" + "ports": [ + { + "name": "5000", + "port": 5000, + "targetPort": 5000 } - }, - "strategy": {} + ], + "selector": { + "io.kompose.service": "web" + } }, - "status": {} + "status": { + "loadBalancer": {} + } }, { "kind": "Deployment", @@ -110,7 +74,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -136,6 +100,42 @@ "strategy": {} }, "status": {} + }, + { + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", + "metadata": { + "name": "web", + "creationTimestamp": null + }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } + }, + "spec": { + "containers": [ + { + "name": "web", + "image": "tuna/docker-counter23", + "ports": [ + { + "containerPort": 5000 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + }, + "strategy": {} + }, + "status": {} } ] } diff --git a/script/test/fixtures/ports-with-proto/output-os.json b/script/test/fixtures/ports-with-proto/output-os.json index f6648ccf..f931a537 100644 --- a/script/test/fixtures/ports-with-proto/output-os.json +++ b/script/test/fixtures/ports-with-proto/output-os.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -28,7 +28,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -42,7 +42,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -54,7 +54,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -68,7 +68,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -96,13 +96,13 @@ "replicas": 1, "test": false, "selector": { - "service": "redis" + "io.kompose.service": "redis" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -133,7 +133,10 @@ "apiVersion": "v1", "metadata": { "name": "redis", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } }, "spec": { "tags": [ @@ -160,7 +163,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -188,13 +191,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -221,7 +224,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/restart-options/output-k8s-restart-no.json b/script/test/fixtures/restart-options/output-k8s-restart-no.json index dc307318..2966425d 100644 --- a/script/test/fixtures/restart-options/output-k8s-restart-no.json +++ b/script/test/fixtures/restart-options/output-k8s-restart-no.json @@ -10,7 +10,7 @@ "name": "foo", "creationTimestamp": null, "labels": { - "service": "foo" + "io.kompose.service": "foo" } }, "spec": { diff --git a/script/test/fixtures/restart-options/output-os-restart-no.json b/script/test/fixtures/restart-options/output-os-restart-no.json index dc307318..2966425d 100644 --- a/script/test/fixtures/restart-options/output-os-restart-no.json +++ b/script/test/fixtures/restart-options/output-os-restart-no.json @@ -10,7 +10,7 @@ "name": "foo", "creationTimestamp": null, "labels": { - "service": "foo" + "io.kompose.service": "foo" } }, "spec": { diff --git a/script/test/fixtures/stdin-true/output-k8s.json b/script/test/fixtures/stdin-true/output-k8s.json index 63f76801..d200cdcf 100644 --- a/script/test/fixtures/stdin-true/output-k8s.json +++ b/script/test/fixtures/stdin-true/output-k8s.json @@ -10,7 +10,7 @@ "name": "client", "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "client" + "io.kompose.service": "client" } }, "status": { @@ -42,7 +42,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { diff --git a/script/test/fixtures/stdin-true/output-oc.json b/script/test/fixtures/stdin-true/output-oc.json index a07fdee7..85ce7380 100644 --- a/script/test/fixtures/stdin-true/output-oc.json +++ b/script/test/fixtures/stdin-true/output-oc.json @@ -10,7 +10,7 @@ "name": "client", "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "client" + "io.kompose.service": "client" } }, "status": { @@ -36,7 +36,7 @@ "name": "client", "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -64,13 +64,13 @@ "replicas": 1, "test": false, "selector": { - "service": "client" + "io.kompose.service": "client" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -98,7 +98,10 @@ "apiVersion": "v1", "metadata": { "name": "client", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "client" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/tty-true/output-k8s.json b/script/test/fixtures/tty-true/output-k8s.json index 46a582db..07bef7f2 100644 --- a/script/test/fixtures/tty-true/output-k8s.json +++ b/script/test/fixtures/tty-true/output-k8s.json @@ -10,7 +10,7 @@ "name": "client", "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "client" + "io.kompose.service": "client" } }, "status": { @@ -42,7 +42,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { diff --git a/script/test/fixtures/tty-true/output-oc.json b/script/test/fixtures/tty-true/output-oc.json index 0562d855..b54a219b 100644 --- a/script/test/fixtures/tty-true/output-oc.json +++ b/script/test/fixtures/tty-true/output-oc.json @@ -10,7 +10,7 @@ "name": "client", "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "client" + "io.kompose.service": "client" } }, "status": { @@ -36,7 +36,7 @@ "name": "client", "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -64,13 +64,13 @@ "replicas": 1, "test": false, "selector": { - "service": "client" + "io.kompose.service": "client" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "client" + "io.kompose.service": "client" } }, "spec": { @@ -98,7 +98,10 @@ "apiVersion": "v1", "metadata": { "name": "client", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "client" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json b/script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json index 75f8f641..9d4bd7cc 100644 --- a/script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json +++ b/script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json @@ -10,7 +10,7 @@ "name": "httpd", "creationTimestamp": null, "labels": { - "service": "httpd" + "io.kompose.service": "httpd" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "httpd" + "io.kompose.service": "httpd" } }, "status": { @@ -42,7 +42,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "httpd" + "io.kompose.service": "httpd" } }, "spec": { @@ -76,8 +76,8 @@ } }, "strategy": { - "type": "Recreate" - } + "type": "Recreate" + } }, "status": {} }, @@ -86,7 +86,10 @@ "apiVersion": "v1", "metadata": { "name": "httpd-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "httpd-claim0" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/volume-mounts/simple-vol-mounts/output-os.json b/script/test/fixtures/volume-mounts/simple-vol-mounts/output-os.json index 2d877ca9..a2842aae 100644 --- a/script/test/fixtures/volume-mounts/simple-vol-mounts/output-os.json +++ b/script/test/fixtures/volume-mounts/simple-vol-mounts/output-os.json @@ -10,7 +10,7 @@ "name": "httpd", "creationTimestamp": null, "labels": { - "service": "httpd" + "io.kompose.service": "httpd" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "httpd" + "io.kompose.service": "httpd" } }, "status": { @@ -36,13 +36,13 @@ "name": "httpd", "creationTimestamp": null, "labels": { - "service": "httpd" + "io.kompose.service": "httpd" } }, "spec": { "strategy": { - "resources": {}, - "type": "Recreate" + "type": "Recreate", + "resources": {} }, "triggers": [ { @@ -65,13 +65,13 @@ "replicas": 1, "test": false, "selector": { - "service": "httpd" + "io.kompose.service": "httpd" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "httpd" + "io.kompose.service": "httpd" } }, "spec": { @@ -112,7 +112,10 @@ "apiVersion": "v1", "metadata": { "name": "httpd", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "httpd" + } }, "spec": { "tags": [ @@ -137,7 +140,10 @@ "apiVersion": "v1", "metadata": { "name": "httpd-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "httpd-claim0" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/volume-mounts/volumes-from/output-k8s.json b/script/test/fixtures/volume-mounts/volumes-from/output-k8s.json index 58d7c84a..cd1fd90c 100644 --- a/script/test/fixtures/volume-mounts/volumes-from/output-k8s.json +++ b/script/test/fixtures/volume-mounts/volumes-from/output-k8s.json @@ -3,32 +3,6 @@ "apiVersion": "v1", "metadata": {}, "items": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "web", - "creationTimestamp": null, - "labels": { - "service": "web" - } - }, - "spec": { - "ports": [ - { - "name": "3030", - "port": 3030, - "targetPort": 3000 - } - ], - "selector": { - "service": "web" - } - }, - "status": { - "loadBalancer": {} - } - }, { "kind": "Service", "apiVersion": "v1", @@ -36,7 +10,7 @@ "name": "nginx", "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { @@ -48,7 +22,7 @@ } ], "selector": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "status": { @@ -56,80 +30,30 @@ } }, { - "kind": "Deployment", - "apiVersion": "extensions/v1beta1", - "metadata": { - "name": "web", - "creationTimestamp": null - }, - "spec": { - "replicas": 1, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "web" - } - }, - "spec": { - "volumes": [ - { - "name": "web-claim0", - "persistentVolumeClaim": { - "claimName": "web-claim0" - } - } - ], - "containers": [ - { - "name": "web", - "image": "centos/httpd", - "args": [ - "nodemon", - "-L", - "app/bin/www" - ], - "ports": [ - { - "containerPort": 3000 - } - ], - "resources": {}, - "volumeMounts": [ - { - "name": "web-claim0", - "mountPath": "/src/app" - } - ] - } - ], - "restartPolicy": "Always" - } - }, - "strategy": { - "type": "Recreate" - } - }, - "status": {} - }, - { - "kind": "PersistentVolumeClaim", + "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "web-claim0", - "creationTimestamp": null - }, - "spec": { - "accessModes": [ - "ReadWriteOnce" - ], - "resources": { - "requests": { - "storage": "100Mi" - } + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" } }, - "status": {} + "spec": { + "ports": [ + { + "name": "3030", + "port": 3030, + "targetPort": 3000 + } + ], + "selector": { + "io.kompose.service": "web" + } + }, + "status": { + "loadBalancer": {} + } }, { "kind": "Deployment", @@ -144,7 +68,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { @@ -188,8 +112,8 @@ } }, "strategy": { - "type": "Recreate" - } + "type": "Recreate" + } }, "status": {} }, @@ -198,8 +122,90 @@ "apiVersion": "v1", "metadata": { "name": "nginx-claim0", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "nginx-claim0" + } + }, + "spec": { + "accessModes": [ + "ReadWriteOnce" + ], + "resources": { + "requests": { + "storage": "100Mi" + } + } + }, + "status": {} + }, + { + "kind": "Deployment", + "apiVersion": "extensions/v1beta1", + "metadata": { + "name": "web", "creationTimestamp": null }, + "spec": { + "replicas": 1, + "template": { + "metadata": { + "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" + ], + "ports": [ + { + "containerPort": 3000 + } + ], + "resources": {}, + "volumeMounts": [ + { + "name": "web-claim0", + "mountPath": "/src/app" + } + ] + } + ], + "restartPolicy": "Always" + } + }, + "strategy": { + "type": "Recreate" + } + }, + "status": {} + }, + { + "kind": "PersistentVolumeClaim", + "apiVersion": "v1", + "metadata": { + "name": "web-claim0", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web-claim0" + } + }, "spec": { "accessModes": [ "ReadWriteOnce" diff --git a/script/test/fixtures/volume-mounts/volumes-from/output-os.json b/script/test/fixtures/volume-mounts/volumes-from/output-os.json index 49a4d489..20fe2894 100644 --- a/script/test/fixtures/volume-mounts/volumes-from/output-os.json +++ b/script/test/fixtures/volume-mounts/volumes-from/output-os.json @@ -10,7 +10,7 @@ "name": "nginx", "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -62,13 +62,13 @@ "name": "nginx", "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { "strategy": { - "resources": {}, - "type": "Recreate" + "type": "Recreate", + "resources": {} }, "triggers": [ { @@ -91,13 +91,13 @@ "replicas": 1, "test": false, "selector": { - "service": "nginx" + "io.kompose.service": "nginx" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "nginx" + "io.kompose.service": "nginx" } }, "spec": { @@ -148,7 +148,10 @@ "apiVersion": "v1", "metadata": { "name": "nginx", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "nginx" + } }, "spec": { "tags": [ @@ -173,7 +176,10 @@ "apiVersion": "v1", "metadata": { "name": "nginx-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "nginx-claim0" + } }, "spec": { "accessModes": [ @@ -194,13 +200,13 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { "strategy": { - "resources": {}, - "type": "Recreate" + "type": "Recreate", + "resources": {} }, "triggers": [ { @@ -223,13 +229,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -275,7 +281,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ @@ -300,7 +309,10 @@ "apiVersion": "v1", "metadata": { "name": "web-claim0", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web-claim0" + } }, "spec": { "accessModes": [ diff --git a/script/test/fixtures/yaml-and-yml/output-k8s.json b/script/test/fixtures/yaml-and-yml/output-k8s.json index 63be2124..167b0c19 100644 --- a/script/test/fixtures/yaml-and-yml/output-k8s.json +++ b/script/test/fixtures/yaml-and-yml/output-k8s.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -68,7 +68,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -104,7 +104,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { diff --git a/script/test/fixtures/yaml-and-yml/output-os.json b/script/test/fixtures/yaml-and-yml/output-os.json index 8bf974a7..75863268 100644 --- a/script/test/fixtures/yaml-and-yml/output-os.json +++ b/script/test/fixtures/yaml-and-yml/output-os.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -62,7 +62,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -90,13 +90,13 @@ "replicas": 1, "test": false, "selector": { - "service": "redis" + "io.kompose.service": "redis" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -123,7 +123,10 @@ "apiVersion": "v1", "metadata": { "name": "redis", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } }, "spec": { "tags": [ @@ -150,7 +153,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -178,13 +181,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -211,7 +214,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ diff --git a/script/test/fixtures/yaml-and-yml/yml/output-k8s.json b/script/test/fixtures/yaml-and-yml/yml/output-k8s.json index 63be2124..167b0c19 100644 --- a/script/test/fixtures/yaml-and-yml/yml/output-k8s.json +++ b/script/test/fixtures/yaml-and-yml/yml/output-k8s.json @@ -10,7 +10,7 @@ "name": "redis", "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -22,7 +22,7 @@ } ], "selector": { - "service": "redis" + "io.kompose.service": "redis" } }, "status": { @@ -36,7 +36,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -48,7 +48,7 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" } }, "status": { @@ -68,7 +68,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "redis" + "io.kompose.service": "redis" } }, "spec": { @@ -104,7 +104,7 @@ "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { diff --git a/script/test/fixtures/yaml-and-yml/yml/output-os.json b/script/test/fixtures/yaml-and-yml/yml/output-os.json index 8bf974a7..0c7de2ef 100644 --- a/script/test/fixtures/yaml-and-yml/yml/output-os.json +++ b/script/test/fixtures/yaml-and-yml/yml/output-os.json @@ -3,32 +3,6 @@ "apiVersion": "v1", "metadata": {}, "items": [ - { - "kind": "Service", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "ports": [ - { - "name": "6379", - "port": 6379, - "targetPort": 6379 - } - ], - "selector": { - "service": "redis" - } - }, - "status": { - "loadBalancer": {} - } - }, { "kind": "Service", "apiVersion": "v1", @@ -36,7 +10,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -48,101 +22,39 @@ } ], "selector": { - "service": "web" + "io.kompose.service": "web" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "ports": [ + { + "name": "6379", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "io.kompose.service": "redis" } }, "status": { "loadBalancer": {} } }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": [ - { - "type": "ConfigChange" - }, - { - "type": "ImageChange", - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "redis" - ], - "from": { - "kind": "ImageStreamTag", - "name": "redis:3.0" - } - } - } - ], - "replicas": 1, - "test": false, - "selector": { - "service": "redis" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": " ", - "ports": [ - { - "containerPort": 6379 - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, - { - "kind": "ImageStream", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null - }, - "spec": { - "tags": [ - { - "name": "3.0", - "annotations": null, - "from": { - "kind": "DockerImage", - "name": "redis:3.0" - }, - "generation": null, - "importPolicy": {} - } - ] - }, - "status": { - "dockerImageRepository": "" - } - }, { "kind": "DeploymentConfig", "apiVersion": "v1", @@ -150,7 +62,7 @@ "name": "web", "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -178,13 +90,13 @@ "replicas": 1, "test": false, "selector": { - "service": "web" + "io.kompose.service": "web" }, "template": { "metadata": { "creationTimestamp": null, "labels": { - "service": "web" + "io.kompose.service": "web" } }, "spec": { @@ -211,7 +123,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "tags": [ @@ -230,6 +145,97 @@ "status": { "dockerImageRepository": "" } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "redis" + ], + "from": { + "kind": "ImageStreamTag", + "name": "redis:3.0" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "io.kompose.service": "redis" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "containers": [ + { + "name": "redis", + "image": " ", + "ports": [ + { + "containerPort": 6379 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "tags": [ + { + "name": "3.0", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "redis:3.0" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } } ] }