From 9d3dfeab419c4c54c85ac2d4ba6bbd4039e8a908 Mon Sep 17 00:00:00 2001 From: shubhindia Date: Sun, 29 Oct 2023 12:08:59 +0530 Subject: [PATCH] drop status field from test yamls Signed-off-by: shubhindia --- .../output-k8s-empty-vols-template.yaml | 10 ++++------ .../fixtures/change-in-volume/output-k8s.yaml | 10 ++++------ .../output-os-empty-vols-template.yaml | 6 ++---- .../fixtures/change-in-volume/output-os.yaml | 6 ++---- .../compose-env-interpolation/output-k8s.yaml | 5 ++--- .../compose-file-support/output-k8s.yaml | 5 ++--- .../output-k8s-withlabel.yaml | 4 ++-- .../fixtures/configmap-volume/output-k8s.yaml | 4 ++-- .../placement/output-placement-k8s.yaml | 5 ++--- .../deploy/placement/output-placement-os.yaml | 3 +-- .../fixtures/env-multiple/output-k8s.yaml | 10 ++++------ .../test/fixtures/env-multiple/output-os.yaml | 6 ++---- script/test/fixtures/env/output-k8s.yaml | 10 ++++------ script/test/fixtures/env/output-os.yaml | 6 ++---- .../envvars-interpolation/output-k8s.yaml | 2 +- script/test/fixtures/expose/output-k8s.yaml | 13 +++++------- script/test/fixtures/expose/output-os.yaml | 6 ++---- .../output-k8s-v1.yaml | 5 ++--- .../output-k8s-v2.yaml | 8 +++----- .../external-traffic-policy/output-os-v1.yaml | 3 +-- .../external-traffic-policy/output-os-v2.yaml | 3 +-- script/test/fixtures/fsgroup/output-k8s.yaml | 4 ++-- script/test/fixtures/fsgroup/output-os.yaml | 2 +- .../healthcheck/output-healthcheck-k8s.yaml | 20 ++++++++----------- .../healthcheck/output-healthcheck-os.yaml | 12 ++++------- .../host-port-protocol/output-k8s.yaml | 5 ++--- .../host-port-protocol/output-os.yaml | 3 +-- .../fixtures/multiple-files/output-k8s.yaml | 4 ++-- .../multiple-type-volumes/output-k8s.yaml | 6 +++--- .../multiple-type-volumes/output-os.yaml | 2 +- .../test/fixtures/namespace/output-k8s.yaml | 7 +++---- script/test/fixtures/namespace/output-os.yaml | 5 ++--- .../fixtures/network-policies/output-k8s.yaml | 5 ++--- .../test/fixtures/read-only/output-k8s.yaml | 5 ++--- script/test/fixtures/read-only/output-os.yaml | 3 +-- .../fixtures/service-group/output-k8s.yaml | 7 +++---- .../single-file-output/output-k8s.yaml | 8 +++----- .../test/fixtures/statefulset/output-k8s.yaml | 10 ++++------ .../test/fixtures/statefulset/output-os.yaml | 10 ++++------ script/test/fixtures/v2/output-k8s.yaml | 8 -------- script/test/fixtures/v2/output-os.yaml | 11 ++++------ script/test/fixtures/v3.0/output-k8s.yaml | 4 ---- script/test/fixtures/v3.0/output-os.yaml | 3 +-- .../fixtures/vols-subpath/output-k8s.yaml | 4 ++-- .../test/fixtures/vols-subpath/output-os.yaml | 2 +- .../volume-mounts/windows/output-k8s.yaml | 4 ---- .../volume-mounts/windows/output-os.yaml | 5 ++--- 47 files changed, 108 insertions(+), 181 deletions(-) diff --git a/script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml b/script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml index 673e998f..13cdc711 100644 --- a/script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml +++ b/script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml @@ -16,8 +16,7 @@ spec: targetPort: 0 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: v1 @@ -34,8 +33,7 @@ spec: targetPort: 5000 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -67,7 +65,7 @@ spec: name: redis resources: {} restartPolicy: Always -status: {} + --- apiVersion: apps/v1 @@ -109,5 +107,5 @@ spec: volumes: - emptyDir: {} name: code-volume -status: {} + diff --git a/script/test/fixtures/change-in-volume/output-k8s.yaml b/script/test/fixtures/change-in-volume/output-k8s.yaml index 673e998f..13cdc711 100644 --- a/script/test/fixtures/change-in-volume/output-k8s.yaml +++ b/script/test/fixtures/change-in-volume/output-k8s.yaml @@ -16,8 +16,7 @@ spec: targetPort: 0 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: v1 @@ -34,8 +33,7 @@ spec: targetPort: 5000 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -67,7 +65,7 @@ spec: name: redis resources: {} restartPolicy: Always -status: {} + --- apiVersion: apps/v1 @@ -109,5 +107,5 @@ spec: volumes: - emptyDir: {} name: code-volume -status: {} + diff --git a/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml b/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml index 40061b7a..0db502c9 100644 --- a/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml +++ b/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml @@ -16,8 +16,7 @@ spec: targetPort: 0 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: v1 @@ -34,8 +33,7 @@ spec: targetPort: 5000 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/change-in-volume/output-os.yaml b/script/test/fixtures/change-in-volume/output-os.yaml index 40061b7a..0db502c9 100644 --- a/script/test/fixtures/change-in-volume/output-os.yaml +++ b/script/test/fixtures/change-in-volume/output-os.yaml @@ -16,8 +16,7 @@ spec: targetPort: 0 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: v1 @@ -34,8 +33,7 @@ spec: targetPort: 5000 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/compose-env-interpolation/output-k8s.yaml b/script/test/fixtures/compose-env-interpolation/output-k8s.yaml index 4bdcc1c1..f1a33b5a 100644 --- a/script/test/fixtures/compose-env-interpolation/output-k8s.yaml +++ b/script/test/fixtures/compose-env-interpolation/output-k8s.yaml @@ -15,8 +15,7 @@ spec: targetPort: 80 selector: io.kompose.service: foo -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -53,5 +52,5 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/compose-file-support/output-k8s.yaml b/script/test/fixtures/compose-file-support/output-k8s.yaml index 1ca00e60..b0df54af 100644 --- a/script/test/fixtures/compose-file-support/output-k8s.yaml +++ b/script/test/fixtures/compose-file-support/output-k8s.yaml @@ -13,8 +13,7 @@ spec: targetPort: 80 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -46,5 +45,5 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml b/script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml index 5e3c9d33..cbc4f995 100644 --- a/script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml +++ b/script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml @@ -40,7 +40,7 @@ spec: path: configs.tar name: db-cm0 name: db-cm0 -status: {} + --- apiVersion: v1 @@ -102,7 +102,7 @@ spec: path: test-a-key.key name: web-cm1 name: web-cm1 -status: {} + --- apiVersion: v1 diff --git a/script/test/fixtures/configmap-volume/output-k8s.yaml b/script/test/fixtures/configmap-volume/output-k8s.yaml index 4baf157a..cb151b4a 100644 --- a/script/test/fixtures/configmap-volume/output-k8s.yaml +++ b/script/test/fixtures/configmap-volume/output-k8s.yaml @@ -36,7 +36,7 @@ spec: path: configs.tar name: db-cm0 name: db-cm0 -status: {} + --- apiVersion: v1 @@ -94,7 +94,7 @@ spec: path: test-a-key.key name: web-cm1 name: web-cm1 -status: {} + --- apiVersion: v1 diff --git a/script/test/fixtures/deploy/placement/output-placement-k8s.yaml b/script/test/fixtures/deploy/placement/output-placement-k8s.yaml index 8005d35e..023edb88 100644 --- a/script/test/fixtures/deploy/placement/output-placement-k8s.yaml +++ b/script/test/fixtures/deploy/placement/output-placement-k8s.yaml @@ -13,8 +13,7 @@ spec: targetPort: 6379 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -75,5 +74,5 @@ spec: maxSkew: 1 topologyKey: ssd whenUnsatisfiable: ScheduleAnyway -status: {} + diff --git a/script/test/fixtures/deploy/placement/output-placement-os.yaml b/script/test/fixtures/deploy/placement/output-placement-os.yaml index d59f6b4f..87293e70 100644 --- a/script/test/fixtures/deploy/placement/output-placement-os.yaml +++ b/script/test/fixtures/deploy/placement/output-placement-os.yaml @@ -13,8 +13,7 @@ spec: targetPort: 6379 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/env-multiple/output-k8s.yaml b/script/test/fixtures/env-multiple/output-k8s.yaml index d61ada19..ae3d7bb3 100644 --- a/script/test/fixtures/env-multiple/output-k8s.yaml +++ b/script/test/fixtures/env-multiple/output-k8s.yaml @@ -16,8 +16,7 @@ spec: targetPort: 8020 selector: io.kompose.service: another-namenode -status: - loadBalancer: {} + --- apiVersion: v1 @@ -37,8 +36,7 @@ spec: targetPort: 8020 selector: io.kompose.service: namenode -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -79,7 +77,7 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + --- apiVersion: v1 @@ -144,5 +142,5 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/env-multiple/output-os.yaml b/script/test/fixtures/env-multiple/output-os.yaml index 57c42676..93f6d07b 100644 --- a/script/test/fixtures/env-multiple/output-os.yaml +++ b/script/test/fixtures/env-multiple/output-os.yaml @@ -16,8 +16,7 @@ spec: targetPort: 8020 selector: io.kompose.service: another-namenode -status: - loadBalancer: {} + --- apiVersion: v1 @@ -37,8 +36,7 @@ spec: targetPort: 8020 selector: io.kompose.service: namenode -status: - loadBalancer: {} + --- apiVersion: v1 diff --git a/script/test/fixtures/env/output-k8s.yaml b/script/test/fixtures/env/output-k8s.yaml index f53119da..463d41da 100644 --- a/script/test/fixtures/env/output-k8s.yaml +++ b/script/test/fixtures/env/output-k8s.yaml @@ -16,8 +16,7 @@ spec: targetPort: 8020 selector: io.kompose.service: another-namenode -status: - loadBalancer: {} + --- apiVersion: v1 @@ -37,8 +36,7 @@ spec: targetPort: 8020 selector: io.kompose.service: namenode -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -84,7 +82,7 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + --- apiVersion: v1 @@ -144,5 +142,5 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/env/output-os.yaml b/script/test/fixtures/env/output-os.yaml index 487b5710..da1c8d17 100644 --- a/script/test/fixtures/env/output-os.yaml +++ b/script/test/fixtures/env/output-os.yaml @@ -16,8 +16,7 @@ spec: targetPort: 8020 selector: io.kompose.service: another-namenode -status: - loadBalancer: {} + --- apiVersion: v1 @@ -37,8 +36,7 @@ spec: targetPort: 8020 selector: io.kompose.service: namenode -status: - loadBalancer: {} + --- apiVersion: v1 diff --git a/script/test/fixtures/envvars-interpolation/output-k8s.yaml b/script/test/fixtures/envvars-interpolation/output-k8s.yaml index d9ccbd06..66e98312 100644 --- a/script/test/fixtures/envvars-interpolation/output-k8s.yaml +++ b/script/test/fixtures/envvars-interpolation/output-k8s.yaml @@ -32,5 +32,5 @@ spec: name: myservice resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/expose/output-k8s.yaml b/script/test/fixtures/expose/output-k8s.yaml index 52ad4c7d..4688b43b 100644 --- a/script/test/fixtures/expose/output-k8s.yaml +++ b/script/test/fixtures/expose/output-k8s.yaml @@ -13,8 +13,7 @@ spec: targetPort: 6379 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: v1 @@ -35,8 +34,7 @@ spec: targetPort: 5000 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -67,7 +65,7 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + --- apiVersion: apps/v1 @@ -107,7 +105,7 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + --- apiVersion: networking.k8s.io/v1 @@ -149,6 +147,5 @@ spec: - batman.example.com - batwoman.example.com secretName: test-secret -status: - loadBalancer: {} + diff --git a/script/test/fixtures/expose/output-os.yaml b/script/test/fixtures/expose/output-os.yaml index 149ceab4..cfc61180 100644 --- a/script/test/fixtures/expose/output-os.yaml +++ b/script/test/fixtures/expose/output-os.yaml @@ -13,8 +13,7 @@ spec: targetPort: 6379 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: v1 @@ -35,8 +34,7 @@ spec: targetPort: 5000 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/external-traffic-policy/output-k8s-v1.yaml b/script/test/fixtures/external-traffic-policy/output-k8s-v1.yaml index aabc5a9a..180fa533 100644 --- a/script/test/fixtures/external-traffic-policy/output-k8s-v1.yaml +++ b/script/test/fixtures/external-traffic-policy/output-k8s-v1.yaml @@ -20,8 +20,7 @@ spec: selector: io.kompose.service: front-end type: LoadBalancer -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -66,5 +65,5 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml b/script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml index 391e21bb..97a530b5 100644 --- a/script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml +++ b/script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml @@ -20,8 +20,7 @@ spec: selector: io.kompose.service: front-end type: ClusterIP -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -66,7 +65,7 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + --- apiVersion: networking.k8s.io/v1 @@ -94,6 +93,5 @@ spec: number: 80 path: / pathType: Prefix -status: - loadBalancer: {} + diff --git a/script/test/fixtures/external-traffic-policy/output-os-v1.yaml b/script/test/fixtures/external-traffic-policy/output-os-v1.yaml index 6ce6a5df..a7958ccd 100644 --- a/script/test/fixtures/external-traffic-policy/output-os-v1.yaml +++ b/script/test/fixtures/external-traffic-policy/output-os-v1.yaml @@ -20,8 +20,7 @@ spec: selector: io.kompose.service: front-end type: LoadBalancer -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/external-traffic-policy/output-os-v2.yaml b/script/test/fixtures/external-traffic-policy/output-os-v2.yaml index 49f64791..41b1fc9a 100644 --- a/script/test/fixtures/external-traffic-policy/output-os-v2.yaml +++ b/script/test/fixtures/external-traffic-policy/output-os-v2.yaml @@ -20,8 +20,7 @@ spec: selector: io.kompose.service: front-end type: ClusterIP -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/fsgroup/output-k8s.yaml b/script/test/fixtures/fsgroup/output-k8s.yaml index 51ad5d6d..b2781e96 100644 --- a/script/test/fixtures/fsgroup/output-k8s.yaml +++ b/script/test/fixtures/fsgroup/output-k8s.yaml @@ -43,7 +43,7 @@ spec: - name: pgadmin-data persistentVolumeClaim: claimName: pgadmin-data -status: {} + --- apiVersion: v1 @@ -59,4 +59,4 @@ spec: resources: requests: storage: 100Mi -status: {} + diff --git a/script/test/fixtures/fsgroup/output-os.yaml b/script/test/fixtures/fsgroup/output-os.yaml index acd7174c..2e5cb4dd 100644 --- a/script/test/fixtures/fsgroup/output-os.yaml +++ b/script/test/fixtures/fsgroup/output-os.yaml @@ -98,4 +98,4 @@ spec: resources: requests: storage: 100Mi -status: {} + diff --git a/script/test/fixtures/healthcheck/output-healthcheck-k8s.yaml b/script/test/fixtures/healthcheck/output-healthcheck-k8s.yaml index 9c8115a1..7b187311 100644 --- a/script/test/fixtures/healthcheck/output-healthcheck-k8s.yaml +++ b/script/test/fixtures/healthcheck/output-healthcheck-k8s.yaml @@ -20,8 +20,7 @@ spec: targetPort: 27017 selector: io.kompose.service: mongo -status: - loadBalancer: {} + --- apiVersion: v1 @@ -45,8 +44,7 @@ spec: targetPort: 3306 selector: io.kompose.service: mysql -status: - loadBalancer: {} + --- apiVersion: v1 @@ -71,8 +69,7 @@ spec: targetPort: 5432 selector: io.kompose.service: postgresql -status: - loadBalancer: {} + --- apiVersion: v1 @@ -94,8 +91,7 @@ spec: targetPort: 6379 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -152,7 +148,7 @@ spec: timeoutSeconds: 1 resources: {} restartPolicy: Always -status: {} + --- apiVersion: apps/v1 @@ -209,7 +205,7 @@ spec: timeoutSeconds: 2 resources: {} restartPolicy: Always -status: {} + --- apiVersion: apps/v1 @@ -270,7 +266,7 @@ spec: timeoutSeconds: 1 resources: {} restartPolicy: Always -status: {} + --- apiVersion: apps/v1 @@ -326,5 +322,5 @@ spec: timeoutSeconds: 1 resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/healthcheck/output-healthcheck-os.yaml b/script/test/fixtures/healthcheck/output-healthcheck-os.yaml index a4a29a6b..96b4d6fd 100644 --- a/script/test/fixtures/healthcheck/output-healthcheck-os.yaml +++ b/script/test/fixtures/healthcheck/output-healthcheck-os.yaml @@ -20,8 +20,7 @@ spec: targetPort: 27017 selector: io.kompose.service: mongo -status: - loadBalancer: {} + --- apiVersion: v1 @@ -45,8 +44,7 @@ spec: targetPort: 3306 selector: io.kompose.service: mysql -status: - loadBalancer: {} + --- apiVersion: v1 @@ -71,8 +69,7 @@ spec: targetPort: 5432 selector: io.kompose.service: postgresql -status: - loadBalancer: {} + --- apiVersion: v1 @@ -94,8 +91,7 @@ spec: targetPort: 6379 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/host-port-protocol/output-k8s.yaml b/script/test/fixtures/host-port-protocol/output-k8s.yaml index 8af386f1..fe317969 100644 --- a/script/test/fixtures/host-port-protocol/output-k8s.yaml +++ b/script/test/fixtures/host-port-protocol/output-k8s.yaml @@ -13,8 +13,7 @@ spec: targetPort: 80 selector: io.kompose.service: nginx -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -46,5 +45,5 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/host-port-protocol/output-os.yaml b/script/test/fixtures/host-port-protocol/output-os.yaml index e1659373..9dc2f2ba 100644 --- a/script/test/fixtures/host-port-protocol/output-os.yaml +++ b/script/test/fixtures/host-port-protocol/output-os.yaml @@ -13,8 +13,7 @@ spec: targetPort: 80 selector: io.kompose.service: nginx -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/multiple-files/output-k8s.yaml b/script/test/fixtures/multiple-files/output-k8s.yaml index 165a54c8..57ada9d4 100644 --- a/script/test/fixtures/multiple-files/output-k8s.yaml +++ b/script/test/fixtures/multiple-files/output-k8s.yaml @@ -24,7 +24,7 @@ spec: name: bar resources: {} restartPolicy: Always -status: {} + --- apiVersion: apps/v1 @@ -52,5 +52,5 @@ spec: name: foo resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/multiple-type-volumes/output-k8s.yaml b/script/test/fixtures/multiple-type-volumes/output-k8s.yaml index 40690d2a..1e928200 100644 --- a/script/test/fixtures/multiple-type-volumes/output-k8s.yaml +++ b/script/test/fixtures/multiple-type-volumes/output-k8s.yaml @@ -36,7 +36,7 @@ spec: - name: db-data persistentVolumeClaim: claimName: db-data -status: {} + --- apiVersion: v1 @@ -52,7 +52,7 @@ spec: resources: requests: storage: 100Mi -status: {} + --- apiVersion: apps/v1 @@ -101,7 +101,7 @@ spec: path: test-a-key.key name: web-cm1 name: web-cm1 -status: {} + --- apiVersion: v1 diff --git a/script/test/fixtures/multiple-type-volumes/output-os.yaml b/script/test/fixtures/multiple-type-volumes/output-os.yaml index 9a4c7b76..25673de9 100644 --- a/script/test/fixtures/multiple-type-volumes/output-os.yaml +++ b/script/test/fixtures/multiple-type-volumes/output-os.yaml @@ -91,7 +91,7 @@ spec: resources: requests: storage: 100Mi -status: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/namespace/output-k8s.yaml b/script/test/fixtures/namespace/output-k8s.yaml index 5d262bfc..fcb0e232 100644 --- a/script/test/fixtures/namespace/output-k8s.yaml +++ b/script/test/fixtures/namespace/output-k8s.yaml @@ -14,8 +14,7 @@ spec: targetPort: 80 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: v1 @@ -25,7 +24,7 @@ metadata: name: web namespace: web spec: {} -status: {} + --- apiVersion: apps/v1 @@ -58,5 +57,5 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/namespace/output-os.yaml b/script/test/fixtures/namespace/output-os.yaml index 65c15073..e26e3c61 100644 --- a/script/test/fixtures/namespace/output-os.yaml +++ b/script/test/fixtures/namespace/output-os.yaml @@ -14,8 +14,7 @@ spec: targetPort: 80 selector: io.kompose.service: web -status: - loadBalancer: {} + --- apiVersion: v1 @@ -25,7 +24,7 @@ metadata: name: web namespace: web spec: {} -status: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/network-policies/output-k8s.yaml b/script/test/fixtures/network-policies/output-k8s.yaml index 8dbca2cc..80e96dbd 100644 --- a/script/test/fixtures/network-policies/output-k8s.yaml +++ b/script/test/fixtures/network-policies/output-k8s.yaml @@ -13,8 +13,7 @@ spec: targetPort: 80 selector: io.kompose.service: nginx -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -46,7 +45,7 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + --- apiVersion: networking.k8s.io/v1 diff --git a/script/test/fixtures/read-only/output-k8s.yaml b/script/test/fixtures/read-only/output-k8s.yaml index d18582fd..70eb47d3 100644 --- a/script/test/fixtures/read-only/output-k8s.yaml +++ b/script/test/fixtures/read-only/output-k8s.yaml @@ -13,8 +13,7 @@ spec: targetPort: 80 selector: io.kompose.service: test -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -48,5 +47,5 @@ spec: securityContext: readOnlyRootFilesystem: true restartPolicy: Always -status: {} + diff --git a/script/test/fixtures/read-only/output-os.yaml b/script/test/fixtures/read-only/output-os.yaml index 40cc310e..c098ed19 100644 --- a/script/test/fixtures/read-only/output-os.yaml +++ b/script/test/fixtures/read-only/output-os.yaml @@ -13,8 +13,7 @@ spec: targetPort: 80 selector: io.kompose.service: test -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/service-group/output-k8s.yaml b/script/test/fixtures/service-group/output-k8s.yaml index 57929661..4d3a583d 100644 --- a/script/test/fixtures/service-group/output-k8s.yaml +++ b/script/test/fixtures/service-group/output-k8s.yaml @@ -13,8 +13,7 @@ spec: targetPort: 8000 selector: io.kompose.service: librenms-dispatcher -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -65,7 +64,7 @@ spec: - name: librenms-dispatcher-claim0 persistentVolumeClaim: claimName: librenms-dispatcher-claim0 -status: {} + --- apiVersion: v1 @@ -81,5 +80,5 @@ spec: resources: requests: storage: 100Mi -status: {} + diff --git a/script/test/fixtures/single-file-output/output-k8s.yaml b/script/test/fixtures/single-file-output/output-k8s.yaml index 39835492..f3828633 100644 --- a/script/test/fixtures/single-file-output/output-k8s.yaml +++ b/script/test/fixtures/single-file-output/output-k8s.yaml @@ -16,8 +16,7 @@ spec: targetPort: 80 selector: io.kompose.service: front-end -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -58,7 +57,7 @@ spec: protocol: TCP resources: {} restartPolicy: Always -status: {} + --- apiVersion: networking.k8s.io/v1 @@ -84,6 +83,5 @@ spec: number: 80 path: / pathType: Prefix -status: - loadBalancer: {} + diff --git a/script/test/fixtures/statefulset/output-k8s.yaml b/script/test/fixtures/statefulset/output-k8s.yaml index 7172545e..6d773d95 100644 --- a/script/test/fixtures/statefulset/output-k8s.yaml +++ b/script/test/fixtures/statefulset/output-k8s.yaml @@ -15,8 +15,7 @@ spec: selector: io.kompose.service: db type: ClusterIP -status: - loadBalancer: {} + --- apiVersion: v1 @@ -35,8 +34,7 @@ spec: selector: io.kompose.service: wordpress type: ClusterIP -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -93,7 +91,7 @@ spec: resources: requests: storage: 100Mi - status: {} + status: availableReplicas: 0 replicas: 0 @@ -153,7 +151,7 @@ spec: resources: requests: storage: 100Mi - status: {} + status: availableReplicas: 0 replicas: 0 diff --git a/script/test/fixtures/statefulset/output-os.yaml b/script/test/fixtures/statefulset/output-os.yaml index b3664bd2..afc00e3a 100644 --- a/script/test/fixtures/statefulset/output-os.yaml +++ b/script/test/fixtures/statefulset/output-os.yaml @@ -13,8 +13,7 @@ spec: targetPort: 3306 selector: io.kompose.service: db -status: - loadBalancer: {} + --- apiVersion: v1 @@ -31,8 +30,7 @@ spec: targetPort: 80 selector: io.kompose.service: wordpress -status: - loadBalancer: {} + --- apiVersion: apps/v1 @@ -89,7 +87,7 @@ spec: resources: requests: storage: 100Mi - status: {} + status: availableReplicas: 0 replicas: 0 @@ -235,7 +233,7 @@ spec: resources: requests: storage: 100Mi - status: {} + status: availableReplicas: 0 replicas: 0 diff --git a/script/test/fixtures/v2/output-k8s.yaml b/script/test/fixtures/v2/output-k8s.yaml index 714375d2..7bd47937 100644 --- a/script/test/fixtures/v2/output-k8s.yaml +++ b/script/test/fixtures/v2/output-k8s.yaml @@ -86,8 +86,6 @@ spec: targetPort: 5010 selector: io.kompose.service: foo -status: - loadBalancer: {} --- apiVersion: v1 @@ -107,8 +105,6 @@ spec: selector: io.kompose.service: redis type: LoadBalancer -status: - loadBalancer: {} --- apiVersion: v1 @@ -129,8 +125,6 @@ spec: selector: io.kompose.service: redis type: LoadBalancer -status: - loadBalancer: {} --- apiVersion: v1 @@ -232,7 +226,6 @@ spec: securityContext: supplementalGroups: - 1234 -status: {} --- apiVersion: apps/v1 @@ -272,5 +265,4 @@ spec: limits: memory: "10485760e3" restartPolicy: Always -status: {} diff --git a/script/test/fixtures/v2/output-os.yaml b/script/test/fixtures/v2/output-os.yaml index f9282d27..2b815a65 100644 --- a/script/test/fixtures/v2/output-os.yaml +++ b/script/test/fixtures/v2/output-os.yaml @@ -86,8 +86,7 @@ spec: targetPort: 5010 selector: io.kompose.service: foo -status: - loadBalancer: {} + --- apiVersion: v1 @@ -107,8 +106,7 @@ spec: selector: io.kompose.service: redis type: LoadBalancer -status: - loadBalancer: {} + --- apiVersion: v1 @@ -129,8 +127,7 @@ spec: selector: io.kompose.service: redis type: LoadBalancer -status: - loadBalancer: {} + --- apiVersion: v1 @@ -232,7 +229,7 @@ spec: securityContext: supplementalGroups: - 1234 -status: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/v3.0/output-k8s.yaml b/script/test/fixtures/v3.0/output-k8s.yaml index ae6ee902..4dce1f1a 100644 --- a/script/test/fixtures/v3.0/output-k8s.yaml +++ b/script/test/fixtures/v3.0/output-k8s.yaml @@ -16,8 +16,6 @@ spec: targetPort: 0 selector: io.kompose.service: redis -status: - loadBalancer: {} --- apiVersion: apps/v1 @@ -51,7 +49,6 @@ spec: name: foo resources: {} restartPolicy: Always -status: {} --- apiVersion: apps/v1 @@ -90,5 +87,4 @@ spec: name: redis resources: {} restartPolicy: Always -status: {} diff --git a/script/test/fixtures/v3.0/output-os.yaml b/script/test/fixtures/v3.0/output-os.yaml index 26117700..3b81d1dd 100644 --- a/script/test/fixtures/v3.0/output-os.yaml +++ b/script/test/fixtures/v3.0/output-os.yaml @@ -16,8 +16,7 @@ spec: targetPort: 0 selector: io.kompose.service: redis -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 diff --git a/script/test/fixtures/vols-subpath/output-k8s.yaml b/script/test/fixtures/vols-subpath/output-k8s.yaml index de17dc83..d090bd80 100644 --- a/script/test/fixtures/vols-subpath/output-k8s.yaml +++ b/script/test/fixtures/vols-subpath/output-k8s.yaml @@ -44,7 +44,7 @@ spec: - name: postgres-data persistentVolumeClaim: claimName: postgres-data -status: {} + --- apiVersion: v1 @@ -60,4 +60,4 @@ spec: resources: requests: storage: 100Mi -status: {} + diff --git a/script/test/fixtures/vols-subpath/output-os.yaml b/script/test/fixtures/vols-subpath/output-os.yaml index bd2295e3..b0a5fa2b 100644 --- a/script/test/fixtures/vols-subpath/output-os.yaml +++ b/script/test/fixtures/vols-subpath/output-os.yaml @@ -99,5 +99,5 @@ spec: resources: requests: storage: 100Mi -status: {} + diff --git a/script/test/fixtures/volume-mounts/windows/output-k8s.yaml b/script/test/fixtures/volume-mounts/windows/output-k8s.yaml index 29a2eb65..d5128c62 100644 --- a/script/test/fixtures/volume-mounts/windows/output-k8s.yaml +++ b/script/test/fixtures/volume-mounts/windows/output-k8s.yaml @@ -13,8 +13,6 @@ spec: targetPort: 80 selector: io.kompose.service: db -status: - loadBalancer: {} --- apiVersion: apps/v1 @@ -53,7 +51,6 @@ spec: - name: db-claim0 persistentVolumeClaim: claimName: db-claim0 -status: {} --- apiVersion: v1 @@ -69,5 +66,4 @@ spec: resources: requests: storage: 100Mi -status: {} diff --git a/script/test/fixtures/volume-mounts/windows/output-os.yaml b/script/test/fixtures/volume-mounts/windows/output-os.yaml index ac6b530e..956ea0c5 100644 --- a/script/test/fixtures/volume-mounts/windows/output-os.yaml +++ b/script/test/fixtures/volume-mounts/windows/output-os.yaml @@ -13,8 +13,7 @@ spec: targetPort: 80 selector: io.kompose.service: db -status: - loadBalancer: {} + --- apiVersion: apps.openshift.io/v1 @@ -110,5 +109,5 @@ spec: resources: requests: storage: 100Mi -status: {} +