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
a6f0d136
Unverified
Commit
a6f0d136
authored
6 years ago
by
Adam Reese
Browse files
Options
Download
Patches
Plain Diff
fixup! ref(cmd,pkg/helm): remove server side version
parent
e9478d8f
main
Release
add-codeql
dependabot/go_modules/github.com/docker/distribution-2.8.2incompatible
dependabot/go_modules/github.com/lib/pq-1.10.9
dependabot/go_modules/github.com/rubenv/sql-migrate-1.4.0
dependabot/go_modules/golang.org/x/crypto-0.9.0
dependabot/go_modules/golang.org/x/term-0.8.0
dependabot/go_modules/k8s.io/klog/v2-2.100.1
feat-v3/event-emitter-lua
release-3.0
release-3.1
release-3.10
release-3.11
release-3.12
release-3.2
release-3.3
release-3.4
release-3.5
release-3.6
release-3.6.1
release-3.6.2
release-3.7
release-3.8
release-3.9
release-v3.0.0-beta.4
v3.12.0
v3.12.0-rc.1
v3.12.0-dev.1
v3.11.3
v3.11.2
v3.11.1
v3.11.0
v3.11.0-rc.2
v3.11.0-rc.1
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.10.0-rc.1
v3.9.4
v3.9.3
v3.9.2
v3.9.1
v3.9.0
v3.9.0-rc.1
v3.8.2
v3.8.1
v3.8.0
v3.8.0-rc.2
v3.8.0-rc.1
v3.7.2
v3.7.1
v3.7.0
v3.7.0-rc.3
v3.7.0-rc.2
v3.7.0-rc.1
v3.6.3
v3.6.2
v3.6.1
v3.6.0
v3.6.0-rc.1
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.5.0-rc.2
v3.5.0-rc.1
v3.4.2
v3.4.1
v3.4.0
v3.4.0-rc.1
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
v3.3.0-rc.2
v3.3.0-rc.1
v3.2.4
v3.2.3
v3.2.2
v3.2.1
v3.2.0
v3.2.0-rc.1
v3.1.3
v3.1.2
v3.1.1
v3.1.0
v3.1.0-rc.3
v3.1.0-rc.2
v3.1.0-rc.1
v3.0.3
v3.0.2
v3.0.1
v3.0.0
v3.0.0-rc.4
v3.0.0-rc.3
v3.0.0-rc.2
v3.0.0-rc.1
v3.0.0-beta.5
v3.0.0-beta.4
v3.0.0-beta.3
v3.0.0-beta.2
v3.0.0-beta.1
v3.0.0-alpha.2
v3.0.0-alpha.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmd/helm/helm.go
+1
-1
cmd/helm/helm.go
cmd/helm/version.go
+4
-9
cmd/helm/version.go
cmd/helm/version_test.go
+1
-1
cmd/helm/version_test.go
with
6 additions
and
11 deletions
+6
-11
cmd/helm/helm.go
+
1
−
1
View file @
a6f0d136
...
@@ -107,7 +107,7 @@ func newRootCmd(args []string) *cobra.Command {
...
@@ -107,7 +107,7 @@ func newRootCmd(args []string) *cobra.Command {
newUpgradeCmd
(
nil
,
out
),
newUpgradeCmd
(
nil
,
out
),
newReleaseTestCmd
(
nil
,
out
),
newReleaseTestCmd
(
nil
,
out
),
newVersionCmd
(
nil
,
out
),
newVersionCmd
(
out
),
newCompletionCmd
(
out
),
newCompletionCmd
(
out
),
newHomeCmd
(
out
),
newHomeCmd
(
out
),
...
...
This diff is collapsed.
Click to expand it.
cmd/helm/version.go
+
4
−
9
View file @
a6f0d136
...
@@ -22,27 +22,22 @@ import (
...
@@ -22,27 +22,22 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"
pb
"k8s.io/helm/pkg/proto/hapi/version"
pb
"k8s.io/helm/pkg/proto/hapi/version"
"k8s.io/helm/pkg/version"
"k8s.io/helm/pkg/version"
)
)
const
versionDesc
=
`
const
versionDesc
=
`
Show the
client and server
version
s
for Helm
and tiller
.
Show the version for Helm.
This will print a representation
of
the
client and server
version
s
of Helm
and
This will print a representation the version of Helm
.
Tiller.
The output will look something like this:
The output will look something like this:
Client: &version.Version{SemVer:"v2.0.0", GitCommit:"ff52399e51bb880526e9cd0ed8386f6433b74da1", GitTreeState:"clean"}
Client: &version.Version{SemVer:"v2.0.0", GitCommit:"ff52399e51bb880526e9cd0ed8386f6433b74da1", GitTreeState:"clean"}
Server: &version.Version{SemVer:"v2.0.0", GitCommit:"b0c113dfb9f612a9add796549da66c0d294508a3", GitTreeState:"clean"}
- SemVer is the semantic version of the release.
- SemVer is the semantic version of the release.
- GitCommit is the SHA for the commit that this version was built from.
- GitCommit is the SHA for the commit that this version was built from.
- GitTreeState is "clean" if there are no local code changes when this binary was
- GitTreeState is "clean" if there are no local code changes when this binary was
built, and "dirty" if the binary was built from locally modified code.
built, and "dirty" if the binary was built from locally modified code.
To print just the client version, use '--client'. To print just the server version,
use '--server'.
`
`
type
versionCmd
struct
{
type
versionCmd
struct
{
...
@@ -51,7 +46,7 @@ type versionCmd struct {
...
@@ -51,7 +46,7 @@ type versionCmd struct {
template
string
template
string
}
}
func
newVersionCmd
(
c
helm
.
Interface
,
out
io
.
Writer
)
*
cobra
.
Command
{
func
newVersionCmd
(
out
io
.
Writer
)
*
cobra
.
Command
{
version
:=
&
versionCmd
{
out
:
out
}
version
:=
&
versionCmd
{
out
:
out
}
cmd
:=
&
cobra
.
Command
{
cmd
:=
&
cobra
.
Command
{
...
...
This diff is collapsed.
Click to expand it.
cmd/helm/version_test.go
+
1
−
1
View file @
a6f0d136
...
@@ -46,6 +46,6 @@ func TestVersion(t *testing.T) {
...
@@ -46,6 +46,6 @@ func TestVersion(t *testing.T) {
}
}
settings
.
TillerHost
=
"fake-localhost"
settings
.
TillerHost
=
"fake-localhost"
runReleaseCases
(
t
,
tests
,
func
(
c
*
helm
.
FakeClient
,
out
io
.
Writer
)
*
cobra
.
Command
{
runReleaseCases
(
t
,
tests
,
func
(
c
*
helm
.
FakeClient
,
out
io
.
Writer
)
*
cobra
.
Command
{
return
newVersionCmd
(
c
,
out
)
return
newVersionCmd
(
out
)
})
})
}
}
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