diff --git a/go.mod b/go.mod index 6b6171423..225d9e191 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( github.com/mattn/go-shellwords v1.0.11 github.com/mitchellh/copystructure v1.1.1 github.com/opencontainers/image-spec v1.0.1 - github.com/oras-project/oras-go v0.3.0 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/errors v0.9.1 github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 @@ -42,6 +41,7 @@ require ( k8s.io/client-go v0.21.0 k8s.io/klog/v2 v2.8.0 k8s.io/kubectl v0.21.0 + oras.land/oras-go v0.4.0 sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 271f58a8c..1dccef283 100644 --- a/go.sum +++ b/go.sum @@ -757,8 +757,6 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/oras-project/oras-go v0.3.0 h1:NCcXeTPPlf2Ys2Pdpdu82lpaWSg3EdXxeZQgLfvgpBw= -github.com/oras-project/oras-go v0.3.0/go.mod h1:iGamc9+xWzQodKeX5l7FF0VgmmJ8aTRS2kJA6CedmjU= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -1398,6 +1396,8 @@ k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/metrics v0.21.0/go.mod h1:L3Ji9EGPP1YBbfm9sPfEXSpnj8i24bfQbAFAsW0NueQ= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +oras.land/oras-go v0.4.0 h1:u6+7D+raZDYHwlz/uOwNANiRmyYDSSMW7A9E1xXycUQ= +oras.land/oras-go v0.4.0/go.mod h1:VJcU+VE4rkclUbum5C0O7deEZbBYnsnpbGSACwTjOcg= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/internal/experimental/registry/registry_client.go b/internal/experimental/registry/registry_client.go index e787d5652..919641ce7 100644 --- a/internal/experimental/registry/registry_client.go +++ b/internal/experimental/registry/registry_client.go @@ -23,8 +23,8 @@ import ( "net/http" "github.com/containerd/containerd/remotes" - "github.com/oras-project/oras-go/pkg/auth" - dockerauth "github.com/oras-project/oras-go/pkg/auth/docker" + "oras.land/oras-go/pkg/auth" + dockerauth "oras.land/oras-go/pkg/auth/docker" "helm.sh/helm/v3/internal/version" "helm.sh/helm/v3/pkg/helmpath" diff --git a/internal/experimental/registry/registry_op_login.go b/internal/experimental/registry/registry_op_login.go index 8d2aa183a..8563a1523 100644 --- a/internal/experimental/registry/registry_op_login.go +++ b/internal/experimental/registry/registry_op_login.go @@ -19,7 +19,7 @@ package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "fmt" - "github.com/oras-project/oras-go/pkg/auth" + "oras.land/oras-go/pkg/auth" ) // Login logs into a registry diff --git a/internal/experimental/registry/registry_op_pull.go b/internal/experimental/registry/registry_op_pull.go index f1f9d9254..3966ad4e0 100644 --- a/internal/experimental/registry/registry_op_pull.go +++ b/internal/experimental/registry/registry_op_pull.go @@ -21,9 +21,9 @@ import ( "fmt" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/oras-project/oras-go/pkg/content" - "github.com/oras-project/oras-go/pkg/oras" "github.com/pkg/errors" + "oras.land/oras-go/pkg/content" + "oras.land/oras-go/pkg/oras" "helm.sh/helm/v3/pkg/chart" ) diff --git a/internal/experimental/registry/registry_op_push.go b/internal/experimental/registry/registry_op_push.go index fcf999b13..36e7a1962 100644 --- a/internal/experimental/registry/registry_op_push.go +++ b/internal/experimental/registry/registry_op_push.go @@ -23,8 +23,8 @@ import ( "strings" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/oras-project/oras-go/pkg/content" - "github.com/oras-project/oras-go/pkg/oras" + "oras.land/oras-go/pkg/content" + "oras.land/oras-go/pkg/oras" ) // Push uploads a chart to a registry. diff --git a/internal/experimental/registry/registry_util.go b/internal/experimental/registry/registry_util.go index dd8cf79a4..21bc1d344 100644 --- a/internal/experimental/registry/registry_util.go +++ b/internal/experimental/registry/registry_util.go @@ -21,8 +21,8 @@ import ( "context" "io" - orascontext "github.com/oras-project/oras-go/pkg/context" "github.com/sirupsen/logrus" + orascontext "oras.land/oras-go/pkg/context" "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader"