Skip to content

collapse onto upstream version command #21434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deads2k merged 4 commits into from
Feb 23, 2019
Merged

collapse onto upstream version command #21434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86404ec
UPSTREAM: <carry>: inject version into kubectl
deads2k Nov 6, 2018
1fb6a51
UPSTREAM: 70713: kubectl version should print just client information…
deads2k Nov 6, 2018
ddee457
generated
deads2k Feb 20, 2019
8d0ae2a
collapse onto upstream version function
deads2k Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions contrib/completions/bash/oc
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions contrib/completions/zsh/oc
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions hack/import-restrictions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,15 +617,13 @@

"vendor/github.com/coreos/etcd/clientv3",
"vendor/github.com/coreos/etcd/pkg/transport",
"vendor/github.com/coreos/etcd/version",
"vendor/github.com/ghodss/yaml",

"vendor/k8s.io/kubernetes/pkg/api/legacyscheme",
"vendor/k8s.io/kubernetes/pkg/controller",
"vendor/k8s.io/kubernetes/pkg/controller/deployment/util",
"vendor/k8s.io/kubernetes/pkg/credentialprovider",
"vendor/k8s.io/kubernetes/pkg/serviceaccount",
"vendor/k8s.io/kubernetes/pkg/version",

"vendor/github.com/openshift/library-go/pkg/git"
]
Expand Down
5 changes: 0 additions & 5 deletions pkg/oc/cli/admin/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
"github.com/openshift/origin/pkg/oc/cli/admin/verifyimagesignature"
"github.com/openshift/origin/pkg/oc/cli/kubectlwrappers"
"github.com/openshift/origin/pkg/oc/cli/options"
"github.com/openshift/origin/pkg/oc/cli/version"
)

var adminLong = ktemplates.LongDesc(`
Expand Down Expand Up @@ -143,10 +142,6 @@ func NewCommandAdmin(name, fullName string, f kcmdutil.Factory, streams genericc
options.NewCmdOptions(streams),
)

if name == fullName {
cmds.AddCommand(version.NewCmdVersion(fullName, f, version.NewVersionOptions(false, streams)))
}

return cmds
}

Expand Down
5 changes: 1 addition & 4 deletions pkg/oc/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import (
"github.com/openshift/origin/pkg/oc/cli/startbuild"
"github.com/openshift/origin/pkg/oc/cli/status"
"github.com/openshift/origin/pkg/oc/cli/tag"
"github.com/openshift/origin/pkg/oc/cli/version"
"github.com/openshift/origin/pkg/oc/cli/whoami"
)

Expand Down Expand Up @@ -259,9 +258,7 @@ func NewOcCommand(name, fullName string, in io.Reader, out, errout io.Writer) *c
cmds.AddCommand(newExperimentalCommand("ex", name+" ex", f, ioStreams))

cmds.AddCommand(kubectlwrappers.NewCmdPlugin(fullName, f, ioStreams))
if name == fullName {
cmds.AddCommand(version.NewCmdVersion(fullName, f, version.NewVersionOptions(true, ioStreams)))
}
cmds.AddCommand(kubecmd.NewCmdVersion(f, ioStreams))
cmds.AddCommand(options.NewCmdOptions(ioStreams))

if cmds.Flag("namespace") != nil {
Expand Down
3 changes: 3 additions & 0 deletions pkg/oc/cli/shim_kubectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/genericclioptions/openshiftpatch"
kclientcmd "k8s.io/client-go/tools/clientcmd"
kcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
kcmdset "k8s.io/kubernetes/pkg/kubectl/cmd/set"
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"

"github.com/openshift/origin/pkg/api/legacygroupification"
"github.com/openshift/origin/pkg/oc/originpolymorphichelpers"
"github.com/openshift/origin/pkg/oc/util/clientcmd"
"github.com/openshift/origin/pkg/version"
)

func shimKubectlForOc() {
Expand Down Expand Up @@ -41,4 +43,5 @@ func shimKubectlForOc() {
// update some functions we inject
kcmdutil.GeneratorFn = originpolymorphichelpers.NewGeneratorsFn(kcmdutil.GeneratorFn)
kcmdutil.DescriberFn = originpolymorphichelpers.NewDescriberFn(kcmdutil.DescriberFn)
kcmd.OverrideGetVersionFn = version.Get
}
214 changes: 0 additions & 214 deletions pkg/oc/cli/version/version.go
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions test/cmd/basicresources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ os_git_regex="$( escape_regex "${OS_GIT_VERSION%%-*}" )"
kube_git_regex="$( escape_regex "${KUBE_GIT_VERSION%%-*}" )"
etcd_version="$(echo "${ETCD_GIT_VERSION}" | sed -E "s/\-.*//g" | sed -E "s/v//")"
etcd_git_regex="$( escape_regex "${etcd_version%%-*}" )"
os::cmd::expect_success_and_text 'oc version' "oc ${os_git_regex}"
os::cmd::expect_success_and_text 'oc version' "kubernetes ${kube_git_regex}"
os::cmd::expect_success_and_text 'oc version' "features: Basic-Auth"
os::cmd::expect_success_and_text 'openshift version' "openshift ${os_git_regex}"
os::cmd::expect_success_and_text 'oc version' "Client Version: .*GitVersion:\"${os_git_regex}"
os::cmd::expect_success_and_text 'oc version' "Server Version: .*GitVersion:\"${kube_git_regex}"
os::cmd::expect_success_and_text "curl -k '${API_SCHEME}://${API_HOST}:${API_PORT}/version'" "${kube_git_regex}"
os::cmd::expect_success_and_text "curl -k '${API_SCHEME}://${API_HOST}:${API_PORT}/version'" "${OS_GIT_COMMIT}"

Expand Down
16 changes: 16 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubectl/cmd/patch_version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions vendor/k8s.io/kubernetes/pkg/kubectl/cmd/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.