diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index e8015302..3fcc83cf 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -43,7 +43,6 @@ import ( appsv1 "k8s.io/api/apps/v1" api "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" - networkingv1beta1 "k8s.io/api/networking/v1beta1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -431,36 +430,43 @@ func (k *Kubernetes) InitDS(name string, service kobject.ServiceConfig) *appsv1. return ds } -func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, port int32) *networkingv1beta1.Ingress { +func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, port int32) *networkingv1.Ingress { hosts := regexp.MustCompile("[ ,]*,[ ,]*").Split(service.ExposeService, -1) - ingress := &networkingv1beta1.Ingress{ + ingress := &networkingv1.Ingress{ TypeMeta: metav1.TypeMeta{ Kind: "Ingress", - APIVersion: "extensions/v1beta1", + APIVersion: "networking.k8s.io/v1", }, ObjectMeta: metav1.ObjectMeta{ Name: name, Labels: transformer.ConfigLabels(name), Annotations: transformer.ConfigAnnotations(service), }, - Spec: networkingv1beta1.IngressSpec{ - Rules: make([]networkingv1beta1.IngressRule, len(hosts)), + Spec: networkingv1.IngressSpec{ + Rules: make([]networkingv1.IngressRule, len(hosts)), }, } tlsHosts := make([]string, len(hosts)) + pathType := networkingv1.PathTypePrefix for i, host := range hosts { host, p := transformer.ParseIngressPath(host) - ingress.Spec.Rules[i] = networkingv1beta1.IngressRule{ - IngressRuleValue: networkingv1beta1.IngressRuleValue{ - HTTP: &networkingv1beta1.HTTPIngressRuleValue{ - Paths: []networkingv1beta1.HTTPIngressPath{ + if p == "" { + p = "/" + } + ingress.Spec.Rules[i] = networkingv1.IngressRule{ + IngressRuleValue: networkingv1.IngressRuleValue{ + HTTP: &networkingv1.HTTPIngressRuleValue{ + Paths: []networkingv1.HTTPIngressPath{ { - Path: p, - Backend: networkingv1beta1.IngressBackend{ - ServiceName: name, - ServicePort: intstr.IntOrString{ - IntVal: port, + Path: p, + PathType: &pathType, + Backend: networkingv1.IngressBackend{ + Service: &networkingv1.IngressServiceBackend{ + Name: name, + Port: networkingv1.ServiceBackendPort{ + Number: port, + }, }, }, }, @@ -475,14 +481,14 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por } if service.ExposeServiceTLS != "" { if service.ExposeServiceTLS != "true" { - ingress.Spec.TLS = []networkingv1beta1.IngressTLS{ + ingress.Spec.TLS = []networkingv1.IngressTLS{ { Hosts: tlsHosts, SecretName: service.ExposeServiceTLS, }, } } else { - ingress.Spec.TLS = []networkingv1beta1.IngressTLS{ + ingress.Spec.TLS = []networkingv1.IngressTLS{ { Hosts: tlsHosts, }, diff --git a/script/test/cmd/tests_new.sh b/script/test/cmd/tests_new.sh index 676b4cc0..39f6bbb2 100755 --- a/script/test/cmd/tests_new.sh +++ b/script/test/cmd/tests_new.sh @@ -133,3 +133,11 @@ k8s_output="$KOMPOSE_ROOT/script/test/fixtures/configmap-volume/output-k8s.json" os_output="$KOMPOSE_ROOT/script/test/fixtures/configmap-volume/output-os.json" convert::expect_success_and_warning "$k8s_cmd" "$k8s_output" convert::expect_success "$os_cmd" "$os_output" + +# test service expose +k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/expose/compose.yaml convert --stdout -j --with-kompose-annotation=false" +ocp_cmd="kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/expose/compose.yaml convert --stdout -j --with-kompose-annotation=false" +k8s_output="$KOMPOSE_ROOT/script/test/fixtures/expose/output-k8s.json" +ocp_output="$KOMPOSE_ROOT/script/test/fixtures/expose/output-ocp.json" +convert::expect_success "$k8s_cmd" "$k8s_output" +convert::expect_success "$ocp_cmd" "$ocp_output" \ No newline at end of file diff --git a/script/test/fixtures/expose/compose.yaml b/script/test/fixtures/expose/compose.yaml new file mode 100644 index 00000000..315a39f0 --- /dev/null +++ b/script/test/fixtures/expose/compose.yaml @@ -0,0 +1,13 @@ +web: + image: tuna/docker-counter23 + ports: + - "5000:5000" + links: + - redis + labels: + kompose.service.expose: "batman.example.com/dev,batwoman.example.com" + kompose.service.expose.tls-secret: "test-secret" +redis: + image: redis:3.0 + ports: + - "6379" diff --git a/script/test/fixtures/expose/output-k8s.json b/script/test/fixtures/expose/output-k8s.json new file mode 100644 index 00000000..81f19751 --- /dev/null +++ b/script/test/fixtures/expose/output-k8s.json @@ -0,0 +1,228 @@ +{ + "kind": "List", + "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", + "metadata": { + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + }, + "annotations": { + "kompose.service.expose": "batman.example.com/dev,batwoman.example.com", + "kompose.service.expose.tls-secret": "test-secret" + } + }, + "spec": { + "ports": [ + { + "name": "5000", + "port": 5000, + "targetPort": 5000 + } + ], + "selector": { + "io.kompose.service": "web" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "Deployment", + "apiVersion": "apps/v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "replicas": 1, + "selector": { + "matchLabels": { + "io.kompose.service": "redis" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "containers": [ + { + "name": "redis", + "image": "redis:3.0", + "ports": [ + { + "containerPort": 6379 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + }, + "strategy": {} + }, + "status": {} + }, + { + "kind": "Deployment", + "apiVersion": "apps/v1", + "metadata": { + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + }, + "annotations": { + "kompose.service.expose": "batman.example.com/dev,batwoman.example.com", + "kompose.service.expose.tls-secret": "test-secret" + } + }, + "spec": { + "replicas": 1, + "selector": { + "matchLabels": { + "io.kompose.service": "web" + } + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + }, + "annotations": { + "kompose.service.expose": "batman.example.com/dev,batwoman.example.com", + "kompose.service.expose.tls-secret": "test-secret" + } + }, + "spec": { + "containers": [ + { + "name": "web", + "image": "tuna/docker-counter23", + "ports": [ + { + "containerPort": 5000 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + }, + "strategy": {} + }, + "status": {} + }, + { + "kind": "Ingress", + "apiVersion": "networking.k8s.io/v1", + "metadata": { + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + }, + "annotations": { + "kompose.service.expose": "batman.example.com/dev,batwoman.example.com", + "kompose.service.expose.tls-secret": "test-secret" + } + }, + "spec": { + "tls": [ + { + "hosts": [ + "batman.example.com", + "batwoman.example.com" + ], + "secretName": "test-secret" + } + ], + "rules": [ + { + "host": "batman.example.com", + "http": { + "paths": [ + { + "path": "/dev", + "pathType": "Prefix", + "backend": { + "service": { + "name": "web", + "port": { + "number": 5000 + } + } + } + } + ] + } + }, + { + "host": "batwoman.example.com", + "http": { + "paths": [ + { + "path": "/", + "pathType": "Prefix", + "backend": { + "service": { + "name": "web", + "port": { + "number": 5000 + } + } + } + } + ] + } + } + ] + }, + "status": { + "loadBalancer": {} + } + } + ] +} diff --git a/script/test/fixtures/expose/output-ocp.json b/script/test/fixtures/expose/output-ocp.json new file mode 100644 index 00000000..b502b0bd --- /dev/null +++ b/script/test/fixtures/expose/output-ocp.json @@ -0,0 +1,298 @@ +{ + "kind": "List", + "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", + "metadata": { + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + }, + "annotations": { + "kompose.service.expose": "batman.example.com/dev,batwoman.example.com", + "kompose.service.expose.tls-secret": "test-secret" + } + }, + "spec": { + "ports": [ + { + "name": "5000", + "port": 5000, + "targetPort": 5000 + } + ], + "selector": { + "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": { + "latestVersion": 0, + "observedGeneration": 0, + "replicas": 0, + "updatedReplicas": 0, + "availableReplicas": 0, + "unavailableReplicas": 0 + } + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "redis" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "redis:3.0" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + }, + "annotations": { + "kompose.service.expose": "batman.example.com/dev,batwoman.example.com", + "kompose.service.expose.tls-secret": "test-secret" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "web" + ], + "from": { + "kind": "ImageStreamTag", + "name": "web:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "io.kompose.service": "web" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } + }, + "spec": { + "containers": [ + { + "name": "web", + "image": " ", + "ports": [ + { + "containerPort": 5000 + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": { + "latestVersion": 0, + "observedGeneration": 0, + "replicas": 0, + "updatedReplicas": 0, + "availableReplicas": 0, + "unavailableReplicas": 0 + } + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } + }, + "spec": { + "lookupPolicy": { + "local": false + }, + "tags": [ + { + "name": "", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "tuna/docker-counter23" + }, + "generation": null, + "importPolicy": {}, + "referencePolicy": { + "type": "" + } + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "Route", + "apiVersion": "v1", + "metadata": { + "name": "web", + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } + }, + "spec": { + "host": "batman.example.com/dev,batwoman.example.com", + "to": { + "kind": "Service", + "name": "web", + "weight": null + }, + "port": { + "targetPort": 5000 + } + }, + "status": {} + } + ] +} diff --git a/script/test/fixtures/expose-service/compose-files/docker-compose-expose-hostname-multiple-ports.yml b/script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-hostname-multiple-ports.yml similarity index 100% rename from script/test/fixtures/expose-service/compose-files/docker-compose-expose-hostname-multiple-ports.yml rename to script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-hostname-multiple-ports.yml diff --git a/script/test/fixtures/expose-service/compose-files/docker-compose-expose-hostname-tls.yml b/script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-hostname-tls.yml similarity index 100% rename from script/test/fixtures/expose-service/compose-files/docker-compose-expose-hostname-tls.yml rename to script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-hostname-tls.yml diff --git a/script/test/fixtures/expose-service/compose-files/docker-compose-expose-hostname.yml b/script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-hostname.yml similarity index 100% rename from script/test/fixtures/expose-service/compose-files/docker-compose-expose-hostname.yml rename to script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-hostname.yml diff --git a/script/test/fixtures/expose-service/compose-files/docker-compose-expose-multiple-hostname-tls.yml b/script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-multiple-hostname-tls.yml similarity index 100% rename from script/test/fixtures/expose-service/compose-files/docker-compose-expose-multiple-hostname-tls.yml rename to script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-multiple-hostname-tls.yml diff --git a/script/test/fixtures/expose-service/compose-files/docker-compose-expose-multiple-hostname.yml b/script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-multiple-hostname.yml similarity index 100% rename from script/test/fixtures/expose-service/compose-files/docker-compose-expose-multiple-hostname.yml rename to script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-multiple-hostname.yml diff --git a/script/test/fixtures/expose-service/compose-files/docker-compose-expose-true-multiple-ports.yml b/script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-true-multiple-ports.yml similarity index 100% rename from script/test/fixtures/expose-service/compose-files/docker-compose-expose-true-multiple-ports.yml rename to script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-true-multiple-ports.yml diff --git a/script/test/fixtures/expose-service/compose-files/docker-compose-expose-true.yml b/script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-true.yml similarity index 100% rename from script/test/fixtures/expose-service/compose-files/docker-compose-expose-true.yml rename to script/test/fixtures/unused/expose-service/compose-files/docker-compose-expose-true.yml diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json b/script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json rename to script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json b/script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-hostname-tls.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json rename to script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-hostname-tls.json diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json b/script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-hostname.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json rename to script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-hostname.json diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json b/script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json rename to script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json b/script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-multiple-hostname.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json rename to script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-multiple-hostname.json diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json b/script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json rename to script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json b/script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-true.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json rename to script/test/fixtures/unused/expose-service/provider-files/kubernetes-expose-true.json diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json b/script/test/fixtures/unused/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json rename to script/test/fixtures/unused/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json b/script/test/fixtures/unused/expose-service/provider-files/openshift-expose-hostname.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json rename to script/test/fixtures/unused/expose-service/provider-files/openshift-expose-hostname.json diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json b/script/test/fixtures/unused/expose-service/provider-files/openshift-expose-true-multiple-ports.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json rename to script/test/fixtures/unused/expose-service/provider-files/openshift-expose-true-multiple-ports.json diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json b/script/test/fixtures/unused/expose-service/provider-files/openshift-expose-true.json similarity index 100% rename from script/test/fixtures/expose-service/provider-files/openshift-expose-true.json rename to script/test/fixtures/unused/expose-service/provider-files/openshift-expose-true.json diff --git a/script/test/fixtures/v3/docker-compose-3.5.yaml b/script/test/fixtures/unused/v3/docker-compose-3.5.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-3.5.yaml rename to script/test/fixtures/unused/v3/docker-compose-3.5.yaml diff --git a/script/test/fixtures/v3/docker-compose-deploy.yaml b/script/test/fixtures/unused/v3/docker-compose-deploy.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-deploy.yaml rename to script/test/fixtures/unused/v3/docker-compose-deploy.yaml diff --git a/script/test/fixtures/v3/docker-compose-env-subs.yaml b/script/test/fixtures/unused/v3/docker-compose-env-subs.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-env-subs.yaml rename to script/test/fixtures/unused/v3/docker-compose-env-subs.yaml diff --git a/script/test/fixtures/v3/docker-compose-env.yaml b/script/test/fixtures/unused/v3/docker-compose-env.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-env.yaml rename to script/test/fixtures/unused/v3/docker-compose-env.yaml diff --git a/script/test/fixtures/v3/docker-compose-full-example.yaml b/script/test/fixtures/unused/v3/docker-compose-full-example.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-full-example.yaml rename to script/test/fixtures/unused/v3/docker-compose-full-example.yaml diff --git a/script/test/fixtures/v3/docker-compose-memcpu-partial.yaml b/script/test/fixtures/unused/v3/docker-compose-memcpu-partial.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-memcpu-partial.yaml rename to script/test/fixtures/unused/v3/docker-compose-memcpu-partial.yaml diff --git a/script/test/fixtures/v3/docker-compose-memcpu.yaml b/script/test/fixtures/unused/v3/docker-compose-memcpu.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-memcpu.yaml rename to script/test/fixtures/unused/v3/docker-compose-memcpu.yaml diff --git a/script/test/fixtures/v3/docker-compose-unset-env.yaml b/script/test/fixtures/unused/v3/docker-compose-unset-env.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-unset-env.yaml rename to script/test/fixtures/unused/v3/docker-compose-unset-env.yaml diff --git a/script/test/fixtures/v3/docker-compose-volumes.yaml b/script/test/fixtures/unused/v3/docker-compose-volumes.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose-volumes.yaml rename to script/test/fixtures/unused/v3/docker-compose-volumes.yaml diff --git a/script/test/fixtures/v3/docker-compose.yaml b/script/test/fixtures/unused/v3/docker-compose.yaml similarity index 100% rename from script/test/fixtures/v3/docker-compose.yaml rename to script/test/fixtures/unused/v3/docker-compose.yaml diff --git a/script/test/fixtures/v3/example1.env b/script/test/fixtures/unused/v3/example1.env similarity index 100% rename from script/test/fixtures/v3/example1.env rename to script/test/fixtures/unused/v3/example1.env diff --git a/script/test/fixtures/v3/example2.env b/script/test/fixtures/unused/v3/example2.env similarity index 100% rename from script/test/fixtures/v3/example2.env rename to script/test/fixtures/unused/v3/example2.env diff --git a/script/test/fixtures/v3/output-deploy-k8s.json b/script/test/fixtures/unused/v3/output-deploy-k8s.json similarity index 100% rename from script/test/fixtures/v3/output-deploy-k8s.json rename to script/test/fixtures/unused/v3/output-deploy-k8s.json diff --git a/script/test/fixtures/v3/output-deploy-os.json b/script/test/fixtures/unused/v3/output-deploy-os.json similarity index 100% rename from script/test/fixtures/v3/output-deploy-os.json rename to script/test/fixtures/unused/v3/output-deploy-os.json diff --git a/script/test/fixtures/v3/output-env-k8s.json b/script/test/fixtures/unused/v3/output-env-k8s.json similarity index 100% rename from script/test/fixtures/v3/output-env-k8s.json rename to script/test/fixtures/unused/v3/output-env-k8s.json diff --git a/script/test/fixtures/v3/output-env-subs.json b/script/test/fixtures/unused/v3/output-env-subs.json similarity index 100% rename from script/test/fixtures/v3/output-env-subs.json rename to script/test/fixtures/unused/v3/output-env-subs.json diff --git a/script/test/fixtures/v3/output-k8s-3.5.json b/script/test/fixtures/unused/v3/output-k8s-3.5.json similarity index 100% rename from script/test/fixtures/v3/output-k8s-3.5.json rename to script/test/fixtures/unused/v3/output-k8s-3.5.json diff --git a/script/test/fixtures/v3/output-k8s-full-example-template.json b/script/test/fixtures/unused/v3/output-k8s-full-example-template.json similarity index 100% rename from script/test/fixtures/v3/output-k8s-full-example-template.json rename to script/test/fixtures/unused/v3/output-k8s-full-example-template.json diff --git a/script/test/fixtures/v3/output-k8s-full-example.json b/script/test/fixtures/unused/v3/output-k8s-full-example.json similarity index 100% rename from script/test/fixtures/v3/output-k8s-full-example.json rename to script/test/fixtures/unused/v3/output-k8s-full-example.json diff --git a/script/test/fixtures/v3/output-k8s-template.json b/script/test/fixtures/unused/v3/output-k8s-template.json similarity index 100% rename from script/test/fixtures/v3/output-k8s-template.json rename to script/test/fixtures/unused/v3/output-k8s-template.json diff --git a/script/test/fixtures/v3/output-memcpu-k8s.json b/script/test/fixtures/unused/v3/output-memcpu-k8s.json similarity index 100% rename from script/test/fixtures/v3/output-memcpu-k8s.json rename to script/test/fixtures/unused/v3/output-memcpu-k8s.json diff --git a/script/test/fixtures/v3/output-memcpu-partial-k8s.json b/script/test/fixtures/unused/v3/output-memcpu-partial-k8s.json similarity index 100% rename from script/test/fixtures/v3/output-memcpu-partial-k8s.json rename to script/test/fixtures/unused/v3/output-memcpu-partial-k8s.json diff --git a/script/test/fixtures/v3/output-os-full-example.json b/script/test/fixtures/unused/v3/output-os-full-example.json similarity index 100% rename from script/test/fixtures/v3/output-os-full-example.json rename to script/test/fixtures/unused/v3/output-os-full-example.json diff --git a/script/test/fixtures/v3/output-os-template.json b/script/test/fixtures/unused/v3/output-os-template.json similarity index 100% rename from script/test/fixtures/v3/output-os-template.json rename to script/test/fixtures/unused/v3/output-os-template.json diff --git a/script/test/fixtures/v3/output-unset-env-k8s.json b/script/test/fixtures/unused/v3/output-unset-env-k8s.json similarity index 100% rename from script/test/fixtures/v3/output-unset-env-k8s.json rename to script/test/fixtures/unused/v3/output-unset-env-k8s.json diff --git a/script/test/fixtures/v3/output-volumes-k8s-template.json b/script/test/fixtures/unused/v3/output-volumes-k8s-template.json similarity index 100% rename from script/test/fixtures/v3/output-volumes-k8s-template.json rename to script/test/fixtures/unused/v3/output-volumes-k8s-template.json