mirror of https://github.com/kubernetes/kops.git
Merge pull request #13733 from kubernetes/dependabot/go_modules/helm.sh/helm/v3-3.9.0
Bump helm.sh/helm/v3 from 3.8.2 to 3.9.0
This commit is contained in:
commit
ee557e5be1
4
go.mod
4
go.mod
|
|
@ -84,7 +84,7 @@ require (
|
|||
gopkg.in/gcfg.v1 v1.2.3
|
||||
gopkg.in/inf.v0 v0.9.1
|
||||
gopkg.in/square/go-jose.v2 v2.6.0
|
||||
helm.sh/helm/v3 v3.8.2
|
||||
helm.sh/helm/v3 v3.9.0
|
||||
k8s.io/api v0.24.0
|
||||
k8s.io/apimachinery v0.24.0
|
||||
k8s.io/cli-runtime v0.24.0
|
||||
|
|
@ -124,7 +124,7 @@ require (
|
|||
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
||||
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
|
||||
github.com/containerd/containerd v1.6.1 // indirect
|
||||
github.com/containerd/containerd v1.6.3 // indirect
|
||||
github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ var (
|
|||
Package = "github.com/containerd/containerd"
|
||||
|
||||
// Version holds the complete version number. Filled in at linking time.
|
||||
Version = "1.6.1+unknown"
|
||||
Version = "1.6.3+unknown"
|
||||
|
||||
// Revision is filled with the VCS (e.g. git) revision being used to build
|
||||
// the program at linking time.
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ func symwalk(path string, info os.FileInfo, walkFn filepath.WalkFunc) error {
|
|||
if err != nil {
|
||||
return errors.Wrapf(err, "error evaluating symlink %s", path)
|
||||
}
|
||||
log.Printf("found symbolic link in path: %s resolves to %s", path, resolved)
|
||||
log.Printf("found symbolic link in path: %s resolves to %s. Contents of linked file included and used", path, resolved)
|
||||
if info, err = os.Lstat(resolved); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ var (
|
|||
//
|
||||
// Increment major number for new feature additions and behavioral changes.
|
||||
// Increment minor number for bug fixes and performance enhancements.
|
||||
version = "v3.8"
|
||||
version = "v3.9"
|
||||
|
||||
// metadata is extra build time data
|
||||
metadata = ""
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
// limitations under the License.
|
||||
|
||||
//go:build darwin
|
||||
// +build darwin
|
||||
|
||||
package helmpath
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
// limitations under the License.
|
||||
|
||||
//go:build !windows && !darwin
|
||||
// +build !windows,!darwin
|
||||
|
||||
package helmpath
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
// +build windows
|
||||
//go:build windows
|
||||
|
||||
package helmpath
|
||||
|
||||
|
|
|
|||
|
|
@ -303,9 +303,8 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
|
|||
|
||||
numDescriptors := len(descriptors)
|
||||
if numDescriptors < minNumDescriptors {
|
||||
return nil, errors.New(
|
||||
fmt.Sprintf("manifest does not contain minimum number of descriptors (%d), descriptors found: %d",
|
||||
minNumDescriptors, numDescriptors))
|
||||
return nil, fmt.Errorf("manifest does not contain minimum number of descriptors (%d), descriptors found: %d",
|
||||
minNumDescriptors, numDescriptors)
|
||||
}
|
||||
var configDescriptor *ocispec.Descriptor
|
||||
var chartDescriptor *ocispec.Descriptor
|
||||
|
|
@ -325,22 +324,19 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
|
|||
}
|
||||
}
|
||||
if configDescriptor == nil {
|
||||
return nil, errors.New(
|
||||
fmt.Sprintf("could not load config with mediatype %s", ConfigMediaType))
|
||||
return nil, fmt.Errorf("could not load config with mediatype %s", ConfigMediaType)
|
||||
}
|
||||
if operation.withChart && chartDescriptor == nil {
|
||||
return nil, errors.New(
|
||||
fmt.Sprintf("manifest does not contain a layer with mediatype %s",
|
||||
ChartLayerMediaType))
|
||||
return nil, fmt.Errorf("manifest does not contain a layer with mediatype %s",
|
||||
ChartLayerMediaType)
|
||||
}
|
||||
var provMissing bool
|
||||
if operation.withProv && provDescriptor == nil {
|
||||
if operation.ignoreMissingProv {
|
||||
provMissing = true
|
||||
} else {
|
||||
return nil, errors.New(
|
||||
fmt.Sprintf("manifest does not contain a layer with mediatype %s",
|
||||
ProvLayerMediaType))
|
||||
return nil, fmt.Errorf("manifest does not contain a layer with mediatype %s",
|
||||
ProvLayerMediaType)
|
||||
}
|
||||
}
|
||||
result := &PullResult{
|
||||
|
|
|
|||
|
|
@ -204,8 +204,8 @@ github.com/chai2010/gettext-go/gettext
|
|||
github.com/chai2010/gettext-go/gettext/mo
|
||||
github.com/chai2010/gettext-go/gettext/plural
|
||||
github.com/chai2010/gettext-go/gettext/po
|
||||
# github.com/containerd/containerd v1.6.1
|
||||
## explicit; go 1.16
|
||||
# github.com/containerd/containerd v1.6.3
|
||||
## explicit; go 1.17
|
||||
github.com/containerd/containerd/archive/compression
|
||||
github.com/containerd/containerd/content
|
||||
github.com/containerd/containerd/content/local
|
||||
|
|
@ -1143,8 +1143,8 @@ gopkg.in/yaml.v2
|
|||
# gopkg.in/yaml.v3 v3.0.0
|
||||
## explicit
|
||||
gopkg.in/yaml.v3
|
||||
# helm.sh/helm/v3 v3.8.2
|
||||
## explicit; go 1.16
|
||||
# helm.sh/helm/v3 v3.9.0
|
||||
## explicit; go 1.17
|
||||
helm.sh/helm/v3/internal/ignore
|
||||
helm.sh/helm/v3/internal/sympath
|
||||
helm.sh/helm/v3/internal/tlsutil
|
||||
|
|
|
|||
Loading…
Reference in New Issue