Skip to content

Commit

Permalink
Merge pull request #195 from kanisterio/sync
Browse files Browse the repository at this point in the history
Kan mod codegen (#6188)
  • Loading branch information
Ilya Kislenko committed Aug 9, 2019
2 parents 8b93bc2 + 22be381 commit 379c0f7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 26 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ test: build-dirs

codegen:
@$(MAKE) run CMD='-c " \
PATH=$$GOPATH/bin:$$GOROOT/bin::$${PATH} \
./build/codegen.sh \
"'

Expand Down
23 changes: 11 additions & 12 deletions build/codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@

set -o errexit
set -o nounset
set -o xtrace

# This is a workaround for the fact that codegen requires this boilerplate file
# to exist in GOPATH. If this file isn't present, we'll use an empty one.
boilerplate="${GOPATH}/src/k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt"
mkdir -p $(dirname "${boilerplate}")
touch "${boilerplate}"

pushd vendor/k8s.io/code-generator
./generate-groups.sh \
all \
github.com/kanisterio/kanister/pkg/client \
github.com/kanisterio/kanister/pkg/apis \
"cr:v1alpha1" \
export GO111MODULE=on
go mod download
execDir="/go/pkg/mod/k8s.io/code-generator@$(go list -f '{{.Version}}' -m k8s.io/code-generator)"
chmod +x "${execDir}"/generate-groups.sh
"${execDir}"/generate-groups.sh \
all \
github.com/kanisterio/kanister/pkg/client \
github.com/kanisterio/kanister/pkg/apis \
"cr:v1alpha1" \
--go-header-file "${execDir}"/hack/boilerplate.go.txt
8 changes: 0 additions & 8 deletions pkg/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions pkg/client/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 379c0f7

Please sign in to comment.