From fef2f1a959341d2abaea6dadaecccc4952c284c9 Mon Sep 17 00:00:00 2001 From: "Igor D.C" Date: Mon, 21 Sep 2020 17:46:52 +0000 Subject: Fix missing operator-sdk dependency goautoneg goautoneg used to be available from bitbucket.org/ww/goautoneg but not anymore. operator-sdk has been importing it from github.com/munnerz/goautoneg for some time now but since we were using operator-sdk v0.9.0, it was still pointing at the old (now deleted) repository. This patch bumps operator-sdk to v0.19.0 (which doesn't use goautoneg from bitbucket), controller-runtime to v0.5.11, helm to v2.16.12 and all k8s.io dependencies to v0.16.9 (consistent with the k8s v1.16.9 we use). Code changes have been made to make all modules compatible with the new dependencies. All src go.sums have been cleaned (deleted and re-built). Issue-ID: MULTICLOUD-1143 Change-Id: I89fc39e9595b4a6a38dd90028b161bcecd3ef349 Signed-off-by: Igor D.C --- src/k8splugin/go.mod | 56 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 22 deletions(-) (limited to 'src/k8splugin/go.mod') diff --git a/src/k8splugin/go.mod b/src/k8splugin/go.mod index d26de6ef..57b03266 100644 --- a/src/k8splugin/go.mod +++ b/src/k8splugin/go.mod @@ -11,13 +11,11 @@ require ( 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 @@ -25,6 +23,7 @@ require ( github.com/evanphx/json-patch v4.5.0+incompatible // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect github.com/fatih/camelcase v1.0.0 // indirect + github.com/fvbommel/util v0.0.2 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 @@ -35,7 +34,7 @@ require ( 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.6.2 + github.com/gorilla/mux v1.7.0 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 @@ -77,36 +76,49 @@ require ( 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-20190827160401-ba9fcec4b297 + golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect google.golang.org/appengine v1.5.0 // indirect gopkg.in/gorp.v1 v1.7.2 // indirect 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/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/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect - k8s.io/kubernetes v1.14.1 // indirect + k8s.io/kubernetes v1.16.9 k8s.io/utils v0.0.0-20190907131718-3d4f5b7dea0b // indirect - sigs.k8s.io/kustomize v2.0.3+incompatible // indirect - vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect + sigs.k8s.io/kustomize v2.0.3+incompatible ) replace ( - 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 + 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 ) go 1.13 -- cgit 1.2.3-korg