Merge branch 'master' of https://github.com/kubernetes/website into es/docs/concepts_workloads_controllers/deployment_and_gc

Author: emedina

.editorconfig

@@ -5,7 +5,7 @@ charset = utf-8
 max_line_length = 80
 trim_trailing_whitespace = true
 
-[*.{html,js,json,sass,md,mmark,toml,yaml}]
+[*.{css,html,js,json,sass,md,mmark,toml,yaml}]
 indent_style = space
 indent_size = 2
 

.github/ISSUE_TEMPLATE/support.md

@@ -1,6 +1,6 @@
 ---
 name: Support Request
-about: Support request or question relating to Kubernetes Dashboard project
+about: Support request or question relating to Kubernetes Website project
 labels:
 - triage/support
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,22 @@
->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> Remember to delete this note before submitting your pull request.
->
-> For pull requests on 1.15 Features: set Milestone to 1.15 and Base Branch to dev-1.15
-> 
-> For pull requests on Chinese localization, set Base Branch to release-1.14
->
-> For pull requests on Korean Localization: set Base Branch to dev-1.14-ko.\<latest team milestone>
->
-> If you need Help on editing and submitting pull requests, visit:
-> https://kubernetes.io/docs/contribute/start/#improve-existing-content.
->
-> If you need Help on choosing which branch to use, visit:
-> https://kubernetes.io/docs/contribute/start#choose-which-git-branch-to-use.
->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->
+<!-- 🛈
+
+ Hello!
+
+ Remember to ADD A DESCRIPTION and delete this note before submitting
+ your pull request. The description should explain what will change,
+ and why.
+
+ PLEASE title the FIRST commit appropriately, so that if you squash all
+ your commits into one, the combined commit message makes sense.
+ For overall help on editing and submitting pull requests, visit:
+  https://kubernetes.io/docs/contribute/start/#improve-existing-content
+
+ Use the default base branch, “master”, if you're documenting existing
+ features in the English localization.
+
+ If you're working on a different localization (not English), or you
+ are documenting a feature that will be part of a future release, see
+ https://kubernetes.io/docs/contribute/new-content/overview/#choose-which-git-branch-to-use
+ for advice.
+
+-->

.gitignore

@@ -33,4 +33,4 @@ resources/
 # Netlify Functions build output
 package-lock.json
 functions/
-node_modules/
+node_modules/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "themes/docsy"]
+	path = themes/docsy
+	url = https://github.com/google/docsy.git

.htmltest.yml

@@ -0,0 +1,16 @@
+DirectoryPath: public/docs
+IgnoreDirectoryMissingTrailingSlash: true
+CheckExternal: false
+IgnoreAltMissing: true
+CheckImages: false
+CheckScripts: false
+CheckMeta: false
+CheckMetaRefresh: false
+CheckLinks: false
+EnforceHTML5: false
+EnforceHTTPS: false
+IgnoreDirectoryMissingTrailingSlash: false
+IgnoreInternalEmptyHash: true
+IgnoreEmptyHref: true
+IgnoreDirs:
+  - "reference/generated/kubernetes-api"

Dockerfile

@@ -6,7 +6,7 @@
 
 FROM alpine:latest
 
-MAINTAINER Luc Perkins <[email protected]>
+LABEL maintainer="Luc Perkins <[email protected]>"
 
 RUN apk add --no-cache \
     curl \

Makefile

