diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index a43d425624..d6837c0620 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -125,8 +125,8 @@ projects: repos: - name: helm versions: - - tag: v3.12.1 - go_version: "1.20" + - tag: v3.14.0 + go_version: "1.21" - org: kube-vip repos: - name: kube-vip diff --git a/projects/helm/helm/ATTRIBUTION.txt b/projects/helm/helm/ATTRIBUTION.txt index e21bb9201b..a7aa4c7b15 100644 --- a/projects/helm/helm/ATTRIBUTION.txt +++ b/projects/helm/helm/ATTRIBUTION.txt @@ -1,14 +1,17 @@ -** github.com/containerd/containerd; version v1.7.0 -- +** github.com/containerd/containerd; version v1.7.11 -- https://github.com/containerd/containerd -** github.com/docker/cli/cli/config; version v20.10.21+incompatible -- +** github.com/containerd/log; version v0.1.0 -- +https://github.com/containerd/log + +** github.com/docker/cli/cli/config; version v24.0.6+incompatible -- https://github.com/docker/cli ** github.com/docker/distribution; version v2.8.2+incompatible -- https://github.com/distribution/distribution -** github.com/docker/docker; version v20.10.24+incompatible -- +** github.com/docker/docker; version v24.0.7+incompatible -- https://github.com/moby/moby ** github.com/docker/go-connections; version v0.4.0 -- @@ -20,7 +23,7 @@ https://github.com/docker/go-metrics ** github.com/docker/go-units; version v0.5.0 -- https://github.com/docker/go-units -** github.com/go-logr/logr; version v1.2.3 -- +** github.com/go-logr/logr; version v1.3.0 -- https://github.com/go-logr/logr ** github.com/go-logr/stdr; version v1.2.2 -- @@ -29,7 +32,7 @@ https://github.com/go-logr/stdr ** github.com/go-openapi/jsonpointer; version v0.19.6 -- https://github.com/go-openapi/jsonpointer -** github.com/go-openapi/jsonreference; version v0.20.1 -- +** github.com/go-openapi/jsonreference; version v0.20.2 -- https://github.com/go-openapi/jsonreference ** github.com/go-openapi/swag; version v0.22.3 -- @@ -38,8 +41,8 @@ https://github.com/go-openapi/swag ** github.com/google/btree; version v1.0.1 -- https://github.com/google/btree -** github.com/google/gnostic; version v0.5.7-v3refs -- -https://github.com/google/gnostic +** github.com/google/gnostic-models; version v0.6.8 -- +https://github.com/google/gnostic-models ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz @@ -62,7 +65,7 @@ https://github.com/moby/locker ** github.com/moby/spdystream; version v0.2.0 -- https://github.com/moby/spdystream -** github.com/moby/term; version v0.0.0-20221205130635-1aeaba878587 -- +** github.com/moby/term; version v0.5.0 -- https://github.com/moby/term ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd -- @@ -74,22 +77,22 @@ https://github.com/modern-go/reflect2 ** github.com/opencontainers/go-digest; version v1.0.0 -- https://github.com/opencontainers/go-digest -** github.com/opencontainers/image-spec/specs-go; version v1.1.0-rc2.0.20221005185240-3a7f492d3f1b -- +** github.com/opencontainers/image-spec/specs-go; version v1.1.0-rc5 -- https://github.com/opencontainers/image-spec -** github.com/prometheus/client_golang/prometheus; version v1.14.0 -- +** github.com/prometheus/client_golang/prometheus; version v1.16.0 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.3.0 -- +** github.com/prometheus/client_model/go; version v0.4.0 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.37.0 -- +** github.com/prometheus/common; version v0.44.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.8.0 -- +** github.com/prometheus/procfs; version v0.10.1 -- https://github.com/prometheus/procfs -** github.com/spf13/cobra; version v1.6.1 -- +** github.com/spf13/cobra; version v1.8.0 -- https://github.com/spf13/cobra ** github.com/xeipuuv/gojsonpointer; version v0.0.0-20190905194746-02993c407bfb -- @@ -101,73 +104,79 @@ https://github.com/xeipuuv/gojsonreference ** github.com/xeipuuv/gojsonschema; version v1.2.0 -- https://github.com/xeipuuv/gojsonschema -** go.opentelemetry.io/otel; version v1.14.0 -- +** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.45.0 -- +https://github.com/open-telemetry/opentelemetry-go-contrib + +** go.opentelemetry.io/otel; version v1.19.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/otel/metric; version v1.19.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.14.0 -- +** go.opentelemetry.io/otel/trace; version v1.19.0 -- https://github.com/open-telemetry/opentelemetry-go -** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20230306155012-7f2fa6fef1f4 -- +** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20230822172742-b8732ec3820d -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.53.0 -- +** google.golang.org/grpc; version v1.58.3 -- https://github.com/grpc/grpc-go ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** helm.sh/helm/v3; version v3.12.1 -- +** helm.sh/helm/v3; version v3.14.0 -- https://github.com/helm/helm -** k8s.io/api; version v0.27.2 -- +** k8s.io/api; version v0.29.0 -- https://github.com/kubernetes/api -** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.27.2 -- +** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.29.0 -- https://github.com/kubernetes/apiextensions-apiserver -** k8s.io/apimachinery/pkg; version v0.27.2 -- +** k8s.io/apimachinery/pkg; version v0.29.0 -- https://github.com/kubernetes/apimachinery -** k8s.io/apiserver/pkg/endpoints/deprecation; version v0.27.2 -- +** k8s.io/apiserver/pkg/endpoints/deprecation; version v0.29.0 -- https://github.com/kubernetes/apiserver -** k8s.io/cli-runtime/pkg; version v0.27.2 -- +** k8s.io/cli-runtime/pkg; version v0.29.0 -- https://github.com/kubernetes/cli-runtime -** k8s.io/client-go; version v0.27.2 -- +** k8s.io/client-go; version v0.29.0 -- https://github.com/kubernetes/client-go -** k8s.io/component-base/version; version v0.27.2 -- +** k8s.io/component-base/version; version v0.29.0 -- https://github.com/kubernetes/component-base -** k8s.io/klog/v2; version v2.90.1 -- +** k8s.io/klog/v2; version v2.110.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20230501164219-8b0f38b5fd1f -- +** k8s.io/kube-openapi/pkg; version v0.0.0-20231010175941-2dd684a91f00 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20230501164219-8b0f38b5fd1f -- +** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20231010175941-2dd684a91f00 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kubectl/pkg; version v0.27.2 -- +** k8s.io/kubectl/pkg; version v0.29.0 -- https://github.com/kubernetes/kubectl -** k8s.io/utils; version v0.0.0-20230220204549-a5ecb0141aa5 -- +** k8s.io/utils; version v0.0.0-20230726121419-3b25d923346b -- https://github.com/kubernetes/utils -** oras.land/oras-go/pkg; version v1.2.2 -- +** oras.land/oras-go/pkg; version v1.2.4 -- https://github.com/oras-project/oras-go ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- https://github.com/kubernetes-sigs/json -** sigs.k8s.io/kustomize/api; version v0.13.2 -- +** sigs.k8s.io/kustomize/api; version v0.13.5-0.20230601165947-6ce0bf390ce3 -- https://github.com/kubernetes-sigs/kustomize -** sigs.k8s.io/kustomize/kyaml; version v0.14.1 -- +** sigs.k8s.io/kustomize/kyaml; version v0.14.3-0.20230601165947-6ce0bf390ce3 -- https://github.com/kubernetes-sigs/kustomize -** sigs.k8s.io/structured-merge-diff/v4; version v4.2.3 -- +** sigs.k8s.io/structured-merge-diff/v4; version v4.4.1 -- https://github.com/kubernetes-sigs/structured-merge-diff @@ -537,6 +546,34 @@ limitations under the License. ------ +** github.com/gorilla/websocket; version v1.5.0 -- +https://github.com/gorilla/websocket + +Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + ** github.com/pkg/errors; version v0.9.1 -- https://github.com/pkg/errors @@ -634,7 +671,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/cyphar/filepath-securejoin; version v0.2.3 -- +** github.com/cyphar/filepath-securejoin; version v0.2.4 -- https://github.com/cyphar/filepath-securejoin Copyright (C) 2014-2015 Docker Inc & Go Authors. All rights reserved. @@ -668,7 +705,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/evanphx/json-patch; version v5.6.0+incompatible -- +** github.com/evanphx/json-patch; version v5.7.0+incompatible -- https://github.com/evanphx/json-patch Copyright (c) 2014, Evan Phoenix @@ -807,7 +844,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/google/go-cmp/cmp; version v0.5.9 -- +** github.com/google/go-cmp/cmp; version v0.6.0 -- https://github.com/google/go-cmp Copyright (c) 2017 The Go Authors. All rights reserved. @@ -976,37 +1013,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** github.com/liggitt/tabwriter; version v0.0.0-20181228230101-89fcab3d43de -- https://github.com/liggitt/tabwriter -** golang.org/go; version go1.20.13 -- +** golang.org/go; version go1.21.6 -- https://github.com/golang/go -** golang.org/x/crypto; version v0.5.0 -- +** golang.org/x/crypto; version v0.17.0 -- https://golang.org/x/crypto -** golang.org/x/net; version v0.8.0 -- +** golang.org/x/net; version v0.17.0 -- https://golang.org/x/net -** golang.org/x/oauth2; version v0.4.0 -- +** golang.org/x/oauth2; version v0.10.0 -- https://golang.org/x/oauth2 -** golang.org/x/sync; version v0.1.0 -- +** golang.org/x/sync; version v0.3.0 -- https://golang.org/x/sync -** golang.org/x/sys; version v0.6.0 -- +** golang.org/x/sys; version v0.15.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.6.0 -- +** golang.org/x/term; version v0.15.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.9.0 -- +** golang.org/x/text; version v0.14.0 -- https://golang.org/x/text -** golang.org/x/time/rate; version v0.0.0-20220210224613-90d013bbcef8 -- +** golang.org/x/time/rate; version v0.3.0 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang; version v0.27.2 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.29.0 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go/third_party/forked/golang/template; version v0.27.2 -- +** k8s.io/client-go/third_party/forked/golang/template; version v0.29.0 -- https://github.com/kubernetes/client-go Copyright (c) 2009 The Go Authors. All rights reserved. @@ -1076,7 +1113,42 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.37.0 -- +** github.com/mxk/go-flowrate/flowrate; version v0.0.0-20140419014527-cca7078d478f -- +https://github.com/mxk/go-flowrate + +Copyright (c) 2014 The Go-FlowRate Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + + * Neither the name of the go-flowrate project nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + +** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.44.0 -- https://github.com/prometheus/common Copyright (c) 2011, Open Knowledge Foundation Ltd. @@ -1146,7 +1218,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** go.starlark.net; version v0.0.0-20200306205701-8dd3e2ee1dd5 -- +** go.starlark.net; version v0.0.0-20230525235612-a134d8f9ddca -- https://github.com/google/starlark-go Copyright (c) 2017 The Bazel Authors. All rights reserved. @@ -1181,7 +1253,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.28.1 -- +** google.golang.org/protobuf; version v1.31.0 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -1248,7 +1320,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20230501164219-8b0f38b5fd1f -- +** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20231010175941-2dd684a91f00 -- https://github.com/kubernetes/kube-openapi Copyright (c) 2020 The Go Authors. All rights reserved. @@ -1281,7 +1353,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20230220204549-a5ecb0141aa5 -- +** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20230726121419-3b25d923346b -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -1343,7 +1415,7 @@ Copyright (c) 2014 Alex Saskevich https://github.com/beorn7/perks Copyright (C) 2013 Blake Mizerany -** github.com/BurntSushi/toml; version v1.2.1 -- +** github.com/BurntSushi/toml; version v1.3.2 -- https://github.com/BurntSushi/toml Copyright (c) 2013 TOML authors @@ -1351,7 +1423,7 @@ Copyright (c) 2013 TOML authors https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare -** github.com/cpuguy83/go-md2man/v2/md2man; version v2.0.2 -- +** github.com/cpuguy83/go-md2man/v2/md2man; version v2.0.3 -- https://github.com/cpuguy83/go-md2man/v2 Copyright (c) 2014 Brian Goff @@ -1359,7 +1431,7 @@ Copyright (c) 2014 Brian Goff https://github.com/docker/docker-credential-helpers Copyright (c) 2016 David Calavera -** github.com/emicklei/go-restful/v3; version v3.10.1 -- +** github.com/emicklei/go-restful/v3; version v3.11.0 -- https://github.com/emicklei/go-restful/v3 Copyright (c) 2012,2013 Ernest Micklei @@ -1371,7 +1443,11 @@ Copyright (c) 2015 Exponent Labs LLC https://github.com/fatih/color Copyright (c) 2013 Fatih Arslan -** github.com/fvbommel/sortorder; version v1.0.1 -- +** github.com/felixge/httpsnoop; version v1.0.3 -- +https://github.com/felixge/httpsnoop +Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com) + +** github.com/fvbommel/sortorder; version v1.1.0 -- https://github.com/fvbommel/sortorder Copyright (c) 2015 Frits van Bommel @@ -1447,7 +1523,7 @@ Copyright (c) 2016 Yasuhiro Matsumoto https://github.com/mitchellh/copystructure Copyright (c) 2014 Mitchell Hashimoto -** github.com/mitchellh/go-wordwrap; version v1.0.0 -- +** github.com/mitchellh/go-wordwrap; version v1.0.1 -- https://github.com/mitchellh/go-wordwrap Copyright (c) 2014 Mitchell Hashimoto @@ -1467,16 +1543,16 @@ Copyright (c) 2016 Taihei Morikuni https://github.com/peterbourgon/diskv Copyright (c) 2011-2012 Peter Bourgon -** github.com/rubenv/sql-migrate; version v1.3.1 -- +** github.com/rubenv/sql-migrate; version v1.5.2 -- https://github.com/rubenv/sql-migrate Copyright (C) 2014-2021 by Ruben Vermeersch -** github.com/rubenv/sql-migrate/sqlparse; version v1.3.1 -- +** github.com/rubenv/sql-migrate/sqlparse; version v1.5.2 -- https://github.com/rubenv/sql-migrate Copyright (C) 2014-2017 by Ruben Vermeersch Copyright (C) 2012-2014 by Liam Staskawicz -** github.com/sirupsen/logrus; version v1.9.0 -- +** github.com/sirupsen/logrus; version v1.9.3 -- https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen @@ -1484,7 +1560,7 @@ Copyright (c) 2014 Simon Eskildsen https://github.com/spf13/cast Copyright (c) 2014 Steve Francia -** sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/qri-io/starlib/util; version v0.14.1 -- +** sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/qri-io/starlib/util; version v0.14.3-0.20230601165947-6ce0bf390ce3 -- https://github.com/kubernetes-sigs/kustomize Copyright (c) 2018 QRI, Inc. @@ -1507,7 +1583,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** github.com/go-gorp/gorp/v3; version v3.0.5 -- +** github.com/go-gorp/gorp/v3; version v3.1.0 -- https://github.com/go-gorp/gorp/v3 Copyright (c) 2012 James Cooper @@ -1677,7 +1753,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ ------ -** github.com/xlab/treeprint; version v1.1.0 -- +** github.com/xlab/treeprint; version v1.2.0 -- https://github.com/xlab/treeprint Copyright © 2016 Maxim Kupriianov @@ -1707,7 +1783,7 @@ Copyright (c) 2006-2010 Kirill Simonov Copyright (c) 2006-2011 Kirill Simonov Copyright (c) 2011-2019 Canonical Ltd -** sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml; version v0.14.1 -- +** sigs.k8s.io/kustomize/kyaml/internal/forked/github.com/go-yaml/yaml; version v0.14.3-0.20230601165947-6ce0bf390ce3 -- https://github.com/kubernetes-sigs/kustomize Copyright (c) 2006-2010 Kirill Simonov Copyright (c) 2006-2011 Kirill Simonov diff --git a/projects/helm/helm/CHECKSUMS b/projects/helm/helm/CHECKSUMS index d9e006be9e..431d13e247 100644 --- a/projects/helm/helm/CHECKSUMS +++ b/projects/helm/helm/CHECKSUMS @@ -1,2 +1,2 @@ -9771ed406792699611bed9e4aea66a32c56dac4b69b163e65457e3961306fa1c _output/bin/helm/linux-amd64/helm -61a33f42994cf5cf7e243335d8e88e1f34ac674278547ec498dd919865c47da2 _output/bin/helm/linux-arm64/helm +21b6bb2215a4ffbbf346bcd1160bb0789cd90ebb6cd91a1454fb0000402ef2cc _output/bin/helm/linux-amd64/helm +ea471777487e458972c951efc175bf2148bcb422d8257e031a7648dfadc9bf39 _output/bin/helm/linux-arm64/helm diff --git a/projects/helm/helm/GIT_TAG b/projects/helm/helm/GIT_TAG index 10d3e4ccb1..5ef3202ea0 100644 --- a/projects/helm/helm/GIT_TAG +++ b/projects/helm/helm/GIT_TAG @@ -1 +1 @@ -v3.12.1 +v3.14.0 diff --git a/projects/helm/helm/GOLANG_VERSION b/projects/helm/helm/GOLANG_VERSION index 5fb5a6b4f5..d2ab029d32 100644 --- a/projects/helm/helm/GOLANG_VERSION +++ b/projects/helm/helm/GOLANG_VERSION @@ -1 +1 @@ -1.20 +1.21 diff --git a/projects/helm/helm/README.md b/projects/helm/helm/README.md index 5be8233864..3c426a5c9d 100644 --- a/projects/helm/helm/README.md +++ b/projects/helm/helm/README.md @@ -1,5 +1,5 @@ ## **Helm** -![Version](https://img.shields.io/badge/version-v3.12.1-blue) +![Version](https://img.shields.io/badge/version-v3.14.0-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieVZ2Vm4zalcvTTRlVHk3ODJMLy80a2hqaGw1eUNEMlBEQktYOGxLdkZYQmxMK2tWUTMyUHlxZDVIK2lYak9qM25OZm9IYTFkUGlXZ3dCOEhRb0dHMzBjPSIsIml2UGFyYW1ldGVyU3BlYyI6Im9EemRhdkg1Tll6d1lSaVciLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Helm](https://github.com/helm/helm) is a tool for managing Charts. Charts are packages of pre-configured Kubernetes resources. diff --git a/projects/helm/helm/patches/0001-Push-to-insecure-OCI-registry.patch b/projects/helm/helm/patches/0001-Push-to-insecure-OCI-registry.patch deleted file mode 100644 index 831dc1a269..0000000000 --- a/projects/helm/helm/patches/0001-Push-to-insecure-OCI-registry.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 7e94c59c14b030d8a602b3026d08b98e0362fbb0 Mon Sep 17 00:00:00 2001 -From: "https://github.com/helm/helm/pull/10408" -Date: Mon, 29 Nov 2021 16:53:43 +0800 -Subject: [PATCH 1/3] Push to insecure OCI registry - -Signed-off-by: acool@amazon.com ---- - cmd/helm/push.go | 5 ++++- - pkg/action/pull.go | 7 +++++++ - pkg/action/push.go | 16 +++++++++++++++- - pkg/registry/client.go | 32 ++++++++++++++++++++++++++++++++ - 4 files changed, 58 insertions(+), 2 deletions(-) - -diff --git a/cmd/helm/push.go b/cmd/helm/push.go -index b1e3e60a..6d2a4c6b 100644 ---- a/cmd/helm/push.go -+++ b/cmd/helm/push.go -@@ -39,6 +39,7 @@ type registryPushOptions struct { - keyFile string - caFile string - insecureSkipTLSverify bool -+ plainHTTP bool - } - - func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command { -@@ -77,7 +78,8 @@ func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command { - client := action.NewPushWithOpts(action.WithPushConfig(cfg), - action.WithTLSClientConfig(o.certFile, o.keyFile, o.caFile), - action.WithInsecureSkipTLSVerify(o.insecureSkipTLSverify), -- action.WithPushOptWriter(out)) -+ action.WithPushOptWriter(out), -+ action.WithPlainHTTP(o.plainHTTP)) - client.Settings = settings - output, err := client.Run(chartRef, remote) - if err != nil { -@@ -93,6 +95,7 @@ func newPushCmd(cfg *action.Configuration, out io.Writer) *cobra.Command { - f.StringVar(&o.keyFile, "key-file", "", "identify registry client using this SSL key file") - f.StringVar(&o.caFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle") - f.BoolVar(&o.insecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart upload") -+ f.BoolVar(&o.plainHTTP, "plain-http", false, "use plain http and not https to connect oci registry") - - return cmd - } -diff --git a/pkg/action/pull.go b/pkg/action/pull.go -index 37ff144d..a7672008 100644 ---- a/pkg/action/pull.go -+++ b/pkg/action/pull.go -@@ -45,6 +45,7 @@ type Pull struct { - VerifyLater bool - UntarDir string - DestDir string -+ PlainHTTP bool - cfg *Configuration - } - -@@ -80,6 +81,12 @@ func (p *Pull) SetRegistryClient(client *registry.Client) { - func (p *Pull) Run(chartRef string) (string, error) { - var out strings.Builder - -+ if p.InsecureSkipTLSverify || p.PlainHTTP { -+ if err := p.cfg.RegistryClient.WithResolver(p.InsecureSkipTLSverify, p.PlainHTTP); err != nil { -+ return out.String(), err -+ } -+ } -+ - c := downloader.ChartDownloader{ - Out: &out, - Keyring: p.Keyring, -diff --git a/pkg/action/push.go b/pkg/action/push.go -index 89200640..f456cf98 100644 ---- a/pkg/action/push.go -+++ b/pkg/action/push.go -@@ -37,6 +37,7 @@ type Push struct { - caFile string - insecureSkipTLSverify bool - out io.Writer -+ plainHTTP bool - } - - // PushOpt is a type of function that sets options for a push action. -@@ -65,13 +66,20 @@ func WithInsecureSkipTLSVerify(insecureSkipTLSVerify bool) PushOpt { - } - } - --// WithOptWriter sets the registryOut field on the push configuration object. -+// WithPushOptWriter sets the registryOut field on the push configuration object. - func WithPushOptWriter(out io.Writer) PushOpt { - return func(p *Push) { - p.out = out - } - } - -+// WithPlainHTTP determines if connection to the OCI registry happens via HTTP or HTTPS. -+func WithPlainHTTP(plainHTTP bool) PushOpt { -+ return func(p *Push) { -+ p.plainHTTP = plainHTTP -+ } -+} -+ - // NewPushWithOpts creates a new push, with configuration options. - func NewPushWithOpts(opts ...PushOpt) *Push { - p := &Push{} -@@ -85,6 +93,12 @@ func NewPushWithOpts(opts ...PushOpt) *Push { - func (p *Push) Run(chartRef string, remote string) (string, error) { - var out strings.Builder - -+ if p.insecureSkipTLSverify || p.plainHTTP { -+ if err := p.cfg.RegistryClient.WithResolver(p.insecureSkipTLSverify, p.plainHTTP); err != nil { -+ return out.String(), err -+ } -+ } -+ - c := uploader.ChartUploader{ - Out: &out, - Pushers: pusher.All(p.Settings), -diff --git a/pkg/registry/client.go b/pkg/registry/client.go -index f9569b62..1afcdd0e 100644 ---- a/pkg/registry/client.go -+++ b/pkg/registry/client.go -@@ -18,6 +18,7 @@ package registry // import "helm.sh/helm/v3/pkg/registry" - - import ( - "context" -+ "crypto/tls" - "encoding/json" - "fmt" - "io" -@@ -177,6 +178,37 @@ func ClientOptHTTPClient(httpClient *http.Client) ClientOption { - } - } - -+func (c *Client) newResolver(insecure, plainHTTP bool) (remotes.Resolver, error) { -+ headers := http.Header{} -+ headers.Set("User-Agent", version.GetUserAgent()) -+ opts := []auth.ResolverOption{auth.WithResolverHeaders(headers)} -+ -+ if insecure { -+ httpClient := http.DefaultClient -+ httpClient.Transport = &http.Transport{ -+ TLSClientConfig: &tls.Config{ -+ InsecureSkipVerify: true, -+ }, -+ Proxy: http.ProxyFromEnvironment, -+ } -+ opts = append(opts, auth.WithResolverClient(httpClient)) -+ } -+ if plainHTTP { -+ opts = append(opts, auth.WithResolverPlainHTTP()) -+ } -+ -+ return c.authorizer.ResolverWithOpts(opts...) -+} -+ -+func (c *Client) WithResolver(insecure, plainHTTP bool) error { -+ resolver, err := c.newResolver(insecure, plainHTTP) -+ if err != nil { -+ return err -+ } -+ c.resolver = resolver -+ return nil -+} -+ - type ( - // LoginOption allows specifying various settings on login - LoginOption func(*loginOperation) --- -2.39.2 - diff --git a/projects/helm/helm/patches/0002-Install-or-upgrade-supports-OCI-insecure-registry.patch b/projects/helm/helm/patches/0002-Install-or-upgrade-supports-OCI-insecure-registry.patch deleted file mode 100644 index 9a852987f0..0000000000 --- a/projects/helm/helm/patches/0002-Install-or-upgrade-supports-OCI-insecure-registry.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 29eb89358376414bfbc9b169475d38e8cbfb7e84 Mon Sep 17 00:00:00 2001 -From: pytimer -Date: Fri, 25 Feb 2022 17:34:53 +0800 -Subject: [PATCH 2/3] Install or upgrade supports OCI insecure registry - -Signed-off-by: pytimer ---- - cmd/helm/flags.go | 1 + - pkg/action/install.go | 7 +++++++ - pkg/registry/client.go | 1 - - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/cmd/helm/flags.go b/cmd/helm/flags.go -index 3f89aae2..56c8c4bc 100644 ---- a/cmd/helm/flags.go -+++ b/cmd/helm/flags.go -@@ -63,6 +63,7 @@ func addChartPathOptionsFlags(f *pflag.FlagSet, c *action.ChartPathOptions) { - f.BoolVar(&c.InsecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart download") - f.StringVar(&c.CaFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle") - f.BoolVar(&c.PassCredentialsAll, "pass-credentials", false, "pass credentials to all domains") -+ f.BoolVar(&c.PlainHTTP, "plain-http", false, "use plain http to connect oci registry") - } - - // bindOutputFlag will add the output flag to the given command and bind the -diff --git a/pkg/action/install.go b/pkg/action/install.go -index d5c34cef..51bf1291 100644 ---- a/pkg/action/install.go -+++ b/pkg/action/install.go -@@ -121,6 +121,7 @@ type ChartPathOptions struct { - Username string // --username - Verify bool // --verify - Version string // --version -+ PlainHTTP bool // --plain-http - - // registryClient provides a registry client but is not added with - // options from a flag -@@ -725,6 +726,12 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) ( - return name, errors.Errorf("path %q not found", name) - } - -+ if c.InsecureSkipTLSverify { -+ if err := c.registryClient.WithResolver(c.InsecureSkipTLSverify, c.PlainHTTP); err != nil { -+ return "", err -+ } -+ } -+ - dl := downloader.ChartDownloader{ - Out: os.Stdout, - Keyring: c.Keyring, -diff --git a/pkg/registry/client.go b/pkg/registry/client.go -index 1afcdd0e..3a5ff75a 100644 ---- a/pkg/registry/client.go -+++ b/pkg/registry/client.go -@@ -189,7 +189,6 @@ func (c *Client) newResolver(insecure, plainHTTP bool) (remotes.Resolver, error) - TLSClientConfig: &tls.Config{ - InsecureSkipVerify: true, - }, -- Proxy: http.ProxyFromEnvironment, - } - opts = append(opts, auth.WithResolverClient(httpClient)) - } --- -2.39.2 - diff --git a/projects/helm/helm/patches/0003-Set-proxy-environment-in-HTTP-client.patch b/projects/helm/helm/patches/0003-Set-proxy-environment-in-HTTP-client.patch deleted file mode 100644 index 3e319474a4..0000000000 --- a/projects/helm/helm/patches/0003-Set-proxy-environment-in-HTTP-client.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a641de95394b104f4dc5b79f60522ee69230296e Mon Sep 17 00:00:00 2001 -From: Pooja Trivedi -Date: Thu, 4 Aug 2022 12:28:51 -0700 -Subject: [PATCH 3/3] Set proxy environment in HTTP client - ---- - pkg/registry/client.go | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pkg/registry/client.go b/pkg/registry/client.go -index 3a5ff75a..1afcdd0e 100644 ---- a/pkg/registry/client.go -+++ b/pkg/registry/client.go -@@ -189,6 +189,7 @@ func (c *Client) newResolver(insecure, plainHTTP bool) (remotes.Resolver, error) - TLSClientConfig: &tls.Config{ - InsecureSkipVerify: true, - }, -+ Proxy: http.ProxyFromEnvironment, - } - opts = append(opts, auth.WithResolverClient(httpClient)) - } --- -2.39.2 -