Merge pull request #18268 from soltysh/issue18261

Automatic merge from submit-queue (batch tested with PRs 18415, 18419, 18268, 18102, 18440). UPSTREAM: 58753: Fix kubectl explain for cronjobs Fixes #18261. @Kargakis fyi /assign @juanvallejo
openshift · Feb 5, 2018 · 797fbde · 797fbde
2 parents 9a0806a + 7550307
commit 797fbde
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/test/cmd/explain.sh b/test/cmd/explain.sh
@@ -23,6 +23,8 @@ os::cmd::expect_success 'oc explain bc'
 os::cmd::expect_success 'oc explain image'
 os::cmd::expect_success 'oc explain is'
 
+os::cmd::expect_success 'oc explain cronjob'
+
 echo "explain: ok"
 os::test::junit::declare_suite_end
 
diff --git a/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh b/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/explain.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/explain.go