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
26869581
Commit
26869581
authored
6 years ago
by
tuanvcw
Committed by
Matthew Fisher
6 years ago
Browse files
Options
Download
Patches
Plain Diff
Fix typos in various places (#5360)
Signed-off-by:
Vu Cong Tuan
<
tuanvc@vn.fujitsu.com
>
parent
44eba6d2
release-2.17
dev-v2
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
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
_proto/hapi/release/status.proto
+1
-1
_proto/hapi/release/status.proto
pkg/repo/chartrepo_test.go
+1
-1
pkg/repo/chartrepo_test.go
pkg/tiller/release_server.go
+2
-2
pkg/tiller/release_server.go
pkg/tlsutil/cfg.go
+1
-1
pkg/tlsutil/cfg.go
with
5 additions
and
5 deletions
+5
-5
_proto/hapi/release/status.proto
+
1
−
1
View file @
26869581
...
...
@@ -29,7 +29,7 @@ message Status {
UNKNOWN
=
0
;
// Status_DEPLOYED indicates that the release has been pushed to Kubernetes.
DEPLOYED
=
1
;
// Status_DELETED indicates that a release has been deleted from Kuber
m
etes.
// Status_DELETED indicates that a release has been deleted from Kuber
n
etes.
DELETED
=
2
;
// Status_SUPERSEDED indicates that this release object is outdated and a newer one exists.
SUPERSEDED
=
3
;
...
...
This diff is collapsed.
Click to expand it.
pkg/repo/chartrepo_test.go
+
1
−
1
View file @
26869581
...
...
@@ -175,7 +175,7 @@ func verifyIndex(t *testing.T, actual *IndexFile) {
t
.
Errorf
(
"Expected %q, got %q"
,
e
.
Version
,
g
.
Version
)
}
if
len
(
g
.
Keywords
)
!=
3
{
t
.
Error
(
"Expected 3 key
r
words."
)
t
.
Error
(
"Expected 3 keywords."
)
}
if
len
(
g
.
Maintainers
)
!=
2
{
t
.
Error
(
"Expected 2 maintainers."
)
...
...
This diff is collapsed.
Click to expand it.
pkg/tiller/release_server.go
+
2
−
2
View file @
26869581
...
...
@@ -115,7 +115,7 @@ func NewReleaseServer(env *environment.Environment, clientset kubernetes.Interfa
// request values are not altered.
func
(
s
*
ReleaseServer
)
reuseValues
(
req
*
services
.
UpdateReleaseRequest
,
current
*
release
.
Release
)
error
{
if
req
.
ResetValues
{
// If ResetValues is set, we comletely ignore current.Config.
// If ResetValues is set, we com
p
letely ignore current.Config.
s
.
Log
(
"resetting values to the chart's original version"
)
return
nil
}
...
...
@@ -191,7 +191,7 @@ func (s *ReleaseServer) uniqName(start string, reuse bool) (string, error) {
rel
:=
h
[
0
]
if
st
:=
rel
.
Info
.
Status
.
Code
;
reuse
&&
(
st
==
release
.
Status_DELETED
||
st
==
release
.
Status_FAILED
)
{
// Allow
e
re-use of names if the previous release is marked deleted.
// Allow re-use of names if the previous release is marked deleted.
s
.
Log
(
"name %s exists but is not in use, reusing name"
,
start
)
return
start
,
nil
}
else
if
reuse
{
...
...
This diff is collapsed.
Click to expand it.
pkg/tlsutil/cfg.go
+
1
−
1
View file @
26869581
...
...
@@ -40,7 +40,7 @@ type Options struct {
ClientAuth
tls
.
ClientAuthType
}
// ClientConfig retus
n
a TLS configuration for use by a Helm client.
// ClientConfig retu
rn
s a TLS configuration for use by a Helm client.
func
ClientConfig
(
opts
Options
)
(
cfg
*
tls
.
Config
,
err
error
)
{
var
cert
*
tls
.
Certificate
var
pool
*
x509
.
CertPool
...
...
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