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
a46a033d
Commit
a46a033d
authored
8 years ago
by
Matt Butcher
Browse files
Options
Download
Patches
Plain Diff
feat(chart): support 'image:URL' in charts.
Closes #1034
parent
7dadacc1
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
dev-v2
feat-v3/event-emitter-lua
kube-update-test
release-2.0
release-2.1
release-2.10
release-2.11
release-2.12
release-2.13
release-2.14
release-2.15
release-2.16
release-2.17
release-2.2
release-2.3
release-2.4
release-2.5
release-2.6
release-2.7
release-2.8
release-2.9
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
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
v2.10.0
v2.10.0-rc.3
v2.10.0-rc.2
v2.10.0-rc.1
v2.9.1
v2.9.0
v2.9.0-rc5
v2.9.0-rc4
v2.9.0-rc3
v2.9.0-rc2
v2.9.0-rc1
v2.8.2
v2.8.2-rc1
v2.8.1
v2.8.0
v2.8.0-rc.1
v2.7.2
v2.7.1
v2.7.0
v2.7.0-rc1
v2.6.2
v2.6.1
v2.6.0
v2.5.1
v2.5.0
v2.4.2
v2.4.1
v2.4.0
v2.3.1
v2.3.0
v2.2.3
v2.2.2
v2.2.1
v2.2.0
v2.1.3
v2.1.2
v2.1.1
v2.1.0
v2.0.2
v2.0.1
v2.0.0
v2.0.0-rc.2
v2.0.0-rc.1
v2.0.0-beta.2
v2.0.0-beta.1
v2.0.0-alpha.5
v2.0.0-alpha.4
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
_proto/hapi/chart/metadata.proto
+3
-0
_proto/hapi/chart/metadata.proto
docs/charts.md
+1
-0
docs/charts.md
pkg/chartutil/chartfile_test.go
+4
-0
pkg/chartutil/chartfile_test.go
pkg/chartutil/testdata/chartfiletest.yaml
+1
-0
pkg/chartutil/testdata/chartfiletest.yaml
pkg/chartutil/testdata/frobnitz-1.2.3.tgz
+0
-0
pkg/chartutil/testdata/frobnitz-1.2.3.tgz
pkg/chartutil/testdata/frobnitz/Chart.yaml
+1
-0
pkg/chartutil/testdata/frobnitz/Chart.yaml
pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz
+0
-0
pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz
pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz
+0
-0
pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz
pkg/proto/hapi/chart/metadata.pb.go
+21
-18
pkg/proto/hapi/chart/metadata.pb.go
with
31 additions
and
18 deletions
+31
-18
_proto/hapi/chart/metadata.proto
+
3
−
0
View file @
a46a033d
...
...
@@ -58,4 +58,7 @@ message Metadata {
// The name of the template engine to use. Defaults to 'gotpl'.
string
engine
=
8
;
// The URL to an icon file.
string
icon
=
9
;
}
This diff is collapsed.
Click to expand it.
docs/charts.md
+
1
−
0
View file @
a46a033d
...
...
@@ -51,6 +51,7 @@ maintainers: # (optional)
-
name
:
The maintainer's name (required for each maintainer)
email
:
The maintainer's email (optional for each maintainer)
engine
:
gotpl
# The name of the template engine (optional, defaults to gotpl)
icon
:
A URL to an SVG or PNG image to be used as an icon (optional).
```
If you are familiar with the
`Chart.yaml`
file format for Helm Classic, you will
...
...
This diff is collapsed.
Click to expand it.
pkg/chartutil/chartfile_test.go
+
4
−
0
View file @
a46a033d
...
...
@@ -75,6 +75,10 @@ func verifyChartfile(t *testing.T, f *chart.Metadata) {
t
.
Error
(
"Unexpected home."
)
}
if
f
.
Icon
!=
"https://example.com/64x64.png"
{
t
.
Errorf
(
"Unexpected icon: %q"
,
f
.
Icon
)
}
if
len
(
f
.
Keywords
)
!=
3
{
t
.
Error
(
"Unexpected keywords"
)
}
...
...
This diff is collapsed.
Click to expand it.
pkg/chartutil/testdata/chartfiletest.yaml
+
1
−
0
View file @
a46a033d
...
...
@@ -13,3 +13,4 @@ maintainers:
sources
:
-
https://example.com/foo/bar
home
:
http://example.com
icon
:
https://example.com/64x64.png
This diff is collapsed.
Click to expand it.
pkg/chartutil/testdata/frobnitz-1.2.3.tgz
+
0
−
0
View file @
a46a033d
No preview for this file type
This diff is collapsed.
Click to expand it.
pkg/chartutil/testdata/frobnitz/Chart.yaml
+
1
−
0
View file @
a46a033d
...
...
@@ -13,3 +13,4 @@ maintainers:
sources
:
-
https://example.com/foo/bar
home
:
http://example.com
icon
:
https://example.com/64x64.png
This diff is collapsed.
Click to expand it.
pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz
+
0
−
0
View file @
a46a033d
No preview for this file type
This diff is collapsed.
Click to expand it.
pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz
+
0
−
0
View file @
a46a033d
No preview for this file type
This diff is collapsed.
Click to expand it.
pkg/proto/hapi/chart/metadata.pb.go
+
21
−
18
View file @
a46a033d
...
...
@@ -67,6 +67,8 @@ type Metadata struct {
Maintainers
[]
*
Maintainer
`protobuf:"bytes,7,rep,name=maintainers" json:"maintainers,omitempty"`
// The name of the template engine to use. Defaults to 'gotpl'.
Engine
string
`protobuf:"bytes,8,opt,name=engine" json:"engine,omitempty"`
// The URL to an icon file.
Icon
string
`protobuf:"bytes,9,opt,name=icon" json:"icon,omitempty"`
}
func
(
m
*
Metadata
)
Reset
()
{
*
m
=
Metadata
{}
}
...
...
@@ -88,22 +90,23 @@ func init() {
}
var
fileDescriptor2
=
[]
byte
{
// 266 bytes of a gzipped FileDescriptorProto
0x1f
,
0x8b
,
0x08
,
0x00
,
0x00
,
0x09
,
0x6e
,
0x88
,
0x02
,
0xff
,
0x6c
,
0x90
,
0x4b
,
0x4b
,
0xc4
,
0x40
,
0x10
,
0x84
,
0xdd
,
0x47
,
0x1e
,
0xdb
,
0xb9
,
0x2c
,
0x8d
,
0x2c
,
0xa3
,
0xa7
,
0x90
,
0x93
,
0xa7
,
0x2c
,
0x28
,
0x88
,
0x67
,
0x41
,
0x3c
,
0xe8
,
0x66
,
0x65
,
0x51
,
0x04
,
0x6f
,
0x63
,
0xd2
,
0x98
,
0x41
,
0x93
,
0x09
,
0x33
,
0xa3
,
0xe2
,
0x3f
,
0xf1
,
0xe7
,
0x3a
,
0xe9
,
0x7d
,
0x1e
,
0x3c
,
0x04
,
0xaa
,
0xea
,
0x4b
,
0xd7
,
0xd0
,
0x0d
,
0x27
,
0xb5
,
0xec
,
0xd4
,
0xbc
,
0xac
,
0xa5
,
0x71
,
0xf3
,
0x86
,
0x9c
,
0xac
,
0xa4
,
0x93
,
0x79
,
0x67
,
0xb4
,
0xd3
,
0x08
,
0x3d
,
0xca
,
0x19
,
0x65
,
0x97
,
0x00
,
0x0b
,
0xa9
,
0x5a
,
0xe7
,
0x3f
,
0x32
,
0x88
,
0x30
,
0x6e
,
0x65
,
0x43
,
0x62
,
0x90
,
0x0e
,
0xce
,
0x26
,
0x2b
,
0xd6
,
0x78
,
0x0c
,
0x01
,
0x35
,
0x52
,
0x7d
,
0x88
,
0x21
,
0x87
,
0x6b
,
0x93
,
0xfd
,
0x0e
,
0x21
,
0x5e
,
0x6c
,
0x6a
,
0xff
,
0x1d
,
0xf3
,
0x59
,
0xad
,
0x7d
,
0xb6
,
0x9e
,
0x62
,
0x8d
,
0x02
,
0x22
,
0xab
,
0x3f
,
0x4d
,
0x49
,
0x56
,
0x8c
,
0xd2
,
0x91
,
0x8f
,
0xb7
,
0xb6
,
0x27
,
0x5f
,
0x64
,
0xac
,
0xd2
,
0xad
,
0x18
,
0xf3
,
0xc0
,
0xd6
,
0x62
,
0x0a
,
0x49
,
0x45
,
0xb6
,
0x34
,
0xaa
,
0x73
,
0x3d
,
0x0d
,
0x98
,
0x1e
,
0x46
,
0x78
,
0x0a
,
0xf1
,
0x3b
,
0xfd
,
0x7c
,
0x6b
,
0x53
,
0x59
,
0x11
,
0x72
,
0xed
,
0xce
,
0xe3
,
0x15
,
0x24
,
0xcd
,
0x6e
,
0x3d
,
0x2b
,
0x22
,
0x8f
,
0x93
,
0xf3
,
0x59
,
0xbe
,
0x3f
,
0x40
,
0xbe
,
0xdf
,
0x7e
,
0x75
,
0xf8
,
0x2b
,
0xce
,
0x20
,
0xa4
,
0xf6
,
0xcd
,
0x6b
,
0x11
,
0xf3
,
0x93
,
0x1b
,
0x97
,
0xa5
,
0x10
,
0xde
,
0xb0
,
0xc2
,
0x04
,
0xa2
,
0xa7
,
0xe2
,
0xae
,
0x58
,
0x3e
,
0x17
,
0xd3
,
0x23
,
0x9c
,
0x40
,
0x70
,
0xbb
,
0x7c
,
0x7c
,
0xb8
,
0x9f
,
0x0e
,
0xae
,
0xa3
,
0x97
,
0x80
,
0xab
,
0x5f
,
0x43
,
0x3e
,
0xf7
,
0xc5
,
0x5f
,
0x00
,
0x00
,
0x00
,
0xff
,
0xff
,
0xe5
,
0xf8
,
0x57
,
0xee
,
0x8b
,
0x01
,
0x00
,
0x00
,
// 275 bytes of a gzipped FileDescriptorProto
0x1f
,
0x8b
,
0x08
,
0x00
,
0x00
,
0x09
,
0x6e
,
0x88
,
0x02
,
0xff
,
0x6c
,
0x91
,
0x4b
,
0x4b
,
0xc4
,
0x30
,
0x14
,
0x85
,
0x9d
,
0x47
,
0x5f
,
0xb7
,
0x9b
,
0xe1
,
0x22
,
0x43
,
0x74
,
0x55
,
0xba
,
0x72
,
0xd5
,
0x01
,
0x05
,
0x71
,
0x2d
,
0x88
,
0x0b
,
0x9d
,
0x8e
,
0x0c
,
0x8a
,
0xe0
,
0x2e
,
0xb6
,
0xc1
,
0x06
,
0x6d
,
0x53
,
0x92
,
0xa8
,
0xf8
,
0x9f
,
0xfc
,
0x91
,
0x26
,
0xb7
,
0xf3
,
0x5a
,
0xb8
,
0x28
,
0x9c
,
0x73
,
0xbe
,
0xde
,
0xdc
,
0x9e
,
0x06
,
0x4e
,
0x1a
,
0xde
,
0xcb
,
0x45
,
0xd5
,
0x70
,
0x6d
,
0x17
,
0xad
,
0xb0
,
0xbc
,
0xe6
,
0x96
,
0x17
,
0xbd
,
0x56
,
0x56
,
0x21
,
0x78
,
0x54
,
0x10
,
0xca
,
0x2f
,
0x01
,
0x96
,
0x5c
,
0x76
,
0xd6
,
0x3d
,
0x42
,
0x23
,
0xc2
,
0xb4
,
0xe3
,
0xad
,
0x60
,
0xa3
,
0x6c
,
0x74
,
0x96
,
0xac
,
0x49
,
0xe3
,
0x31
,
0x04
,
0xa2
,
0xe5
,
0xf2
,
0x83
,
0x8d
,
0x29
,
0x1c
,
0x4c
,
0xfe
,
0x3b
,
0x86
,
0x78
,
0xb9
,
0x39
,
0xf6
,
0xdf
,
0x31
,
0x97
,
0x35
,
0xca
,
0x65
,
0xc3
,
0x14
,
0x69
,
0x64
,
0x10
,
0x19
,
0xf5
,
0xa9
,
0x2b
,
0x61
,
0xd8
,
0x24
,
0x9b
,
0xb8
,
0x78
,
0x6b
,
0x3d
,
0xf9
,
0x12
,
0xda
,
0x48
,
0xd5
,
0xb1
,
0x29
,
0x0d
,
0x6c
,
0x2d
,
0x66
,
0x90
,
0xd6
,
0xc2
,
0x54
,
0x5a
,
0xf6
,
0xd6
,
0xd3
,
0x80
,
0xe8
,
0x61
,
0x84
,
0xa7
,
0x10
,
0xbf
,
0x8b
,
0x9f
,
0x6f
,
0xa5
,
0x6b
,
0xc3
,
0x42
,
0x3a
,
0x76
,
0xe7
,
0xf1
,
0x0a
,
0xd2
,
0x76
,
0x57
,
0xcf
,
0xb0
,
0xc8
,
0xe1
,
0xf4
,
0x7c
,
0x5e
,
0xec
,
0x7f
,
0x40
,
0xb1
,
0x6f
,
0xbf
,
0x3e
,
0x7c
,
0x15
,
0xe7
,
0x10
,
0x8a
,
0xee
,
0xcd
,
0x69
,
0x16
,
0xd3
,
0xca
,
0x8d
,
0xf3
,
0xbd
,
0x64
,
0xe5
,
0x3e
,
0x24
,
0x19
,
0x7a
,
0x79
,
0x9d
,
0x67
,
0x10
,
0xde
,
0x0c
,
0x34
,
0x85
,
0xe8
,
0xa9
,
0xbc
,
0x2b
,
0x57
,
0xcf
,
0xe5
,
0xec
,
0x08
,
0x13
,
0x08
,
0x6e
,
0x57
,
0x8f
,
0x0f
,
0xf7
,
0xb3
,
0xd1
,
0x75
,
0xf4
,
0x12
,
0xd0
,
0xba
,
0xd7
,
0x90
,
0xae
,
0xe0
,
0xe2
,
0x2f
,
0x00
,
0x00
,
0xff
,
0xff
,
0x72
,
0xdf
,
0x74
,
0xb5
,
0x9f
,
0x01
,
0x00
,
0x00
,
}
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