Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
1105 Внедрение механизмов обеспечения безопасности цепочки поставки программных проектов
Legacy
scanned-projects
helm
Commits
a7ab81f8
Unverified
Commit
a7ab81f8
authored
6 years ago
by
Matthew Fisher
Browse files
Options
Download
Patches
Plain Diff
setup connection after displaying client version
parent
bda27b6f
release-2.17
dev-v2
release-2.11
release-2.12
release-2.13
release-2.14
release-2.15
release-2.16
v2.17.0
v2.17.0-rc.1
v2.16.12
v2.16.11
v2.16.10
v2.16.9
v2.16.8
v2.16.7
v2.16.6
v2.16.5
v2.16.4
v2.16.3
v2.16.2
v2.16.1
v2.16.0
v2.16.0-rc.2
v2.16.0-rc.1
v2.15.2
v2.15.1
v2.15.0
v2.15.0-rc.2
v2.15.0-rc.1
v2.14.3
v2.14.2
v2.14.1
v2.14.0
v2.14.0-rc.2
v2.14.0-rc.1
v2.13.1
v2.13.1-rc.1
v2.13.0
v2.13.0-rc.2
v2.13.0-rc.1
v2.12.3
v2.12.2
v2.12.1
v2.12.0
v2.12.0-rc.2
v2.12.0-rc.1
v2.11.0
v2.11.0-rc.4
v2.11.0-rc.3
v2.11.0-rc.2
v2.11.0-rc.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmd/helm/version.go
+7
-9
cmd/helm/version.go
with
7 additions
and
9 deletions
+7
-9
cmd/helm/version.go
+
7
−
9
View file @
a7ab81f8
...
@@ -73,15 +73,6 @@ func newVersionCmd(c helm.Interface, out io.Writer) *cobra.Command {
...
@@ -73,15 +73,6 @@ func newVersionCmd(c helm.Interface, out io.Writer) *cobra.Command {
if
!
version
.
showClient
&&
!
version
.
showServer
{
if
!
version
.
showClient
&&
!
version
.
showServer
{
version
.
showClient
,
version
.
showServer
=
true
,
true
version
.
showClient
,
version
.
showServer
=
true
,
true
}
}
if
version
.
showServer
{
// We do this manually instead of in PreRun because we only
// need a tunnel if server version is requested.
err
:=
setupConnection
()
if
err
!=
nil
{
return
err
}
}
version
.
client
=
ensureHelmClient
(
version
.
client
)
return
version
.
run
()
return
version
.
run
()
},
},
}
}
...
@@ -111,6 +102,13 @@ func (v *versionCmd) run() error {
...
@@ -111,6 +102,13 @@ func (v *versionCmd) run() error {
return
tpl
(
v
.
template
,
data
,
v
.
out
)
return
tpl
(
v
.
template
,
data
,
v
.
out
)
}
}
// We do this manually instead of in PreRun because we only
// need a tunnel if server version is requested.
if
err
:=
setupConnection
();
err
!=
nil
{
return
err
}
v
.
client
=
ensureHelmClient
(
v
.
client
)
if
settings
.
Debug
{
if
settings
.
Debug
{
k8sVersion
,
err
:=
getK8sVersion
()
k8sVersion
,
err
:=
getK8sVersion
()
if
err
!=
nil
{
if
err
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets