Skip to content

Commit

Permalink
Updates client-go to v6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BugRoger committed Jan 12, 2018
1 parent 1fef5cc commit b9542a6
Show file tree
Hide file tree
Showing 1,687 changed files with 307,261 additions and 400,602 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ HAS_GLIDE_VC := $(shell command -v glide-vc;)
GO_SWAGGER_VERSION := 0.13.0
SWAGGER_BIN := bin/$(GOOS)/swagger-$(GO_SWAGGER_VERSION)

.PHONY: all test clean code-gen client-gen informer-gen lister-gen vendor
.PHONY: all test clean code-gen vendor

all: $(BINARIES:%=bin/$(GOOS)/%)

Expand Down Expand Up @@ -116,7 +116,7 @@ test-e2e:
go run test/e2e/*.go $(ARGS)

include code-generate.mk
code-gen: client-gen informer-gen lister-gen
code-gen: client-gen informer-gen lister-gen deepcopy-gen

vendor:
ifndef HAS_GLIDE_VC
Expand Down
14 changes: 12 additions & 2 deletions code-generate.mk
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
OUTPUT := _output
OUTPUT_BASE := $(GOPATH)/src
OUTPUT_BASE := $(GOPATH)/src
INPUT_BASE := github.com/sapcc/kubernikus
API_BASE := $(INPUT_BASE)/pkg/apis
GENERATED_BASE := $(INPUT_BASE)/pkg/generated
BIN := $(OUTPUT)/bin

.PHONY: client-gen informer-gen lister-gen
.PHONY: client-gen informer-gen lister-gen deepcopy-gen

client-gen: $(BIN)/client-gen
@rm -rf ./pkg/generated/clientset
Expand Down Expand Up @@ -41,6 +41,16 @@ lister-gen: $(BIN)/lister-gen
--input-dirs $(API_BASE)/kubernikus/v1 \
--output-package $(GENERATED_BASE)/listers

deepcopy-gen: $(BIN)/deepcopy-gen
@rm -rf $(API_BASE)/kubernikus/v1/zz_generated.deepcopy
${BIN}/deepcopy-gen \
--input-dirs $(API_BASE)/kubernikus/v1 --input-dirs $(INPUT_BASE)/pkg/api/models \
-O zz_generated.deepcopy \
--bounding-dirs $(INPUT_BASE) \
--output-base $(OUTPUT_BASE) \
--go-header-file /dev/null


$(OUTPUT)/bin/%:
@mkdir -p _output/bin
go build -o $@ ./vendor/k8s.io/code-generator/cmd/$*
Loading

0 comments on commit b9542a6

Please sign in to comment.