Use release versions of dependencies

- migrate from docker/engine to moby/moby
- migrate from x/net to built-in context package
- update k8s.io/client-go
  (v11.0.1-0.20190409021438-1a26190bd76a+incompatible -> v0.20.1)

Issue-ID: MULTICLOUD-1542
Change-Id: Ic0435ee5333b1fc6a343860ca3036f2eb3b104fe
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/src/k8splugin/go.mod b/src/k8splugin/go.mod
index c6dc23b..072e864 100644 (file)
--- a/src/k8splugin/go.mod
+++ b/src/k8splugin/go.mod
@@ -2,11 +2,11 @@ module github.com/onap/multicloud-k8s/src/k8splugin
 
 require (
        github.com/cespare/xxhash/v2 v2.3.0 // indirect
-       github.com/docker/engine v0.0.0-20190620014054-c513a4c6c298
        github.com/ghodss/yaml v1.0.0
        github.com/gorilla/handlers v1.3.0
        github.com/gorilla/mux v1.8.0
        github.com/hashicorp/consul/api v1.5.0
+       github.com/moby/moby v23.0.18+incompatible
        github.com/pkg/errors v0.9.1
        github.com/sirupsen/logrus v1.7.0
        github.com/spf13/cobra v1.1.3 // indirect
@@ -14,19 +14,18 @@ require (
        go.mongodb.org/mongo-driver v1.7.5
        go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.24.0
        go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.24.0
-       go.opentelemetry.io/contrib/propagators/b3 v0.24.0 // indirect
+       go.opentelemetry.io/contrib/propagators/b3 v0.24.0
        go.opentelemetry.io/otel v1.2.0
        go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.2.0
        go.opentelemetry.io/otel/sdk v1.2.0
        go.opentelemetry.io/otel/trace v1.2.0
-       golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
        gopkg.in/yaml.v2 v2.4.0
        helm.sh/helm/v3 v3.5.0
        k8s.io/api v0.20.1
        k8s.io/apiextensions-apiserver v0.20.1
        k8s.io/apimachinery v0.20.1
        k8s.io/cli-runtime v0.20.1
-       k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
+       k8s.io/client-go v0.20.1
        rsc.io/letsencrypt v0.0.3 // indirect
 )
 

diff --git a/src/k8splugin/go.sum b/src/k8splugin/go.sum
index 2e965f9..50fe8e3 100644 (file)
--- a/src/k8splugin/go.sum
+++ b/src/k8splugin/go.sum
@@ -221,8 +221,6 @@ github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c h1:zviRyz1SWO8+WVJ
 github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
-github.com/docker/engine v0.0.0-20190620014054-c513a4c6c298 h1:dDGt5n84DvY05kaJT26cw1TDxNW1NymRZ13j0KeEQaw=
-github.com/docker/engine v0.0.0-20190620014054-c513a4c6c298/go.mod h1:3CPr2caMgTHxxIAZgEMd3uLYPDlRvPqCpyeRf6ncPcY=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 h1:yWHOI+vFjEsAakUTSrtqc/SAHrhSkmn48pqjidZX3QA=
@@ -670,6 +668,8 @@ github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQ
 github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/ipvs v1.0.1/go.mod h1:2pngiyseZbIKXNv7hsKj3O9UEz30c53MT9005gt2hxQ=
+github.com/moby/moby v23.0.18+incompatible h1:AT+j3TQ2mtB8fx4WRPbXEuOw2OT83PcGOJko4q8/tOw=
+github.com/moby/moby v23.0.18+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/sys/mountinfo v0.1.3/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd h1:aY7OQNf2XqY/JQ6qREWamhI/81os/agb2BAGpcx5yWI=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=

diff --git a/src/k8splugin/internal/db/mongo.go b/src/k8splugin/internal/db/mongo.go
index c7808f2..5e7aa17 100644 (file)
--- a/src/k8splugin/internal/db/mongo.go
+++ b/src/k8splugin/internal/db/mongo.go
@@ -17,10 +17,9 @@
 package db
 
 import (
+       "context"
        "log"
 
-       "golang.org/x/net/context"
-
        "github.com/onap/multicloud-k8s/src/k8splugin/internal/config"
        "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo"
 

diff --git a/src/k8splugin/internal/namegenerator/namegenerator.go b/src/k8splugin/internal/namegenerator/namegenerator.go
index 3a6f3ef..6ac80f3 100644 (file)
--- a/src/k8splugin/internal/namegenerator/namegenerator.go
+++ b/src/k8splugin/internal/namegenerator/namegenerator.go
@@ -23,9 +23,9 @@ import (
        "strings"
        "sync"
 
+       "github.com/moby/moby/pkg/namesgenerator"
        "github.com/onap/multicloud-k8s/src/k8splugin/internal/db"
 
-       "github.com/docker/engine/pkg/namesgenerator"
        pkgerrors "github.com/pkg/errors"
 )