Skip to content

Commit d1f276c

Browse files
committed
Remove required from Gopkg.toml, prune, pin logr
This removes the "required" markings from Gopkg.toml, pins logr and zapr at specific versions, and prunes non-go. This should start to reduce our dependency list.
1 parent 8810470 commit d1f276c

File tree

476 files changed

+114
-65397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

476 files changed

+114
-65397
lines changed

Gopkg.lock

Lines changed: 103 additions & 233 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Packages required by users
16-
# NB(directxman12): be very careful how you word these --
17-
# dep considers them as a dependency on the package you list
18-
# meaning that if there's a main.go in the root package
19-
# (like in apiextensions-apiserver), you'll pull it's deps in.
20-
required = ["sigs.k8s.io/testing_frameworks/integration",
21-
"k8s.io/client-go/plugin/pkg/client/auth",
22-
"github.com/spf13/pflag",
23-
"github.com/emicklei/go-restful",
24-
"github.com/go-openapi/spec",
25-
"k8s.io/kube-openapi/pkg/common",
26-
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
27-
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset",
28-
"github.com/prometheus/client_golang/prometheus",
29-
]
30-
3115
[[constraint]]
3216
name = "k8s.io/api"
3317
version = "kubernetes-1.13.4"
@@ -57,8 +41,8 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
5741
version = "v1.4.0"
5842

5943
[[constraint]]
60-
name = "github.com/ghodss/yaml"
61-
version = "1.0.0"
44+
name = "sigs.k8s.io/yaml"
45+
version = "v1.1.0"
6246

6347
[[constraint]]
6448
name = "go.uber.org/zap"
@@ -71,11 +55,13 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
7155
# these are not listed explicitly until we get version tags,
7256
# since dep doesn't like bare revision dependencies
7357

74-
# [[constraint]]
75-
# name = "github.com/go-logr/logr"
76-
#
77-
# [[constraint]]
78-
# name = "github.com/go-logr/zapr"
58+
[[constraint]]
59+
name = "github.com/go-logr/logr"
60+
version = "v0.1.0"
61+
62+
[[constraint]]
63+
name = "github.com/go-logr/zapr"
64+
version = "v0.1.1"
7965

8066
# For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
8167
[[override]]
@@ -86,3 +72,4 @@ version="v1.4.7"
8672
[prune]
8773
go-tests = true
8874
unused-packages = true
75+
non-go = true

pkg/envtest/crd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import (
2222
"path/filepath"
2323
"time"
2424

25-
"github.com/ghodss/yaml"
2625
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
2726
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
2827
"k8s.io/apimachinery/pkg/runtime/schema"
2928
"k8s.io/apimachinery/pkg/util/sets"
3029
"k8s.io/apimachinery/pkg/util/wait"
3130
"k8s.io/client-go/rest"
31+
"sigs.k8s.io/yaml"
3232
)
3333

3434
// CRDInstallOptions are the options for installing CRDs

vendor/github.com/Azure/go-autorest/LICENSE

Lines changed: 0 additions & 191 deletions
This file was deleted.

0 commit comments

Comments
 (0)