Merge branch 'master' into k8s_an

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**1. What `kops` version are you running? The command `kops version`, will display
+ this information.**
+
+**2. What Kubernetes version are you running? `kubectl version` will print the
+ version if a cluster is running or provide the Kubernetes version specified as
+ a `kops` flag.**
+
+**3. What cloud provider are you using?**
+
+**4. What commands did you run?  What is the simplest way to reproduce this issue?**
+
+**5. What happened after the commands executed?**
+
+**6. What did you expect to happen?**
+
+**7. Please provide your cluster manifest. Execute
+  `kops get --name my.example.com -o yaml` to display your cluster manifest.
+  You may want to remove your cluster name and other sensitive information.**
+
+**8. Please run the commands with most verbose logging by adding the `-v 10` flag.
+  Paste the logs into this report, or in a gist and provide the gist link here.**
+
+**9. Anything else do we need to know?**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,8 @@
+---
+name: Feature Request
+about: Help us identify features you need
+---
+
+**1. Describe IN DETAIL the feature/behavior/change you would like to see.**
+
+**2. Feel free to provide a design supporting your feature request.**

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,24 @@
+<!--
+Thanks for contributing to kubernetes/kops!  Here are some tips for you:
+1. If this is your first time, read our contributor guidelines:
+
+ https://git.k8s.io/kops/CONTRIBUTING.md
+
+2. Also, you'll probably want to checkout our development documentation:
+
+https://git.k8s.io/kops/docs/development
+
+3. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests
+
+4. Finally, make sure all verifications and tests pass by running:
+```
+ make pr
+```
+-->
+
+**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)*:
+
+
+**Special notes for your reviewer**:

.gitignore

@@ -1,3 +1,6 @@
+# git mergetool
+*.orig
+
 # Go embed files?
 *.go-e
 
@@ -81,3 +84,8 @@ default.etcd
 
 # Ignore awesome_bot markdown links check output
 ab-results-*.json
+
+# Ignore documentation site
+site
+
+addons/prometheus-operator/tmp # cloned git repo

.shipbot.yaml

@@ -9,7 +9,7 @@ assets:
     githubName: kops-linux-amd64
   - source: .build/dist/linux/amd64/kops.sha1
     githubName: kops-linux-amd64-sha1
-#  - source: .build/dist/windows/amd64/kops.exe
-#    githubName: kops-windows-amd64
-#  - source: .build/dist/windows/amd64/kops.exe.sha1
-#    githubName: kops-windows-amd64-sha1
+  - source: .build/dist/windows/amd64/kops.exe
+    githubName: kops-windows-amd64
+  - source: .build/dist/windows/amd64/kops.exe.sha1
+    githubName: kops-windows-amd64-sha1

.travis.yml

@@ -3,11 +3,12 @@ os:
   - linux
   - osx
 go:
-  - 1.8
-  - 1.9
+  # 1.8 & 1.9 are now best-effort; we recommend 1.10; k8s apimachinery relies on 1.10
+  # - 1.8
+  # - 1.9
+  - "1.10"
 
 go_import_path: k8s.io/kops
 
 script:
   - make ci
-  - hack/verify-apimachinery.sh

BUILD.bazel

@@ -1,8 +1,10 @@
-package(default_visibility = ["//visibility:public"])
+# gazelle:prefix k8s.io/kops
+
+load("@bazel_gazelle//:def.bzl", "gazelle")
 
-load("@io_bazel_rules_go//go:def.bzl", "gazelle", "go_library", "go_prefix")
+package(default_visibility = ["//visibility:public"])
 
-go_prefix("k8s.io/kops")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 gazelle(
     name = "gazelle",

CONTRIBUTING.md

@@ -24,7 +24,7 @@ Follow either of the two links above to access the appropriate CLA and instructi
 
 ### Adding dependencies
 
-If your patch depends on new packages, follow the [instructions to add a dependency](/docs/development/dependencies.md).
+If your patch depends on new packages, follow the [instructions to add a dependency](/docs/development/vendoring.md#adding-a-dependency-to-the-vendor-directory).
 
 ## Bug reporting