mirror of
https://github.com/goharbor/harbor.git
synced 2025-02-16 20:01:35 +01:00
bump up helm/v3/pkg to v3.10.3 on main (#18050)
Signed-off-by: yminer <yminer@vmware.com> Signed-off-by: yminer <yminer@vmware.com>
This commit is contained in:
parent
452ae168cc
commit
ba5baca769
@ -70,7 +70,7 @@ require (
|
|||||||
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
|
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
|
||||||
gopkg.in/h2non/gock.v1 v1.0.16
|
gopkg.in/h2non/gock.v1 v1.0.16
|
||||||
gopkg.in/yaml.v2 v2.4.0
|
gopkg.in/yaml.v2 v2.4.0
|
||||||
helm.sh/helm/v3 v3.10.1
|
helm.sh/helm/v3 v3.10.3
|
||||||
k8s.io/api v0.25.2
|
k8s.io/api v0.25.2
|
||||||
k8s.io/apimachinery v0.25.2
|
k8s.io/apimachinery v0.25.2
|
||||||
k8s.io/client-go v0.25.2
|
k8s.io/client-go v0.25.2
|
||||||
|
@ -1966,8 +1966,8 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
|
|||||||
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
|
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
|
||||||
gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
|
gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
|
||||||
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
|
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
|
||||||
helm.sh/helm/v3 v3.10.1 h1:uTnNlYx8QcTSNA4ZJ50Llwife4CSohUY4ehumyVf2QE=
|
helm.sh/helm/v3 v3.10.3 h1:wL7IUZ7Zyukm5Kz0OUmIFZgKHuAgByCrUcJBtY0kDyw=
|
||||||
helm.sh/helm/v3 v3.10.1/go.mod h1:CXOcs02AYvrlPMWARNYNRgf2rNP7gLJQsi/Ubd4EDrI=
|
helm.sh/helm/v3 v3.10.3/go.mod h1:CXOcs02AYvrlPMWARNYNRgf2rNP7gLJQsi/Ubd4EDrI=
|
||||||
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
|
@ -312,7 +312,7 @@ spec:
|
|||||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: 80
|
containerPort: {{ .Values.service.port }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
|
@ -55,7 +55,13 @@ func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) err
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ValidateAgainstSingleSchema checks that values does not violate the structure laid out in this schema
|
// ValidateAgainstSingleSchema checks that values does not violate the structure laid out in this schema
|
||||||
func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) error {
|
func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error) {
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
reterr = fmt.Errorf("unable to validate schema: %s", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
valuesData, err := yaml.Marshal(values)
|
valuesData, err := yaml.Marshal(values)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
8
src/vendor/helm.sh/helm/v3/pkg/repo/index.go
vendored
8
src/vendor/helm.sh/helm/v3/pkg/repo/index.go
vendored
@ -118,6 +118,10 @@ func LoadIndexFile(path string) (*IndexFile, error) {
|
|||||||
// MustAdd adds a file to the index
|
// MustAdd adds a file to the index
|
||||||
// This can leave the index in an unsorted state
|
// This can leave the index in an unsorted state
|
||||||
func (i IndexFile) MustAdd(md *chart.Metadata, filename, baseURL, digest string) error {
|
func (i IndexFile) MustAdd(md *chart.Metadata, filename, baseURL, digest string) error {
|
||||||
|
if i.Entries == nil {
|
||||||
|
return errors.New("entries not initialized")
|
||||||
|
}
|
||||||
|
|
||||||
if md.APIVersion == "" {
|
if md.APIVersion == "" {
|
||||||
md.APIVersion = chart.APIVersionV1
|
md.APIVersion = chart.APIVersionV1
|
||||||
}
|
}
|
||||||
@ -339,6 +343,10 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {
|
|||||||
|
|
||||||
for name, cvs := range i.Entries {
|
for name, cvs := range i.Entries {
|
||||||
for idx := len(cvs) - 1; idx >= 0; idx-- {
|
for idx := len(cvs) - 1; idx >= 0; idx-- {
|
||||||
|
if cvs[idx] == nil {
|
||||||
|
log.Printf("skipping loading invalid entry for chart %q from %s: empty entry", name, source)
|
||||||
|
continue
|
||||||
|
}
|
||||||
if cvs[idx].APIVersion == "" {
|
if cvs[idx].APIVersion == "" {
|
||||||
cvs[idx].APIVersion = chart.APIVersionV1
|
cvs[idx].APIVersion = chart.APIVersionV1
|
||||||
}
|
}
|
||||||
|
3
src/vendor/helm.sh/helm/v3/pkg/repo/repo.go
vendored
3
src/vendor/helm.sh/helm/v3/pkg/repo/repo.go
vendored
@ -100,6 +100,9 @@ func (r *File) Remove(name string) bool {
|
|||||||
cp := []*Entry{}
|
cp := []*Entry{}
|
||||||
found := false
|
found := false
|
||||||
for _, rf := range r.Repositories {
|
for _, rf := range r.Repositories {
|
||||||
|
if rf == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if rf.Name == name {
|
if rf.Name == name {
|
||||||
found = true
|
found = true
|
||||||
continue
|
continue
|
||||||
|
2
src/vendor/modules.txt
vendored
2
src/vendor/modules.txt
vendored
@ -1056,7 +1056,7 @@ gopkg.in/yaml.v2
|
|||||||
# gopkg.in/yaml.v3 v3.0.1
|
# gopkg.in/yaml.v3 v3.0.1
|
||||||
## explicit
|
## explicit
|
||||||
gopkg.in/yaml.v3
|
gopkg.in/yaml.v3
|
||||||
# helm.sh/helm/v3 v3.10.1
|
# helm.sh/helm/v3 v3.10.3
|
||||||
## explicit; go 1.18
|
## explicit; go 1.18
|
||||||
helm.sh/helm/v3/cmd/helm/search
|
helm.sh/helm/v3/cmd/helm/search
|
||||||
helm.sh/helm/v3/internal/fileutil
|
helm.sh/helm/v3/internal/fileutil
|
||||||
|
Loading…
Reference in New Issue
Block a user