Merge branch 'master' into fix-conflict

.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug-report.md

@@ -1,19 +1,19 @@
+---
+name: Bug Report
+about: Report a bug encountered with Kubernetes Website
+labels:
+- kind/bug
+---
+**This is a Bug Report**
+
 <!-- Thanks for filing an issue! Before submitting, please fill in the following information. -->
 <!-- See https://kubernetes.io/docs/contribute/start/ for guidance on writing an actionable issue description. -->
 
 <!--Required Information-->
-
-**This is a...** 
-<!-- choose one by changing [ ] to [x] -->
-- [ ] Feature Request
-- [ ] Bug Report
-
 **Problem:**
 
-
 **Proposed Solution:**
 
-
 **Page to Update:**
 https://kubernetes.io/...
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,18 @@
+---
+name: Feature Request
+about: Suggest a/an feature/enhancement to the Kubernetes Website project
+labels:
+- kind/feature
+---
+**This is a Feature Request**
+
+<!-- Please only use this template for submitting feature/enhancement requests -->
+<!-- See https://kubernetes.io/docs/contribute/start/ for guidance on writing an actionable issue description. -->
+
+**What would you like to be added**
+<!-- Describe as precisely as possible how this feature/enhancement should work from the user perspective. What should be changed, etc. -->
+
+**Why is this needed**
+
+**Comments**
+<!-- Any additional related comments that might help. Drawings/mockups would be extremely helpful (if required). -->

.github/ISSUE_TEMPLATE/support.md

@@ -0,0 +1,19 @@
+---
+name: Support Request
+about: Support request or question relating to Kubernetes Dashboard project
+labels:
+- triage/support
+---
+**This is Support**
+
+<!--
+STOP -- PLEASE READ!
+
+GitHub is not the right place for support requests.
+
+If you're looking for help, check [Stack Overflow](https://stackoverflow.com/questions/tagged/kubernetes)
+
+You can also post your question on the [Kubernetes Slack](http://slack.k8s.io/) or the [Discuss Kubernetes](https://discuss.kubernetes.io/) forum.
+
+If the matter is security related, please disclose it privately via https://kubernetes.io/security/.
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,11 @@
 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 > Please delete this note before submitting the pull request.
 >
-> For 1.14 Features: set Milestone to 1.14 and Base Branch to dev-1.14
+> For 1.15 Features: set Milestone to 1.15 and Base Branch to dev-1.15
 > 
-> For Chinese localization, base branch to release-1.12
+> For Chinese localization, base branch to release-1.14
 >
-> For Korean Localization: set Base Branch to dev-1.13-ko.<latest team milestone>
+> For Korean Localization: set Base Branch to dev-1.14-ko.\<latest team milestone>
 >
 > Help editing and submitting pull requests:
 > https://kubernetes.io/docs/contribute/start/#improve-existing-content.

Makefile

@@ -26,7 +26,7 @@ check-headers-file:
 
 production-build: check-hugo-versions build check-headers-file ## Build the production site and ensure that noindex headers aren't added
 
-non-production-build: check-hugo-versions ## Build the non-production site, which adds noindex headers to prevent indexing
+non-production-build: test-examples check-hugo-versions ## Build the non-production site, which adds noindex headers to prevent indexing
 	hugo --enableGitInfo
 
 sass-build:
@@ -36,7 +36,7 @@ sass-develop:
 	scripts/sass.sh develop
 
 serve: ## Boot the development server.
-	hugo server --ignoreCache --buildFuture
+	hugo server --buildFuture
 
 docker-image:
 	$(DOCKER) build . --tag $(DOCKER_IMAGE) --build-arg HUGO_VERSION=$(HUGO_VERSION)
@@ -47,12 +47,9 @@ docker-build:
 docker-serve:
 	$(DOCKER_RUN) -p 1313:1313 $(DOCKER_IMAGE) hugo server --buildFuture --bind 0.0.0.0
 
-# This command is used only by Travis CI; do not run this locally
-travis-hugo-build:
-	curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_linux-64bit.tar.gz | tar -xz
-	mkdir -p ${TRAVIS_HOME}/bin
-	mv hugo ${TRAVIS_HOME}/bin
-	export PATH=${TRAVIS_HOME}/bin:$PATH
+test-examples:
+	scripts/test_examples.sh install
+	scripts/test_examples.sh run
 
 check-hugo-versions:
 	scripts/hugo-version-check.sh $(HUGO_VERSION)

OWNERS

@@ -1,12 +1,10 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
-# Reviewers can /lgtm /approve but not sufficient for auto-merge without an
-# approver
 reviewers:
-- sig-docs-en-reviews 
+- sig-docs-en-reviews # Defined in OWNERS_ALIASES
 
-# Approvers have all the ability of reviewers but their /approve makes
-# auto-merge happen if a /lgtm exists, or vice versa, or they can do both
-# No need for approvers to also be listed as reviewers
 approvers:
-- sig-docs-en-owners
+- sig-docs-en-owners # Defined in OWNERS_ALIASES
+
+labels:
+- sig/docs