Skip to content

Commit

Permalink
Merge pull request #5507 from mikesplain/fix_gendocs
Browse files Browse the repository at this point in the history
Fix api-gen-docs dependencies
  • Loading branch information
k8s-ci-robot authored Jul 29, 2018
2 parents b1e1715 + a291b61 commit ed74085
Show file tree
Hide file tree
Showing 15 changed files with 5,476 additions and 2,174 deletions.
4 changes: 3 additions & 1 deletion Gopkg.lock

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

1 change: 1 addition & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ required = [
# Needed for docs generation
"k8s.io/code-generator/cmd/openapi-gen",
"github.com/kubernetes-incubator/apiserver-builder/cmd/apiserver-boot",
"github.com/kubernetes-incubator/apiserver-builder/cmd/apiregister-gen",
"github.com/kubernetes-incubator/reference-docs/gen-apidocs",

# Needed for bazel generation / verification
Expand Down
16 changes: 15 additions & 1 deletion hack/make-gendocs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ cp ${WORK_DIR}/go/bin/openapi-gen ${GOPATH}/bin/

# Install the apiserver-builder commands
GOPATH=${WORK_DIR}/go/ go install github.com/kubernetes-incubator/apiserver-builder/cmd/...
cp ${WORK_DIR}/go/bin/openapi-gen ${GOPATH}/bin/
cp ${WORK_DIR}/go/bin/apiserver-boot ${GOPATH}/bin/
cp ${WORK_DIR}/go/bin/apiregister-gen ${GOPATH}/bin/

# Install the reference docs commands (apiserver-builder commands invoke these)
GOPATH=${WORK_DIR}/go/ go install github.com/kubernetes-incubator/reference-docs/gen-apidocs/...
cp ${WORK_DIR}/go/bin/openapi-gen ${GOPATH}/bin/
cp ${WORK_DIR}/go/bin/gen-apidocs ${GOPATH}/bin/

# More code generators
GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/lister-gen
Expand All @@ -46,3 +48,15 @@ cp ${WORK_DIR}/go/bin/lister-gen ${GOPATH}/bin/
GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/informer-gen
cp ${WORK_DIR}/go/bin/informer-gen ${GOPATH}/bin/

GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/client-gen
cp ${WORK_DIR}/go/bin/client-gen ${GOPATH}/bin/

GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/deepcopy-gen
cp ${WORK_DIR}/go/bin/deepcopy-gen ${GOPATH}/bin/

GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/conversion-gen
cp ${WORK_DIR}/go/bin/conversion-gen ${GOPATH}/bin/

GOPATH=${WORK_DIR}/go/ go install k8s.io/code-generator/cmd/defaulter-gen
cp ${WORK_DIR}/go/bin/defaulter-gen ${GOPATH}/bin/

Loading

0 comments on commit ed74085

Please sign in to comment.