Merge branch 'master' into fix_help_for_init

Author: Phillip Wittrock

.gitignore

@@ -1 +1,4 @@
 .idea/
+
+# Not check in node_modules to a specific arch and os.
+docs/book/node_modules/

.travis.yml

@@ -22,8 +22,9 @@ install:
   -
 
 script:
-- TRACE=1 ./test.sh
+- TRACE=1 ./testv0.sh
 - ./test_existing_projects.sh
+- TRACE=1 ./testv1.sh
 
 # TBD. Suppressing for now.
 notifications:

CONTRIBUTING.md

@@ -3,9 +3,10 @@
 ## Sign the CLA
 
 Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests.
-Please see https://git.k8s.io/community/CLA.md for more info
 
-### Contributing A Patch
+Please see https://git.k8s.io/community/CLA.md for more info.
+
+## Contributing steps
 
 1. Submit an issue describing your proposed change to the repo in question.
 1. The [repo owners](OWNERS) will respond to your issue promptly.
@@ -15,31 +16,29 @@ Please see https://git.k8s.io/community/CLA.md for more info
 
 ## How to build kubebuilder locally
 
-Setup:
-
-- Download [google container builder](https://cloud.google.com/container-builder/docs/build-debug-locally)
-- Export `OUTPUT` to a location to write the directory containing the final build artifacts
-
-```sh
-export OUTPUT=/tmp/kubebuilder
-```
-
-Run container-builder:
-
-```sh
-container-builder-local --config=build/cloudbuild_local.yaml --dryrun=false \
-  --write-workspace=$OUTPUT .
-```
-
-Extract `tar.gz` from $OUTPUT to /usr/local
-
-## Running kubebuilder tests
-
-```sh
-go test ./pkg/...
-```
-
-## Community, discussion, contribution, and support
+1. Setup tools
+    1. Download and setup [gcloud](https://cloud.google.com/sdk/docs/downloads-interactive) 
+    1. Install `cloud-build-local` via `gcloud` 
+        ```bash
+        $ gcloud install cloud-build-local
+        ```
+1. Build
+    1. Export `OUTPUT` to a location to write the directory containing the final build artifacts
+        ```sh
+        $ export OUTPUT=/tmp/kubebuilder
+        ```
+    2. Run container-builder:
+        ```sh
+        $ cloud-build-local --config=build/cloudbuild_local.yaml --dryrun=false \
+          --write-workspace=$OUTPUT .
+        ```
+    1. Extract `tar.gz` from $OUTPUT to /usr/local
+1. Test
+    ```sh
+    go test ./pkg/...
+    ```
+
+## Community, discussion and support
 
 Learn how to engage with the Kubernetes community on the [community page](http://kubernetes.io/community/).
 
@@ -48,8 +47,6 @@ You can reach the maintainers of this project at:
 - [Slack](http://slack.k8s.io/)
 - [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-kubebuilder)
 
-### Code of conduct
+## Code of conduct
 
 Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md).
-
-[google container builder]: https://github.com/kubernetes-sigs/container-builder-local

Gopkg.lock

@@ -19,7 +19,13 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
             "github.com/emicklei/go-restful",
             "github.com/go-openapi/spec",
             "k8s.io/kube-openapi/pkg/common",
-            ]
+            # Workaround for https://github.com/golang/dep/issues/1306
+            "github.com/kubernetes/repo-infra/verify/boilerplate/test",
+           ]
+
+[[constraint]]
+  name = "github.com/kubernetes/repo-infra"
+  revision = "3c350a455362b622fe786e63f8f07b2a87f54f7b"
 
 [[constraint]]
   name = "sigs.k8s.io/testing_frameworks"
@@ -64,3 +70,7 @@ required = ["sigs.k8s.io/testing_frameworks/integration",
 [prune]
   go-tests = true
   unused-packages = true
+
+  [[prune.project]]
+  name = "github.com/kubernetes/repo-infra"
+  unused-packages = false

Gopkg.toml

@@ -1,25 +1,24 @@
 [![Build Status](https://travis-ci.org/kubernetes-sigs/kubebuilder.svg?branch=master)](https://travis-ci.org/kubernetes-sigs/kubebuilder "Travis")
 [![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/kubebuilder)](https://goreportcard.com/report/github.com/kubernetes-sigs/kubebuilder)
 
-*Don't use `go get` / `go install`, instead you MUST download a tar binary release or create your own release using
-the release program.*  To build your own release see [CONTRIBUTING.md](CONTRIBUTING.md)
-
-## `kubebuilder`
+## Kubebuilder
 
 Kubebuilder is a framework for building Kubernetes APIs using [custom resource definitions (CRDs)](https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions).
 
 **Note:** kubebuilder does not exist as an example to *copy-paste*, but instead provides powerful libraries and tools
 to simplify building and publishing Kubernetes APIs from scratch.
 
-### Download and Install
+### Installalation 
+
+It is strongly recommended that you use a released version. Release binaries are available on the [releases](https://github.com/kubernetes-sigs/kubebuilder/releases) page.
+Follow the [instructions](http://book.kubebuilder.io/getting_started/installation_and_setup.html) to install Kubebuilder.
 
-[Releases](https://github.com/kubernetes-sigs/kubebuilder/releases) are here
 
 ## Getting Started
 
 See the [Getting Started](http://book.kubebuilder.io/quick_start.html) documentation.
 
-![Quick Start](docs/gif/quickstart.gif)
+![Quick Start](docs/gif/quickstart-1.0.0.gif)
 
 ## Documentation
 
@@ -80,3 +79,8 @@ Before you file an issue, please search existing issues to see if your issue is
 
 - ### Slack
   For realtime discussion,  you can join the [#kubebuilder](https://slack.k8s.io/#kubebuilder) slack channel. Slack requires registration, but the Kubernetes team is open invitation to anyone to register here. Feel free to come and ask any questions.
+
+## Contributing
+Contributions are greatly appreciated. The maintainers actively manage the issues list, and try to highlight issues suitable for newcomers.
+The project follows the typical GitHub pull request model. See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
+Before starting any work, please either comment on an existing issue, or file a new one.

README.md

@@ -1,18 +1,17 @@
 #!/bin/bash
+# Copyright 2018 The Kubernetes Authors.
 #
-#  Copyright 2018 The Kubernetes Authors.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 set -e
 set -x

build/build_kubebuilder.sh

@@ -25,20 +25,20 @@ steps:
   args: [fetch, --tags, --depth=100]
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-linux:1.10.1"
+- name: "gcr.io/kubebuilder/thirdparty-linux:1.11.0"
   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.1"
+- name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
 - name: "ubuntu"
   args: ["bash", "build/build_vendor.sh"]
 - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
   args: ["bash", "build/build_kubebuilder.sh"]
   env:
-   - 'KUBERNETES_VERSION=1.10'
+   - 'KUBERNETES_VERSION=1.11'
   secretEnv: ['GITHUB_TOKEN']
 secrets:
 - kmsKeyName: projects/kubebuilder/locations/global/keyRings/kubebuilder-gh-tokens/cryptoKeys/gh-release-token

build/cloudbuild.yaml

@@ -23,12 +23,12 @@
 steps:
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-linux:1.10.1"
+- name: "gcr.io/kubebuilder/thirdparty-linux:1.11.0"
   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.1"
+- name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
 - name: "ubuntu"

build/cloudbuild_local.yaml

@@ -23,20 +23,20 @@
 steps:
 - name: "ubuntu"
   args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
-- name: "gcr.io/kubebuilder/thirdparty-linux:1.10.1"
+- name: "gcr.io/kubebuilder/thirdparty-linux:1.11.0"
   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.1"
+- name: "gcr.io/kubebuilder/thirdparty-darwin:1.11.0"
   args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
   dir: "_output/darwin_amd64"
 - name: "ubuntu"
   args: ["bash", "build/build_vendor.sh"]
 - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
   args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
   env:
-   - 'KUBERNETES_VERSION=1.10'
+   - 'KUBERNETES_VERSION=1.11'
 - name: 'gcr.io/cloud-builders/gsutil'
   args: ['-h', 'Content-Type:application/gzip', 'cp', '-a', 'public-read', 'dist/kubebuilder_master_linux_amd64.tar.gz', 'gs://kubebuilder-release/kubebuilder_master_linux_amd64.tar.gz']
 - name: 'gcr.io/cloud-builders/gsutil'

build/cloudbuild_snapshot.yaml

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

build/cloudbuild_tools.yaml

@@ -1,16 +1,16 @@
-#  Copyright 2018 The Kubernetes Authors.
+# Copyright 2018 The Kubernetes Authors.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 FROM node:6
 

build/gitbook/Dockerfile

@@ -0,0 +1,20 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    run: gitbook-1-0
+  name: gitbook-1-0
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      run: gitbook-1-0
+  template:
+    metadata:
+      labels:
+        run: gitbook-1-0
+    spec:
+      containers:
+      - image: gcr.io/kubebuilder/book1.0
+        imagePullPolicy: Always
+        name: gitbook

build/gitbook/config/deployment_new.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    run: gitbook-1-0
+  name: gitbook-1-0
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 80
+  selector:
+    run: gitbook-1-0
+  type: LoadBalancer

build/gitbook/config/service_new.yaml

@@ -1,21 +1,20 @@
 #!/bin/bash
+# Copyright 2018 The Kubernetes Authors.
 #
-#  Copyright 2018 The Kubernetes Authors.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 set -e
 set -x
 
 cd /workspace/_output/
-tar -czvf /workspace/kubebuilder-$VERSION-$GOOS-$GOARCH.tar.gz kubebuilder
+tar -czvf /workspace/kubebuilder-$VERSION-$GOOS-$GOARCH.tar.gz kubebuilder