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

Jump to bottom

Fix broken api-reference docs in 1.0 branch #16228

Merged
merged 4 commits into from
Oct 26, 2015
Merged

Fix broken api-reference docs in 1.0 branch #16228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6eede34
Fix broken links in types.go
thockin Oct 24, 2015
8863b64
Update swagger spec
thockin Oct 24, 2015
2f1826d
Retool gen-swagger-doc process to be repo-local
thockin Oct 24, 2015
e95683b
Regenerate api-reference docs
thockin Oct 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
452 changes: 226 additions & 226 deletions api/swagger-spec/v1.json
View file
Open in desktop

Large diffs are not rendered by default.

517 changes: 262 additions & 255 deletions docs/api-reference/definitions.html
View file
Open in desktop

Large diffs are not rendered by default.

5,222 changes: 1,981 additions & 3,241 deletions docs/api-reference/operations.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hack/gen-swagger-doc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ COPY gen-swagger-docs.sh build/

#run the script once to download the dependent java libraries into the image
RUN mkdir /output
RUN build/gen-swagger-docs.sh https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/api/swagger-spec/v1.json https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/v1/register.go
RUN build/gen-swagger-docs.sh /dev/null /dev/null || true

ENTRYPOINT ["build/gen-swagger-docs.sh"]
4 changes: 2 additions & 2 deletions hack/gen-swagger-doc/gen-swagger-docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ echo $2

cd /build/

wget "$1" -O input.json
wget "$2" -O register.go
cp "$1" input.json
cp "$2" register.go

./gradle-2.5/bin/gradle gendocs --info

Expand Down
9 changes: 7 additions & 2 deletions hack/gen-swagger-doc/run-gen-swagger-docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@

if [ "$#" -lt 1 ]; then
echo "Usage: run-gen-swagger-docs.sh <API version> <absolute output path, default to PWD>"
exit
exit
fi
OUTPUT=${2:-${PWD}}

docker run -v ${OUTPUT}:/output gcr.io/google_containers/gen-swagger-docs:v1 https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/api/swagger-spec/$1.json https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/$1/register.go
KUBE_ROOT=$(realpath $(dirname "${BASH_SOURCE}")/../..)

docker run \
-v ${OUTPUT}:/output \
-v ${KUBE_ROOT}:/kube \
gcr.io/google_containers/gen-swagger-docs:v1 /kube/api/swagger-spec/$1.json /kube/pkg/api/$1/register.go

334 changes: 167 additions & 167 deletions pkg/api/v1/types.go
View file
Open in desktop

Large diffs are not rendered by default.