Skip to content

Commit 8ffa313

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #17335 from juanvallejo/jvallejo/break-cmd-version-dependency-non-cli-pkgs
Automatic merge from submit-queue. break dependency on version cmd for non-cli pkgs This patch solves a few of the items (currently checked) from #17309 Removes dependency on `pkg/cli/cmd/version` for packages outside of the `pkg/oc` subtree. cc @deads2k @liggitt @openshift/cli-review
2 parents ed98996 + 79b3fbe commit 8ffa313

File tree

7 files changed

+45
-19
lines changed

7 files changed

+45
-19
lines changed

‎pkg/cmd/infra/builder/builder.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import (
99
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1010

1111
"github.com/openshift/origin/pkg/build/builder/cmd"
12-
ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
12+
cmdversion "github.com/openshift/origin/pkg/cmd/version"
13+
"github.com/openshift/origin/pkg/version"
1314
)
1415

1516
var (
@@ -56,7 +57,7 @@ func NewCommandS2IBuilder(name string) *cobra.Command {
5657
},
5758
}
5859

59-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
60+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
6061
return cmd
6162
}
6263

@@ -71,7 +72,7 @@ func NewCommandDockerBuilder(name string) *cobra.Command {
7172
kcmdutil.CheckErr(err)
7273
},
7374
}
74-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
75+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
7576
return cmd
7677
}
7778

@@ -87,7 +88,7 @@ func NewCommandGitClone(name string) *cobra.Command {
8788
kcmdutil.CheckErr(err)
8889
},
8990
}
90-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
91+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
9192
return cmd
9293
}
9394

@@ -101,7 +102,7 @@ func NewCommandManageDockerfile(name string) *cobra.Command {
101102
kcmdutil.CheckErr(err)
102103
},
103104
}
104-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
105+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
105106
return cmd
106107
}
107108

@@ -115,6 +116,6 @@ func NewCommandExtractImageContent(name string) *cobra.Command {
115116
kcmdutil.CheckErr(err)
116117
},
117118
}
118-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
119+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
119120
return cmd
120121
}

‎pkg/cmd/infra/deployer/deployer.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ import (
2424
"github.com/openshift/origin/pkg/apps/strategy/rolling"
2525
deployutil "github.com/openshift/origin/pkg/apps/util"
2626
"github.com/openshift/origin/pkg/cmd/util"
27+
cmdversion "github.com/openshift/origin/pkg/cmd/version"
2728
imageclientinternal "github.com/openshift/origin/pkg/image/generated/internalclientset"
28-
ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
29+
"github.com/openshift/origin/pkg/version"
2930
)
3031

3132
var (
@@ -81,7 +82,7 @@ func NewCommandDeployer(name string) *cobra.Command {
8182
},
8283
}
8384

84-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
85+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
8586

8687
flag := cmd.Flags()
8788
flag.StringVar(&cfg.rcName, "deployment", util.Env("OPENSHIFT_DEPLOYMENT_NAME", ""), "The deployment name to start")

‎pkg/cmd/infra/router/f5.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ import (
1414

1515
"github.com/openshift/origin/pkg/cmd/util"
1616
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
17-
ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
17+
cmdversion "github.com/openshift/origin/pkg/cmd/version"
1818
projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
1919
routeapi "github.com/openshift/origin/pkg/route/apis/route"
2020
routeinternalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset"
2121
"github.com/openshift/origin/pkg/router/controller"
2222
f5plugin "github.com/openshift/origin/pkg/router/f5"
23+
"github.com/openshift/origin/pkg/version"
2324
)
2425

2526
var (
@@ -152,7 +153,7 @@ func NewCommandF5Router(name string) *cobra.Command {
152153
},
153154
}
154155

155-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
156+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
156157

157158
flag := cmd.Flags()
158159
options.Config.Bind(flag)

‎pkg/cmd/infra/router/template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/openshift/origin/pkg/cmd/server/crypto"
3131
"github.com/openshift/origin/pkg/cmd/util"
3232
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
33-
ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
33+
cmdversion "github.com/openshift/origin/pkg/cmd/version"
3434
projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
3535
routeinternalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset"
3636
"github.com/openshift/origin/pkg/router"
@@ -160,7 +160,7 @@ func NewCommandTemplateRouter(name string) *cobra.Command {
160160
},
161161
}
162162

163-
cmd.AddCommand(ocmd.NewCmdVersion(name, nil, os.Stdout, ocmd.VersionOptions{}))
163+
cmd.AddCommand(cmdversion.NewCmdVersion(name, version.Get(), os.Stdout))
164164

165165
flag := cmd.Flags()
166166
options.Config.Bind(flag)

‎pkg/cmd/server/start/kubernetes/kubernetes.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
1414

1515
cmdutil "github.com/openshift/origin/pkg/cmd/util"
16-
"github.com/openshift/origin/pkg/oc/cli/cmd"
1716
)
1817

1918
const kubernetesLong = `
@@ -36,9 +35,6 @@ func NewCommand(name, fullName string, out, errOut io.Writer) *cobra.Command {
3635
cmds.AddCommand(NewKubeletCommand("kubelet", fullName+" kubelet", out))
3736
cmds.AddCommand(proxyapp.NewProxyCommand())
3837
cmds.AddCommand(NewSchedulerCommand("scheduler", fullName+" scheduler", out))
39-
if "hyperkube" == fullName {
40-
cmds.AddCommand(cmd.NewCmdVersion(fullName, nil, out, cmd.VersionOptions{}))
41-
}
4238

4339
return cmds
4440
}

‎pkg/cmd/version/version.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package version
2+
3+
import (
4+
"fmt"
5+
"io"
6+
7+
"github.com/spf13/cobra"
8+
)
9+
10+
// VersionInfo provides semantic version information
11+
// in a human-friendly format
12+
// TODO: may be expanded for various short and formatting options if necessary.
13+
type VersionInfo interface {
14+
String() string
15+
}
16+
17+
// NewCmdVersion provides a shim around version for
18+
// non-client packages that require version information
19+
func NewCmdVersion(fullName string, versionInfo VersionInfo, out io.Writer) *cobra.Command {
20+
cmd := &cobra.Command{
21+
Use: "version",
22+
Short: "Display client and server versions",
23+
Long: "Display client and server versions",
24+
Run: func(cmd *cobra.Command, args []string) {
25+
fmt.Fprintf(out, "%s %v\n", fullName, versionInfo)
26+
},
27+
}
28+
29+
return cmd
30+
}

‎pkg/federation/kubefed/kubefed.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
1616

1717
osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
18-
"github.com/openshift/origin/pkg/oc/cli/cmd"
1918
"github.com/openshift/origin/pkg/version"
2019
)
2120

@@ -75,8 +74,6 @@ func NewKubeFedCommand(in io.Reader, out, err io.Writer) *cobra.Command {
7574
templates.ActsAsRootCommand(cmds, filters, groups...)
7675

7776
// Use the openshift-specific version command
78-
cmds.AddCommand(cmd.NewCmdVersion("kubefed", f, out, cmd.VersionOptions{PrintClientFeatures: true}))
79-
8077
cmds.AddCommand(kubectl.NewCmdOptions(out))
8178

8279
return cmds

0 commit comments

Comments
 (0)