Skip to content

Commit e378dab

Browse files
dependabot[bot]dependabot[bot]
authored
⬆️ Bump helm.sh/helm/v3 from 3.14.0 to 3.14.3 (#848)
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.0 to 3.14.3. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.14.0...v3.14.3) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 06ec42b commit e378dab

File tree

12 files changed

+90
-13
lines changed

12 files changed

+90
-13
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
go.uber.org/mock v0.5.0
2626
go.uber.org/zap v1.27.0
2727
google.golang.org/api v0.126.0
28-
helm.sh/helm/v3 v3.14.0
28+
helm.sh/helm/v3 v3.14.3
2929
k8s.io/api v0.29.2
3030
k8s.io/apimachinery v0.29.2
3131
k8s.io/client-go v0.29.2
@@ -52,7 +52,7 @@ require (
5252
github.com/beorn7/perks v1.0.1 // indirect
5353
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5454
github.com/chai2010/gettext-go v1.0.2 // indirect
55-
github.com/containerd/containerd v1.7.11 // indirect
55+
github.com/containerd/containerd v1.7.12 // indirect
5656
github.com/containerd/log v0.1.0 // indirect
5757
github.com/coreos/go-semver v0.3.1 // indirect
5858
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83
2727
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
2828
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
2929
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
30-
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
31-
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
30+
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
31+
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
3232
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
3333
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
3434
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -91,8 +91,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr
9191
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
9292
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
9393
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
94-
github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw=
95-
github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE=
94+
github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0=
95+
github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk=
9696
github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
9797
github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
9898
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
@@ -706,8 +706,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
706706
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
707707
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
708708
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
709-
helm.sh/helm/v3 v3.14.0 h1:TaZIH6uOchn7L27ptwnnuHJiFrT/BsD4dFdp/HLT2nM=
710-
helm.sh/helm/v3 v3.14.0/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424=
709+
helm.sh/helm/v3 v3.14.3 h1:HmvRJlwyyt9HjgmAuxHbHv3PhMz9ir/XNWHyXfmnOP4=
710+
helm.sh/helm/v3 v3.14.3/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
711711
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
712712
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
713713
k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=

‎vendor/github.com/containerd/containerd/archive/compression/compression.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/content/helpers.go

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/version/version.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/helm.sh/helm/v3/pkg/chart/metadata.go

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616
package chart
1717

1818
import (
19+
"path/filepath"
1920
"strings"
2021
"unicode"
2122

@@ -110,6 +111,11 @@ func (md *Metadata) Validate() error {
110111
if md.Name == "" {
111112
return ValidationError("chart.metadata.name is required")
112113
}
114+
115+
if md.Name != filepath.Base(md.Name) {
116+
return ValidationErrorf("chart.metadata.name %q is invalid", md.Name)
117+
}
118+
113119
if md.Version == "" {
114120
return ValidationError("chart.metadata.version is required")
115121
}

‎vendor/helm.sh/helm/v3/pkg/chartutil/errors.go

+8
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,11 @@ type ErrNoValue struct {
3333
}
3434

3535
func (e ErrNoValue) Error() string { return fmt.Sprintf("%q is not a value", e.Key) }
36+
37+
type ErrInvalidChartName struct {
38+
Name string
39+
}
40+
41+
func (e ErrInvalidChartName) Error() string {
42+
return fmt.Sprintf("%q is not a valid chart name", e.Name)
43+
}

‎vendor/helm.sh/helm/v3/pkg/chartutil/save.go

+20
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=")
3939
// directory, writing the chart's contents to that subdirectory.
4040
func SaveDir(c *chart.Chart, dest string) error {
4141
// Create the chart directory
42+
err := validateName(c.Name())
43+
if err != nil {
44+
return err
45+
}
4246
outdir := filepath.Join(dest, c.Name())
4347
if fi, err := os.Stat(outdir); err == nil && !fi.IsDir() {
4448
return errors.Errorf("file %s already exists and is not a directory", outdir)
@@ -149,6 +153,10 @@ func Save(c *chart.Chart, outDir string) (string, error) {
149153
}
150154

151155
func writeTarContents(out *tar.Writer, c *chart.Chart, prefix string) error {
156+
err := validateName(c.Name())
157+
if err != nil {
158+
return err
159+
}
152160
base := filepath.Join(prefix, c.Name())
153161

154162
// Pull out the dependencies of a v1 Chart, since there's no way
@@ -242,3 +250,15 @@ func writeToTar(out *tar.Writer, name string, body []byte) error {
242250
_, err := out.Write(body)
243251
return err
244252
}
253+
254+
// If the name has directory name has characters which would change the location
255+
// they need to be removed.
256+
func validateName(name string) error {
257+
nname := filepath.Base(name)
258+
259+
if nname != name {
260+
return ErrInvalidChartName{name}
261+
}
262+
263+
return nil
264+
}

‎vendor/helm.sh/helm/v3/pkg/lint/rules/chartfile.go

+4
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ func validateChartName(cf *chart.Metadata) error {
106106
if cf.Name == "" {
107107
return errors.New("name is required")
108108
}
109+
name := filepath.Base(cf.Name)
110+
if name != cf.Name {
111+
return fmt.Errorf("chart name %q is invalid", cf.Name)
112+
}
109113
return nil
110114
}
111115

‎vendor/helm.sh/helm/v3/pkg/plugin/plugin.go

+4
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ var validPluginName = regexp.MustCompile("^[A-Za-z0-9_-]+$")
175175

176176
// validatePluginData validates a plugin's YAML data.
177177
func validatePluginData(plug *Plugin, filepath string) error {
178+
// When metadata section missing, initialize with no data
179+
if plug.Metadata == nil {
180+
plug.Metadata = &Metadata{}
181+
}
178182
if !validPluginName.MatchString(plug.Metadata.Name) {
179183
return fmt.Errorf("invalid plugin name at %q", filepath)
180184
}

‎vendor/helm.sh/helm/v3/pkg/repo/index.go

+25-1
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,14 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {
359359
log.Printf("skipping loading invalid entry for chart %q from %s: empty entry", name, source)
360360
continue
361361
}
362+
// When metadata section missing, initialize with no data
363+
if cvs[idx].Metadata == nil {
364+
cvs[idx].Metadata = &chart.Metadata{}
365+
}
362366
if cvs[idx].APIVersion == "" {
363367
cvs[idx].APIVersion = chart.APIVersionV1
364368
}
365-
if err := cvs[idx].Validate(); err != nil {
369+
if err := cvs[idx].Validate(); ignoreSkippableChartValidationError(err) != nil {
366370
log.Printf("skipping loading invalid entry for chart %q %q from %s: %s", name, cvs[idx].Version, source, err)
367371
cvs = append(cvs[:idx], cvs[idx+1:]...)
368372
}
@@ -388,3 +392,23 @@ func jsonOrYamlUnmarshal(b []byte, i interface{}) error {
388392
}
389393
return yaml.UnmarshalStrict(b, i)
390394
}
395+
396+
// ignoreSkippableChartValidationError inspect the given error and returns nil if
397+
// the error isn't important for index loading
398+
//
399+
// In particular, charts may introduce validations that don't impact repository indexes
400+
// And repository indexes may be generated by older/non-complient software, which doesn't
401+
// conform to all validations.
402+
func ignoreSkippableChartValidationError(err error) error {
403+
verr, ok := err.(chart.ValidationError)
404+
if !ok {
405+
return err
406+
}
407+
408+
// https://github.com/helm/helm/issues/12748 (JFrog repository strips alias field)
409+
if strings.HasPrefix(verr.Error(), "validation: more than one dependency with name or alias") {
410+
return nil
411+
}
412+
413+
return err
414+
}

‎vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ github.com/chai2010/gettext-go
161161
github.com/chai2010/gettext-go/mo
162162
github.com/chai2010/gettext-go/plural
163163
github.com/chai2010/gettext-go/po
164-
# github.com/containerd/containerd v1.7.11
164+
# github.com/containerd/containerd v1.7.12
165165
## explicit; go 1.19
166166
github.com/containerd/containerd/archive/compression
167167
github.com/containerd/containerd/content
@@ -1077,7 +1077,7 @@ gopkg.in/yaml.v2
10771077
# gopkg.in/yaml.v3 v3.0.1
10781078
## explicit
10791079
gopkg.in/yaml.v3
1080-
# helm.sh/helm/v3 v3.14.0
1080+
# helm.sh/helm/v3 v3.14.3
10811081
## explicit; go 1.21
10821082
helm.sh/helm/v3/internal/fileutil
10831083
helm.sh/helm/v3/internal/resolver

0 commit comments

Comments
 (0)