Merge pull request #11874 from fabianofranz/bugs_1393230

Merged by openshift-bot

Author: OpenShift Bot

Diff for: test/cmd/convert.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${OS_ROOT}/hack/lib/init.sh"
+os::log::stacktrace::install
+trap os::test::junit::reconcile_output EXIT
+
+# Cleanup cluster resources created by this test
+(
+  set +e
+  oc delete all --all
+  exit 0
+) &>/dev/null
+
+os::test::junit::declare_suite_start "cmd/convert"
+# This test validates the convert command
+
+os::cmd::expect_success "oc convert -f test/testdata/convert/job-v1.yaml | grep 'apiVersion: batch/v1'"
+os::cmd::expect_success "oc convert -f test/testdata/convert/job-v2.json | grep 'apiVersion: batch/v2alpha1'"
+
+os::cmd::expect_success "oc convert -f test/testdata/convert/job-v1.yaml --output-version=batch/v2alpha1 | grep 'apiVersion: batch/v2alpha1'"
+os::cmd::expect_failure "oc convert -f test/testdata/convert/job-v1.yaml --output-version=batch/v2alpha1 | grep 'apiVersion: batch/v1'"
+
+os::cmd::expect_success "oc convert -f test/testdata/convert --output-version=batch/v2alpha1 | grep 'apiVersion: batch/v2alpha1'"
+os::cmd::expect_failure "oc convert -f test/testdata/convert --output-version=batch/v2alpha1 | grep 'apiVersion: batch/v1'"
+
+os::cmd::expect_success_and_text "oc convert -f test/testdata/convert | oc create --dry-run -f -" 'job "pi" created'
+os::cmd::expect_success_and_text "oc convert -f test/testdata/convert | oc create --dry-run -f -" 'scheduledjob "hello" created'
+
+echo "convert: ok"
+os::test::junit::declare_suite_end

Diff for: test/testdata/convert/job-v1.yaml

@@ -0,0 +1,14 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: pi
+spec:
+  template:
+    metadata:
+      name: pi
+    spec:
+      containers:
+      - name: pi
+        image: perl
+        command: ["perl",  "-Mbignum=bpi", "-wle", "print bpi(2000)"]
+      restartPolicy: Never

Diff for: test/testdata/convert/job-v2.json

@@ -0,0 +1,46 @@
+{
+    "kind": "ScheduledJob",
+    "apiVersion": "batch/v2alpha1",
+    "metadata": {
+        "name": "hello",
+        "creationTimestamp": null
+    },
+    "spec": {
+        "schedule": "0/1 * * * ?",
+        "concurrencyPolicy": "Allow",
+        "suspend": false,
+        "jobTemplate": {
+            "metadata": {
+                "creationTimestamp": null
+            },
+            "spec": {
+                "template": {
+                    "metadata": {
+                        "creationTimestamp": null
+                    },
+                    "spec": {
+                        "containers": [
+                            {
+                                "name": "hello",
+                                "image": "busybox",
+                                "args": [
+                                    "/bin/sh",
+                                    "-c",
+                                    "date; echo Hello from the Kubernetes cluster"
+                                ],
+                                "resources": {},
+                                "terminationMessagePath": "/dev/termination-log",
+                                "imagePullPolicy": "Always"
+                            }
+                        ],
+                        "restartPolicy": "OnFailure",
+                        "terminationGracePeriodSeconds": 30,
+                        "dnsPolicy": "ClusterFirst",
+                        "securityContext": {}
+                    }
+                }
+            }
+        }
+    },
+    "status": {}
+}