From eb5695b0c5c46c6d5ca2f69ac1146e16bb023543 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Wed, 30 Aug 2023 21:46:01 -0400 Subject: [PATCH 1/3] unwanted-dependencies: adding archived repos Ref: #120276 This is a first step, and then we'll work to clean the code next. Signed-off-by: Vincent Batts --- hack/unwanted-dependencies.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hack/unwanted-dependencies.json b/hack/unwanted-dependencies.json index 851af478b83..89720c2b880 100644 --- a/hack/unwanted-dependencies.json +++ b/hack/unwanted-dependencies.json @@ -11,6 +11,13 @@ "github.com/form3tech-oss/jwt-go": "unmaintained, archive mode", "github.com/getsentry/raven-go": "unmaintained, archive mode", "github.com/go-bindata/go-bindata": "refer to #99829", + "github.com/golang/mock": "unmaintained, archive mode", + "github.com/pkg/errors": "unmaintained, archive mode", + "github.com/google/shlex": "unmaintained, archive mode", + "github.com/gregjones/httpcache": "unmaintained, archive mode", + "github.com/grpc-ecosystem/go-grpc-prometheus": "unmaintained, archive mode", + "github.com/rubiojr/go-vhd": "unmaintained, archive mode", + "go.opencensus.io": "unmaintained, https://github.com/census-instrumentation/opencensus-go archive mode", "github.com/go-kit/kit": "lots of transitive dependencies, see https://github.com/prometheus/common/issues/255", "github.com/go-openapi/analysis": "use k8s.io/kube-openapi/pkg/validation/spec", "github.com/go-openapi/spec": "use k8s.io/kube-openapi/pkg/validation/spec instead", From 3bc6ee6fef725514b478eb5bc0d43dd1f9a02b3a Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Wed, 30 Aug 2023 21:50:31 -0400 Subject: [PATCH 2/3] unwanted-dependencies: sort this list Seperated this commit from the prior, to keep it clear the additions. Signed-off-by: Vincent Batts --- hack/unwanted-dependencies.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hack/unwanted-dependencies.json b/hack/unwanted-dependencies.json index 89720c2b880..e3c4637541d 100644 --- a/hack/unwanted-dependencies.json +++ b/hack/unwanted-dependencies.json @@ -6,18 +6,12 @@ "cloud.google.com/go/compute": "cloud dependency", "cloud.google.com/go/firestore": "db/datastore clients should not be required", "cloud.google.com/go/storage": "cloud dependency", + "github.com/PuerkitoBio/urlesc": "unmaintained, archive mode", "github.com/armon/consul-api": "MPL license not in CNCF allowlist", "github.com/bketelsen/crypt": "unused, crypto", "github.com/form3tech-oss/jwt-go": "unmaintained, archive mode", "github.com/getsentry/raven-go": "unmaintained, archive mode", "github.com/go-bindata/go-bindata": "refer to #99829", - "github.com/golang/mock": "unmaintained, archive mode", - "github.com/pkg/errors": "unmaintained, archive mode", - "github.com/google/shlex": "unmaintained, archive mode", - "github.com/gregjones/httpcache": "unmaintained, archive mode", - "github.com/grpc-ecosystem/go-grpc-prometheus": "unmaintained, archive mode", - "github.com/rubiojr/go-vhd": "unmaintained, archive mode", - "go.opencensus.io": "unmaintained, https://github.com/census-instrumentation/opencensus-go archive mode", "github.com/go-kit/kit": "lots of transitive dependencies, see https://github.com/prometheus/common/issues/255", "github.com/go-openapi/analysis": "use k8s.io/kube-openapi/pkg/validation/spec", "github.com/go-openapi/spec": "use k8s.io/kube-openapi/pkg/validation/spec instead", @@ -25,6 +19,8 @@ "github.com/go-openapi/validate": "use k8s.io/kube-openapi/pkg/validation/validate instead", "github.com/gogo/googleapis": "depends on unmaintained github.com/gogo/protobuf", "github.com/gogo/protobuf": "unmaintained", + "github.com/golang/mock": "unmaintained, archive mode", + "github.com/google/shlex": "unmaintained, archive mode", "github.com/google/shlex": "unmaintained, archive mode", "github.com/googleapis/enterprise-certificate-proxy": "references cloud dependencies", "github.com/googleapis/gax-go/v2": "references cloud dependencies", @@ -33,6 +29,8 @@ "github.com/gorilla/rpc": "unmaintained, archive mode", "github.com/gorilla/schema": "unmaintained, archive mode", "github.com/gorilla/websocket": "unmaintained, archive mode", + "github.com/gregjones/httpcache": "unmaintained, archive mode", + "github.com/grpc-ecosystem/go-grpc-prometheus": "unmaintained, archive mode", "github.com/grpc-ecosystem/grpc-gateway": "use github.com/grpc-ecosystem/grpc-gateway/v2", "github.com/hashicorp/consul": "MPL license not in CNCF allowlist", "github.com/hashicorp/errwrap": "MPL license not in CNCF allowlist", @@ -56,19 +54,21 @@ "github.com/mndrix/tap-go": "unmaintained", "github.com/onsi/ginkgo": "Ginkgo has been migrated to V2, refer to #109111", "github.com/pkg/errors": "unmaintained, archive mode", - "github.com/PuerkitoBio/urlesc": "unmaintained, archive mode", + "github.com/pkg/errors": "unmaintained, archive mode", + "github.com/rubiojr/go-vhd": "unmaintained, archive mode", "github.com/smartystreets/goconvey": "MPL license not in CNCF allowlist", "github.com/spf13/viper": "refer to #102598", "github.com/xeipuuv/gojsonschema": "unmaintained", "go.mongodb.org/mongo-driver": "", + "go.opencensus.io": "unmaintained, https://github.com/census-instrumentation/opencensus-go archive mode", + "golang.org/x/exp": "This subrepository holds experimental and deprecated packages", "golang.org/x/lint": "unmaintained, archive mode", "google.golang.org/api": "cloud dependency", "google.golang.org/genproto": "refer to #113366", "gopkg.in/fsnotify.v1": "obsolete, use github.com/fsnotify/fsnotify", "k8s.io/klog": "we have switched to klog v2, so avoid klog v1", "rsc.io/quote": "refer to #102833", - "rsc.io/sampler": "refer to #102833", - "golang.org/x/exp": "This subrepository holds experimental and deprecated packages" + "rsc.io/sampler": "refer to #102833" } }, "status": { From f22d8540723e486b768c09bab13be0c054a499b9 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Thu, 31 Aug 2023 08:22:27 -0400 Subject: [PATCH 3/3] unwanted-dependendencies: updating references, and `jq` Signed-off-by: Vincent Batts --- hack/unwanted-dependencies.json | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/hack/unwanted-dependencies.json b/hack/unwanted-dependencies.json index e3c4637541d..fa7f5143526 100644 --- a/hack/unwanted-dependencies.json +++ b/hack/unwanted-dependencies.json @@ -21,7 +21,6 @@ "github.com/gogo/protobuf": "unmaintained", "github.com/golang/mock": "unmaintained, archive mode", "github.com/google/shlex": "unmaintained, archive mode", - "github.com/google/shlex": "unmaintained, archive mode", "github.com/googleapis/enterprise-certificate-proxy": "references cloud dependencies", "github.com/googleapis/gax-go/v2": "references cloud dependencies", "github.com/gorilla/handlers": "unmaintained, archive mode", @@ -54,7 +53,6 @@ "github.com/mndrix/tap-go": "unmaintained", "github.com/onsi/ginkgo": "Ginkgo has been migrated to V2, refer to #109111", "github.com/pkg/errors": "unmaintained, archive mode", - "github.com/pkg/errors": "unmaintained, archive mode", "github.com/rubiojr/go-vhd": "unmaintained, archive mode", "github.com/smartystreets/goconvey": "MPL license not in CNCF allowlist", "github.com/spf13/viper": "refer to #102598", @@ -125,6 +123,10 @@ "k8s.io/kubernetes", "k8s.io/metrics" ], + "github.com/golang/mock": [ + "k8s.io/kubernetes", + "k8s.io/legacy-cloud-providers" + ], "github.com/google/shlex": [ "sigs.k8s.io/kustomize/api", "sigs.k8s.io/kustomize/kustomize/v5" @@ -144,6 +146,14 @@ "github.com/tmc/grpc-websocket-proxy", "go.etcd.io/etcd/server/v3" ], + "github.com/gregjones/httpcache": [ + "k8s.io/client-go" + ], + "github.com/grpc-ecosystem/go-grpc-prometheus": [ + "go.etcd.io/etcd/client/v3", + "go.etcd.io/etcd/server/v3", + "k8s.io/apiserver" + ], "github.com/grpc-ecosystem/grpc-gateway": [ "go.etcd.io/etcd/api/v3", "go.etcd.io/etcd/server/v3" @@ -174,6 +184,15 @@ "sigs.k8s.io/kustomize/api", "sigs.k8s.io/kustomize/kustomize/v5" ], + "github.com/rubiojr/go-vhd": [ + "k8s.io/legacy-cloud-providers" + ], + "go.opencensus.io": [ + "cloud.google.com/go", + "cloud.google.com/go/compute", + "github.com/Microsoft/hcsshim", + "google.golang.org/api" + ], "golang.org/x/exp": [ "github.com/antlr/antlr4/runtime/Go/antlr/v4", "github.com/google/cel-go"