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
bdd420a6
Unverified
Commit
bdd420a6
authored
6 years ago
by
Matthew Fisher
Committed by
GitHub
6 years ago
Browse files
Options
Download
Patches
Plain Diff
remove dirname constraint on `helm package` (#4141)
Signed-off-by:
Matthew Fisher
<
matt.fisher@microsoft.com
>
parent
273902a4
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
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
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
cmd/helm/package.go
+0
-4
cmd/helm/package.go
cmd/helm/package_test.go
+6
-0
cmd/helm/package_test.go
cmd/helm/testdata/testcharts/issue1979/Chart.yaml
+6
-0
cmd/helm/testdata/testcharts/issue1979/Chart.yaml
cmd/helm/testdata/testcharts/issue1979/README.md
+13
-0
cmd/helm/testdata/testcharts/issue1979/README.md
cmd/helm/testdata/testcharts/issue1979/extra_values.yaml
+2
-0
cmd/helm/testdata/testcharts/issue1979/extra_values.yaml
cmd/helm/testdata/testcharts/issue1979/more_values.yaml
+2
-0
cmd/helm/testdata/testcharts/issue1979/more_values.yaml
cmd/helm/testdata/testcharts/issue1979/templates/alpine-pod.yaml
+25
-0
...m/testdata/testcharts/issue1979/templates/alpine-pod.yaml
cmd/helm/testdata/testcharts/issue1979/values.yaml
+2
-0
cmd/helm/testdata/testcharts/issue1979/values.yaml
with
56 additions
and
4 deletions
+56
-4
cmd/helm/package.go
+
0
−
4
View file @
bdd420a6
...
...
@@ -157,10 +157,6 @@ func (o *packageOptions) run(out io.Writer) error {
debug
(
"Setting appVersion to %s"
,
o
.
appVersion
)
}
if
filepath
.
Base
(
path
)
!=
ch
.
Name
()
{
return
errors
.
Errorf
(
"directory name (%s) and Chart.yaml name (%s) must match"
,
filepath
.
Base
(
path
),
ch
.
Name
())
}
if
reqs
:=
ch
.
Metadata
.
Requirements
;
reqs
!=
nil
{
if
err
:=
checkDependencies
(
ch
,
reqs
);
err
!=
nil
{
return
err
...
...
This diff is collapsed.
Click to expand it.
cmd/helm/package_test.go
+
6
−
0
View file @
bdd420a6
...
...
@@ -98,6 +98,12 @@ func TestPackage(t *testing.T) {
expect
:
""
,
hasfile
:
"alpine-0.1.0.tgz"
,
},
{
name
:
"package testdata/testcharts/issue1979"
,
args
:
[]
string
{
"testdata/testcharts/issue1979"
},
expect
:
""
,
hasfile
:
"alpine-0.1.0.tgz"
,
},
{
name
:
"package --destination toot"
,
args
:
[]
string
{
"testdata/testcharts/alpine"
},
...
...
This diff is collapsed.
Click to expand it.
cmd/helm/testdata/testcharts/issue1979/Chart.yaml
0 → 100644
+
6
−
0
View file @
bdd420a6
description
:
Deploy a basic Alpine Linux pod
home
:
https://k8s.io/helm
name
:
alpine
sources
:
-
https://github.com/kubernetes/helm
version
:
0.1.0
This diff is collapsed.
Click to expand it.
cmd/helm/testdata/testcharts/issue1979/README.md
0 → 100644
+
13
−
0
View file @
bdd420a6
#Alpine: A simple Helm chart
Run a single pod of Alpine Linux.
This example was generated using the command
`helm create alpine`
.
The
`templates/`
directory contains a very simple pod resource with a
couple of parameters.
The
`values.yaml`
file contains the default values for the
`alpine-pod.yaml`
template.
You can install this example using
`helm install docs/examples/alpine`
.
This diff is collapsed.
Click to expand it.
cmd/helm/testdata/testcharts/issue1979/extra_values.yaml
0 → 100644
+
2
−
0
View file @
bdd420a6
test
:
Name
:
extra-values
This diff is collapsed.
Click to expand it.
cmd/helm/testdata/testcharts/issue1979/more_values.yaml
0 → 100644
+
2
−
0
View file @
bdd420a6
test
:
Name
:
more-values
This diff is collapsed.
Click to expand it.
cmd/helm/testdata/testcharts/issue1979/templates/alpine-pod.yaml
0 → 100644
+
25
−
0
View file @
bdd420a6
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
"
{{.Release.Name}}-{{.Values.Name}}"
labels
:
# The "heritage" label is used to track which tool deployed a given chart.
# It is useful for admins who want to see what releases a particular tool
# is responsible for.
heritage
:
{{
.Release.Service | quote
}}
# The "release" convention makes it easy to tie a release to all of the
# Kubernetes resources that were created as part of that release.
release
:
{{
.Release.Name | quote
}}
# This makes it easy to audit chart usage.
chart
:
"
{{.Chart.Name}}-{{.Chart.Version}}"
values
:
{{
.Values.test.Name
}}
spec
:
# This shows how to use a simple value. This will look for a passed-in value
# called restartPolicy. If it is not found, it will use the default value.
# {{default "Never" .restartPolicy}} is a slightly optimized version of the
# more conventional syntax: {{.restartPolicy | default "Never"}}
restartPolicy
:
{{
default "Never" .Values.restartPolicy
}}
containers
:
-
name
:
waiter
image
:
"
alpine:3.3"
command
:
[
"
/bin/sleep"
,
"
9000"
]
This diff is collapsed.
Click to expand it.
cmd/helm/testdata/testcharts/issue1979/values.yaml
0 → 100644
+
2
−
0
View file @
bdd420a6
# The pod name
Name
:
my-alpine
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