Skip to content

Commit 4285709

Browse files
committed
Convert to use go modules
Lock dependencies on k8s.io packages
1 parent 47c0c48 commit 4285709

File tree

2,986 files changed

+610
-1587657
lines changed

Some content is hidden

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

2,986 files changed

+610
-1587657
lines changed

Gopkg.lock

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

Gopkg.toml

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

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
TAG?=$(shell git rev-parse --short HEAD)
22
PREFIX ?= $(shell pwd)
3-
REPO = github.com/ant31/crd-validation
43
pkgs = $(shell go list ./... | grep -v /vendor/ | grep -v /test/)
54

65
all: check-license format build test
@@ -10,17 +9,14 @@ run:
109

1110
install: openapi-gen
1211

13-
1412
test:
1513
@go test -short $(pkgs)
1614

1715
format:
1816
go fmt $(pkgs)
1917

2018
openapi-gen:
21-
go get -u -v -d k8s.io/code-generator/cmd/openapi-gen
22-
cd $(GOPATH)/src/k8s.io/code-generator; git checkout release-1.8
23-
go install k8s.io/code-generator/cmd/openapi-gen
19+
go install k8s.io/kube-openapi/cmd/openapi-gen
2420

2521

2622
.PHONY: all build test format generate-openapi openapi-gen

example/prometheus-crd-gen/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ DATE := $(shell date '+%Y-%m-%d %H:%M:%S')
88
all: generate-crds
99

1010
$(GOBIN)/openapi-gen:
11-
go get -u -v -d k8s.io/code-generator/cmd/openapi-gen
12-
cd $(GOPATH)/src/k8s.io/code-generator; git checkout release-1.8
13-
go install k8s.io/code-generator/cmd/openapi-gen
11+
go get -u -v -d k8s.io/kube-openapi /cmd/openapi-gen
12+
cd $(GOPATH)/src/k8s.io/kube-openapi ; git checkout release-1.8
13+
go install k8s.io/kube-openapi /cmd/openapi-gen
1414

1515

1616

example/prometheus-crd-gen/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
package main
1616

1717
import (
18+
"flag"
19+
"os"
20+
1821
v1 "github.com/ant31/crd-validation/example/prometheus-crd-gen/v1"
1922
crdutils "github.com/ant31/crd-validation/pkg"
20-
"os"
2123
)
2224

2325
var (
@@ -26,7 +28,7 @@ var (
2628

2729
func init() {
2830
flagset := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
29-
flagset := crdutils.InitFlags(&cfg, flagset)
31+
flagset = crdutils.InitFlags(&cfg, flagset)
3032
flagset.Parse(os.Args[1:])
3133
}
3234

go.mod

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
module github.com/objectrocket/crd-validation
2+
3+
go 1.16
4+
5+
replace (
6+
k8s.io/api => k8s.io/api v0.19.15
7+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.15
8+
k8s.io/apimachinery => k8s.io/apimachinery v0.19.15
9+
)
10+
11+
require (
12+
github.com/ant31/crd-validation v0.0.0-20180801212718-38f6a293f140
13+
github.com/ghodss/yaml v1.0.0
14+
github.com/go-openapi/spec v0.19.3
15+
github.com/json-iterator/go v1.1.12 // indirect
16+
github.com/stretchr/testify v1.7.0 // indirect
17+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
18+
k8s.io/api v0.19.15
19+
k8s.io/apiextensions-apiserver v0.0.0-20180124213916-ddd9f73609e9
20+
k8s.io/apimachinery v0.19.15
21+
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
22+
)

0 commit comments

Comments
 (0)