From ac7751eca12f848732f8f0377af50ff0f2cc1a28 Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Wed, 16 Dec 2020 10:57:29 +0100 Subject: Rollback helm library to version not failing v3 charts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change reverts fef2f1a959341d2abaea6dadaecccc4952c284c9 commit that updated helm library to a version, that no longer allowed helm v3 charts by explicitly failing when parsing them. Proper support of helm v3 is still not implemented in k8splugin, but at least it shouldn't fail on v3 packages that don't implement v3-specific features. Also apart from revert, go.mod/sum have been also tidied. Issue-ID: MULTICLOUD-1267 Signed-off-by: Konrad Bańka Change-Id: I992004d30802134039f0a6aca2d07a42db9c2459 --- src/k8splugin/go.mod | 85 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 34 deletions(-) (limited to 'src/k8splugin/go.mod') diff --git a/src/k8splugin/go.mod b/src/k8splugin/go.mod index 75cb7c7e..5371bb50 100644 --- a/src/k8splugin/go.mod +++ b/src/k8splugin/go.mod @@ -1,6 +1,7 @@ module github.com/onap/multicloud-k8s/src/k8splugin require ( + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/DATA-DOG/go-sqlmock v1.3.3 // indirect github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e // indirect github.com/Masterminds/semver v1.4.2 // indirect @@ -8,26 +9,37 @@ require ( github.com/aokoli/goutils v1.1.0 // indirect github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect + github.com/coreos/bbolt v1.3.3 // indirect + github.com/coreos/etcd v3.3.12+incompatible // indirect + github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect + github.com/cyphar/filepath-securejoin v0.2.2 // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/docker/distribution v2.7.0+incompatible // indirect github.com/docker/docker v0.7.3-0.20190912223608-ad718029b705 // indirect github.com/docker/engine v0.0.0-20190620014054-c513a4c6c298 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1 // indirect github.com/evanphx/json-patch v4.5.0+incompatible // indirect - github.com/fvbommel/util v0.0.2 + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect + github.com/fatih/camelcase v1.0.0 // indirect github.com/ghodss/yaml v1.0.0 github.com/go-openapi/spec v0.19.3 // indirect github.com/go-stack/stack v1.8.0 // indirect github.com/gobuffalo/packr v1.30.1 // indirect + github.com/gobwas/glob v0.2.3 // indirect github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect + github.com/google/go-cmp v0.2.0 // indirect github.com/googleapis/gnostic v0.2.0 // indirect + github.com/gorilla/context v1.1.1 // indirect github.com/gorilla/handlers v1.3.0 - github.com/gorilla/mux v1.7.0 + github.com/gorilla/mux v1.6.2 github.com/gorilla/websocket v1.4.1 // indirect github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.11.1 // indirect github.com/hashicorp/consul v1.4.0 github.com/hashicorp/go-msgpack v0.5.5 // indirect @@ -35,11 +47,20 @@ require ( github.com/hashicorp/memberlist v0.1.5 // indirect github.com/hashicorp/serf v0.8.1 // indirect github.com/huandu/xstrings v1.2.0 // indirect + github.com/imdario/mergo v0.3.5 // indirect github.com/jmoiron/sqlx v1.2.0 // indirect + github.com/jonboulle/clockwork v0.1.0 // indirect + github.com/json-iterator/go v1.1.7 // indirect github.com/lib/pq v1.2.0 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/mitchellh/go-testing-interface v1.0.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.0 // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/onsi/ginkgo v1.10.1 // indirect github.com/onsi/gomega v1.7.0 // indirect + github.com/opencontainers/go-digest v1.0.0-rc1 // indirect + github.com/pborman/uuid v1.2.0 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.8.1 github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1 // indirect github.com/sirupsen/logrus v1.4.2 @@ -51,46 +72,42 @@ require ( github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect github.com/xdg/stringprep v1.0.0 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect + github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect github.com/ziutek/mymysql v1.5.4 // indirect + go.etcd.io/bbolt v1.3.3 // indirect go.etcd.io/etcd v3.3.12+incompatible go.mongodb.org/mongo-driver v1.0.0 - golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 + golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect + golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect + google.golang.org/appengine v1.5.0 // indirect gopkg.in/gorp.v1 v1.7.2 // indirect - k8s.io/api v0.18.2 - k8s.io/apiextensions-apiserver v0.18.2 - k8s.io/apimachinery v0.18.2 - k8s.io/cli-runtime v0.18.2 - k8s.io/client-go v12.0.0+incompatible - k8s.io/cloud-provider v0.18.2 - k8s.io/helm v2.16.12+incompatible - k8s.io/kubernetes v1.16.9 + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/square/go-jose.v2 v2.2.2 // indirect + gotest.tools v2.2.0+incompatible // indirect + k8s.io/api v0.0.0-20190831074750-7364b6bdad65 + k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8 // indirect + k8s.io/apimachinery v0.0.0-20190831074630-461753078381 + k8s.io/apiserver v0.0.0-20190409021813-1ec86e4da56c // indirect + k8s.io/cli-runtime v0.0.0-20190913085402-777c64e2902f // indirect + k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible + k8s.io/cloud-provider v0.0.0-20190409023720-1bc0c81fa51d // indirect + k8s.io/helm v2.14.3+incompatible + k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect + k8s.io/kubernetes v1.14.1 // indirect k8s.io/utils v0.0.0-20190907131718-3d4f5b7dea0b // indirect - sigs.k8s.io/kustomize v2.0.3+incompatible + sigs.k8s.io/kustomize v2.0.3+incompatible // indirect + vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect ) replace ( - k8s.io/api => k8s.io/api v0.16.9 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.9 - k8s.io/apimachinery => k8s.io/apimachinery v0.16.10-beta.0 - k8s.io/apiserver => k8s.io/apiserver v0.16.9 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.9 - k8s.io/client-go => k8s.io/client-go v0.16.9 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.9 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.9 - k8s.io/code-generator => k8s.io/code-generator v0.16.10-beta.0 - k8s.io/component-base => k8s.io/component-base v0.16.9 - k8s.io/cri-api => k8s.io/cri-api v0.16.13-rc.0 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.9 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.9 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.9 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.9 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.9 - k8s.io/kubectl => k8s.io/kubectl v0.16.9 - k8s.io/kubelet => k8s.io/kubelet v0.16.9 - k8s.io/kubernetes => github.com/kubernetes/kubernetes v1.16.9 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.9 - k8s.io/metrics => k8s.io/metrics v0.16.9 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.9 + k8s.io/api => k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190409021813-1ec86e4da56c + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190409023024-d644b00f3b79 + k8s.io/client-go => k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190409023720-1bc0c81fa51d ) go 1.13 -- cgit 1.2.3-korg