Skip to content

Commit a915bcd

Browse files
Merge pull request #21018 from soltysh/drop_types
Drop oc types command
2 parents 4cec398 + 15add18 commit a915bcd

File tree

6 files changed

+1
-328
lines changed

6 files changed

+1
-328
lines changed

contrib/completions/bash/oc

-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contrib/completions/zsh/oc

-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/oc/cli/cli.go

-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ import (
6262
"github.com/openshift/origin/pkg/oc/cli/startbuild"
6363
"github.com/openshift/origin/pkg/oc/cli/status"
6464
"github.com/openshift/origin/pkg/oc/cli/tag"
65-
"github.com/openshift/origin/pkg/oc/cli/types"
6665
"github.com/openshift/origin/pkg/oc/cli/version"
6766
"github.com/openshift/origin/pkg/oc/cli/whoami"
6867
"github.com/openshift/origin/pkg/oc/util/ocscheme"
@@ -134,7 +133,6 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
134133
{
135134
Message: "Basic Commands:",
136135
Commands: []*cobra.Command{
137-
types.NewCmdTypes(fullName, f, ioStreams),
138136
loginCmd,
139137
requestproject.NewCmdRequestProject(fullName, f, ioStreams),
140138
newapp.NewCmdNewApplication(newapp.NewAppRecommendedCommandName, fullName, f, ioStreams),

pkg/oc/cli/types/types.go

-237
This file was deleted.

test/cmd/basicresources.sh

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ echo "status help output: ok"
5858
os::test::junit::declare_suite_end
5959

6060
os::test::junit::declare_suite_start "cmd/basicresources/explain"
61-
os::cmd::expect_failure_and_text 'oc types' 'Deployment Configuration'
6261
os::cmd::expect_failure_and_text 'oc get' 'oc api-resources'
6362
os::cmd::expect_success_and_text 'oc get all --loglevel=6' 'buildconfigs'
6463
os::cmd::expect_success_and_text 'oc explain pods' 'Pod is a collection of containers that can run on a host'

test/cmd/help.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ os::cmd::expect_success_and_text 'oc policy --help' 'add-role-to-user'
2121
os::cmd::expect_success_and_not_text 'oc policy --help' 'Other Commands'
2222
os::cmd::expect_success_and_not_text 'oc -h' 'Options'
2323
os::cmd::expect_success_and_not_text 'oc -h' 'Global Options'
24-
os::cmd::expect_failure_and_text 'oc types' 'Deployment Config'
2524
os::cmd::expect_failure_and_text 'oc adm ca' 'Manage certificates'
2625
os::cmd::expect_success_and_text 'oc exec --help' '\[flags\] POD \[\-c CONTAINER\] \-\- COMMAND \[args\.\.\.\]$'
2726
os::cmd::expect_success_and_text 'oc rsh --help' '\[flags\] POD \[COMMAND\]$'
@@ -81,4 +80,4 @@ os::cmd::expect_success_and_text 'oc adm groups sync --help' 'external provider'
8180
os::cmd::expect_success_and_text 'oc adm groups prune --help' 'external provider'
8281
os::cmd::expect_success_and_text 'oc adm prune groups --help' 'external provider'
8382

84-
os::test::junit::declare_suite_end
83+
os::test::junit::declare_suite_end

0 commit comments

Comments
 (0)