@@ -1,9 +1,16 @@
-DOCKER       = docker
-HUGO_VERSION = 0.53
-DOCKER_IMAGE = kubernetes-hugo
-DOCKER_RUN   = $(DOCKER) run --rm --interactive --tty --volume $(CURDIR):/src
-NODE_BIN     = node_modules/.bin
-NETLIFY_FUNC = $(NODE_BIN)/netlify-lambda
+HUGO_VERSION      = $(shell grep ^HUGO_VERSION netlify.toml | tail -n 1 | cut -d '=' -f 2 | tr -d " \"\n")
+NODE_BIN          = node_modules/.bin
+NETLIFY_FUNC      = $(NODE_BIN)/netlify-lambda
+
+# The CONTAINER_ENGINE variable is used for specifying the container engine. By default 'docker' is used
+# but this can be overridden when calling make, e.g.
+# CONTAINER_ENGINE=podman make container-image
+CONTAINER_ENGINE ?= docker
+CONTAINER_IMAGE   = kubernetes-hugo
+CONTAINER_RUN     = $(CONTAINER_ENGINE) run --rm --interactive --tty --volume $(CURDIR):/src
+
+CCRED=\033[0;31m
+CCEND=\033[0m
 
 .PHONY: all build build-preview help serve
 
@@ -18,32 +25,60 @@ build: ## Build site with production settings and put deliverables in ./public
 build-preview: ## Build site with drafts and future posts enabled
 	hugo --buildDrafts --buildFuture
 
+deploy-preview: ## Deploy preview site via netlify
+	hugo --enableGitInfo --buildFuture -b $(DEPLOY_PRIME_URL)
+
 functions-build:
 	$(NETLIFY_FUNC) build functions-src
 
 check-headers-file:
 	scripts/check-headers-file.sh
 
-production-build: check-hugo-versions build check-headers-file ## Build the production site and ensure that noindex headers aren't added
+production-build: 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: ## Build the non-production site, which adds noindex headers to prevent indexing
 	hugo --enableGitInfo
 
 serve: ## Boot the development server.
 	hugo server --buildFuture
 
 docker-image:
-	$(DOCKER) build . --tag $(DOCKER_IMAGE) --build-arg HUGO_VERSION=$(HUGO_VERSION)
+	@echo -e "$(CCRED)**** The use of docker-image is deprecated. Use container-image instead. ****$(CCEND)"
+	$(MAKE) container-image
 
 docker-build:
-	$(DOCKER_RUN) $(DOCKER_IMAGE) hugo
+	@echo -e "$(CCRED)**** The use of docker-build is deprecated. Use container-build instead. ****$(CCEND)"
+	$(MAKE) container-build
 
 docker-serve:
-	$(DOCKER_RUN) -p 1313:1313 $(DOCKER_IMAGE) hugo server --buildFuture --bind 0.0.0.0
+	@echo -e "$(CCRED)**** The use of docker-serve is deprecated. Use container-serve instead. ****$(CCEND)"
+	$(MAKE) container-serve
+
+container-image:
+	$(CONTAINER_ENGINE) build . \
+		--network=host \
+		--tag $(CONTAINER_IMAGE) \
+		--build-arg HUGO_VERSION=$(HUGO_VERSION)
+
+container-build:
+	$(CONTAINER_RUN) $(CONTAINER_IMAGE) hugo
+
+container-serve:
+	$(CONTAINER_RUN) --mount type=tmpfs,destination=/src/resources,tmpfs-mode=0755 -p 1313:1313 $(CONTAINER_IMAGE) hugo server --buildFuture --bind 0.0.0.0
 
 test-examples:
 	scripts/test_examples.sh install
 	scripts/test_examples.sh run
 
-check-hugo-versions:
-	scripts/hugo-version-check.sh $(HUGO_VERSION)
+.PHONY: link-checker-setup
+link-checker-image-pull:
+	$(CONTAINER_ENGINE) pull wjdp/htmltest
+
+docker-internal-linkcheck:
+	@echo -e "$(CCRED)**** The use of docker-internal-linkcheck is deprecated. Use container-internal-linkcheck instead. ****$(CCEND)"
+	$(MAKE) container-internal-linkcheck
+
+container-internal-linkcheck: link-checker-image-pull
+	$(CONTAINER_RUN) $(CONTAINER_IMAGE) hugo --config config.toml,linkcheck-config.toml --buildFuture
+	$(CONTAINER_ENGINE) run --mount type=bind,source=$(CURDIR),target=/test --rm wjdp/htmltest htmltest
+

OWNERS

@@ -7,8 +7,10 @@ approvers:
 - sig-docs-en-owners # Defined in OWNERS_ALIASES
 
 emeritus_approvers:
-- chenopis
-- jaredbhatti
+# chenopis, you're welcome to return when you're ready to resume PR wrangling
+# jaredbhatti, you're welcome to return when you're ready to resume PR wrangling
+# stewart-yu, you're welcome to return when you're ready to resume PR wrangling
+- stewart-yu 
 
 labels:
-- sig/docs
+- sig/docs