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
a3cd0ec2
Commit
a3cd0ec2
authored
9 years ago
by
jackgr
Browse files
Options
Download
Patches
Plain Diff
Fix chart directory relative path bug
parent
7d6b8254
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
1.999.0
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
v2.0.0-alpha.3
v2.0.0-alpha.2
v2.0.0-alpha.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
examples/charts/replicatedservice-3.tgz
+0
-0
examples/charts/replicatedservice-3.tgz
pkg/chart/chart.go
+17
-5
pkg/chart/chart.go
pkg/chart/chart_test.go
+5
-4
pkg/chart/chart_test.go
with
22 additions
and
9 deletions
+22
-9
examples/charts/replicatedservice-3.tgz
deleted
100644 → 0
+
0
−
0
View file @
7d6b8254
File deleted
This diff is collapsed.
Click to expand it.
pkg/chart/chart.go
+
17
−
5
View file @
a3cd0ec2
...
...
@@ -220,20 +220,25 @@ func fname(name string) string {
// If you are just reading the Chart.yaml file, it is substantially more
// performant to use LoadChartfile.
func
LoadDir
(
chart
string
)
(
*
Chart
,
error
)
{
if
fi
,
err
:=
os
.
Stat
(
chart
);
err
!=
nil
{
dir
,
err
:=
filepath
.
Abs
(
chart
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"%s is not a valid path"
,
chart
)
}
if
fi
,
err
:=
os
.
Stat
(
dir
);
err
!=
nil
{
return
nil
,
err
}
else
if
!
fi
.
IsDir
()
{
return
nil
,
fmt
.
Errorf
(
"
Chart
%s is not a directory
.
"
,
chart
)
return
nil
,
fmt
.
Errorf
(
"%s is not a directory"
,
chart
)
}
cf
,
err
:=
LoadChartfile
(
filepath
.
Join
(
chart
,
"Chart.yaml"
))
cf
,
err
:=
LoadChartfile
(
filepath
.
Join
(
dir
,
"Chart.yaml"
))
if
err
!=
nil
{
return
nil
,
err
}
cl
:=
&
dirChart
{
chartyaml
:
cf
,
chartdir
:
chart
,
chartdir
:
dir
,
}
return
&
Chart
{
...
...
@@ -293,9 +298,16 @@ func loadTar(r *tar.Reader) (*tarChart, error) {
if
err
!=
nil
{
return
nil
,
err
}
// ioutil.TempDir uses Getenv("TMPDIR"), so there are no guarantees
dir
,
err
:=
filepath
.
Abs
(
td
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"%s is not a valid path"
,
td
)
}
c
:=
&
tarChart
{
chartyaml
:
&
Chartfile
{},
tmpDir
:
t
d
,
tmpDir
:
d
ir
,
}
firstDir
:=
""
...
...
This diff is collapsed.
Click to expand it.
pkg/chart/chart_test.go
+
5
−
4
View file @
a3cd0ec2
...
...
@@ -141,18 +141,19 @@ func TestChart(t *testing.T) {
t
.
Errorf
(
"Unexpected chart file name: %s"
,
c
.
Chartfile
()
.
Name
)
}
dir
:=
c
.
Dir
()
d
:=
c
.
DocsDir
()
if
d
!=
filepath
.
Join
(
test
dir
,
preDocs
)
{
if
d
!=
filepath
.
Join
(
dir
,
preDocs
)
{
t
.
Errorf
(
"Unexpectedly, docs are in %s"
,
d
)
}
d
=
c
.
TemplatesDir
()
if
d
!=
filepath
.
Join
(
test
dir
,
preTemplates
)
{
if
d
!=
filepath
.
Join
(
dir
,
preTemplates
)
{
t
.
Errorf
(
"Unexpectedly, templates are in %s"
,
d
)
}
d
=
c
.
HooksDir
()
if
d
!=
filepath
.
Join
(
test
dir
,
preHooks
)
{
if
d
!=
filepath
.
Join
(
dir
,
preHooks
)
{
t
.
Errorf
(
"Unexpectedly, hooks are in %s"
,
d
)
}
...
...
@@ -160,7 +161,7 @@ func TestChart(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"No icon found in test chart: %s"
,
err
)
}
if
i
!=
filepath
.
Join
(
test
dir
,
preIcon
)
{
if
i
!=
filepath
.
Join
(
dir
,
preIcon
)
{
t
.
Errorf
(
"Unexpectedly, icon is in %s"
,
i
)
}
}
...
...
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