Merge pull request #126 from pwittrock/docs-gen

Stop using apiserver for generating docs

Author: Phillip Wittrock

Gopkg.lock

@@ -15,7 +15,11 @@
 # Packages required by users
 required = ["sigs.k8s.io/testing_frameworks/integration",
             "k8s.io/client-go/plugin/pkg/client/auth",
-            "github.com/spf13/pflag"]
+            "github.com/spf13/pflag",
+            "github.com/emicklei/go-restful",
+            "github.com/go-openapi/spec",
+            "k8s.io/kube-openapi/pkg/common",
+            ]
 
 [[constraint]]
   name = "sigs.k8s.io/testing_frameworks"

Gopkg.toml

@@ -25,12 +25,12 @@ steps:
   args: [fetch, --depth=100]
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-linux:1.10"
+- name: "gcr.io/kubebuilder/thirdparty-linux:1.10.1"
   args: ["tar", "-xzvf", "/kubebuilder_linux_amd64.tar.gz"]
   dir: "_output/linux_amd64"
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/darwin_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10"
+- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10.1"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
 - name: "ubuntu"

build/apiserverbuilder/Dockerfile

@@ -23,12 +23,12 @@
 steps:
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-linux:1.10"
+- name: "gcr.io/kubebuilder/thirdparty-linux:1.10.1"
   args: ["tar", "-xzvf", "/kubebuilder_linux_amd64.tar.gz"]
   dir: "_output/linux_amd64"
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/darwin_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10"
+- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10.1"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
 - name: "ubuntu"

build/apiserverbuilder/docs.sh

@@ -23,12 +23,12 @@
 steps:
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-linux:1.10"
+- name: "gcr.io/kubebuilder/thirdparty-linux:1.10.1"
   args: ["tar", "-xzvf", "/kubebuilder_linux_amd64.tar.gz"]
   dir: "_output/linux_amd64"
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/darwin_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10"
+- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10.1"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
 - name: "ubuntu"

build/cloudbuild.yaml

@@ -13,7 +13,7 @@
 #  limitations under the License.
 
 steps:
-- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.10"
+- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.10.1"
   args: ["cp", "/kubebuilder_${_GOOS}_${_GOARCH}.tar.gz", "/workspace/kubebuilder-${TAG_NAME}-${_GOOS}-${_GOARCH}.tar.gz"]
   env:
   - 'GOOS=${_GOOS}'

build/cloudbuild_local.yaml

@@ -85,7 +85,7 @@ ENV GOOS darwin
 ENV GOARCH amd64
 ENV DEST /usr/local/kubebuilder/bin/
 RUN mkdir -p $DEST || echo ""
-RUN git clone https://github.com/kubernetes-incubator/reference-docs $GOPATH/src/github.com/kubernetes-incubator/reference-docs --depth=1
+RUN git clone https://github.com/kubernetes-incubator/reference-docs $GOPATH/src/github.com/kubernetes-incubator/reference-docs --branch kubebuilder  --depth=1
 RUN go build -o $DEST/gen-apidocs github.com/kubernetes-incubator/reference-docs/gen-apidocs
 
 # Copy all binaries into a single tar.gz file

build/cloudbuild_snapshot.yaml

@@ -68,7 +68,7 @@ ENV GOOS linux
 ENV GOARCH amd64
 ENV DEST /usr/local/kubebuilder/bin/
 RUN mkdir -p $DEST || echo ""
-RUN git clone https://github.com/kubernetes-incubator/reference-docs $GOPATH/src/github.com/kubernetes-incubator/reference-docs --depth=1
+RUN git clone https://github.com/kubernetes-incubator/reference-docs $GOPATH/src/github.com/kubernetes-incubator/reference-docs --branch kubebuilder --depth=1
 RUN go build -o $DEST/gen-apidocs github.com/kubernetes-incubator/reference-docs/gen-apidocs
 
 FROM golang:1.10-stretch as linux