Merge pull request #1 from kubernetes/master

update from base repository

.generated_files

@@ -24,7 +24,6 @@ file-name	types_swagger_doc_generated.go
 
 path-prefix	Godeps/
 path-prefix	vendor/
-path-prefix	api/swagger-spec/
 path-prefix	pkg/generated/
 
 paths-from-repo	docs/.generated_docs

.gitattributes

@@ -6,6 +6,4 @@ test/test_owners.csv merge=union
 **/generated.pb.go linguist-generated=true
 **/generated.proto
 **/types_swagger_doc_generated.go linguist-generated=true
-docs/api-reference/** linguist-generated=true
-api/swagger-spec/*.json linguist-generated=true
 api/openapi-spec/*.json linguist-generated=true

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,6 +1,7 @@
 ---
 name: Bug Report
 about: Report a bug encountered while operating Kubernetes
+labels: kind/bug
 
 ---
 
@@ -22,6 +23,3 @@ about: Report a bug encountered while operating Kubernetes
 - Kernel (e.g. `uname -a`):
 - Install tools:
 - Others:
-
-<!-- DO NOT EDIT BELOW THIS LINE -->
-/kind bug

.github/ISSUE_TEMPLATE/enhancement.md

@@ -1,13 +1,11 @@
 ---
 name: Enhancement Request
 about: Suggest an enhancement to the Kubernetes project
+labels: kind/feature
 
 ---
 <!-- Please only use this template for submitting enhancement requests -->
 
 **What would you like to be added**:
 
 **Why is this needed**:
-
-<!-- DO NOT EDIT BELOW THIS LINE -->
-/kind feature

.github/ISSUE_TEMPLATE/failing-test.md

@@ -1,6 +1,7 @@
 ---
 name: Failing Test
 about: Report test failures in Kubernetes CI jobs
+labels: kind/failing-test
 
 ---
 
@@ -17,6 +18,3 @@ about: Report test failures in Kubernetes CI jobs
 **Reason for failure**:
 
 **Anything else we need to know**:
-
-<!-- DO NOT EDIT BELOW THIS LINE -->
-/kind failing-test

.github/ISSUE_TEMPLATE/support.md

@@ -1,6 +1,7 @@
 ---
 name: Support Request
 about: Support request or question relating to Kubernetes
+labels: triage/support
 
 ---
 
@@ -15,8 +16,3 @@ You can also post your question on the [Kubernetes Slack](http://slack.k8s.io/)
 
 If the matter is security related, please disclose it privately via https://kubernetes.io/security/.
 -->
-
-<!-- DO NOT EDIT BELOW THIS LINE -->
-
-/triage support
-

.github/OWNERS

@@ -1,7 +1,10 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 reviewers:
   - castrojo
   - cblecker
   - grodrigues3
+  - nikhita
   - parispittman
   - Phillels
 approvers:
@@ -10,3 +13,5 @@ approvers:
   - grodrigues3
   - parispittman
   - Phillels
+labels:
+  - sig/contributor-experience

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,6 @@
 <!--  Thanks for sending a pull request!  Here are some tips for you:
-1. If this is your first time, read our contributor guidelines https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide
+
+1. If this is your first time, please read our contributor guidelines: https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide
 2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request. For reference on required PR/issue labels, read here:
 https://git.k8s.io/community/contributors/devel/release.md#issue-kind-label
 3. Ensure you have added or ran the appropriate tests for your PR: https://git.k8s.io/community/contributors/devel/testing.md
@@ -9,7 +10,7 @@ https://git.k8s.io/community/contributors/devel/release.md#issue-kind-label
 -->
 
 **What type of PR is this?**
-> Uncomment only one, leave it on its own line:
+> Uncomment only one ` /kind <>` line, hit enter to put that in a new line, and remove leading whitespaces from that line:
 >
 > /kind api-change
 > /kind bug
@@ -22,17 +23,21 @@ https://git.k8s.io/community/contributors/devel/release.md#issue-kind-label
 
 **What this PR does / why we need it**:
 
-**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
+**Which issue(s) this PR fixes**:
+<!-- 
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
+-->
 Fixes #
 
 **Special notes for your reviewer**:
 
 **Does this PR introduce a user-facing change?**:
 <!--  
-If no, just write "NONE".
+If no, just write "NONE" in the release-note block below.
 If yes, a release note is required:
 Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
-2. 
 -->
 ```release-note
 

.gitignore

@@ -127,3 +127,6 @@ zz_generated_*_test.go
 
 /bazel-*
 *.pyc
+
+# generated by verify-godeps.sh
+vendordiff.patch