Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades to client-go v6.0.0 #163

Merged
merged 1 commit into from
Jan 12, 2018
Merged

Upgrades to client-go v6.0.0 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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