Skip to content

Commit 041daa4

Browse files
emedinaemedina
committed
Merge branch 'master' of https://github.com/kubernetes/website into es/docs/concepts_workloads_controllers/jobs-run_and_replicaset
2 parents edad9d9 + 4092436 commit 041daa4

File tree

4,380 files changed

+419835
-435556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,380 files changed

+419835
-435556
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ charset = utf-8
55
max_line_length = 80
66
trim_trailing_whitespace = true
77

8-
[*.{html,js,json,sass,md,mmark,toml,yaml}]
8+
[*.{css,html,js,json,sass,md,mmark,toml,yaml}]
99
indent_style = space
1010
indent_size = 2
1111

‎.github/ISSUE_TEMPLATE/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Support Request
3-
about: Support request or question relating to Kubernetes Dashboard project
3+
about: Support request or question relating to Kubernetes Website project
44
labels:
55
- triage/support
66
---

‎.github/PULL_REQUEST_TEMPLATE.md

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

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
**/.DS_Store
22
**/desktop.ini
33
_site/**
4-
.sass-cache/**
54
CNAME
65
.travis.yml
76
.idea/
@@ -34,4 +33,4 @@ resources/
3433
# Netlify Functions build output
3534
package-lock.json
3635
functions/
37-
node_modules/
36+
node_modules/

‎.htmltest.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
DirectoryPath: public/docs
2+
IgnoreDirectoryMissingTrailingSlash: true
3+
CheckExternal: false
4+
IgnoreAltMissing: true
5+
CheckImages: false
6+
CheckScripts: false
7+
CheckMeta: false
8+
CheckMetaRefresh: false
9+
CheckLinks: false
10+
EnforceHTML5: false
11+
EnforceHTTPS: false
12+
IgnoreDirectoryMissingTrailingSlash: false
13+
IgnoreInternalEmptyHash: true
14+
IgnoreEmptyHref: true
15+
IgnoreDirs:
16+
- "reference/generated/kubernetes-api"

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
FROM alpine:latest
88

9-
MAINTAINER Luc Perkins <[email protected]>
9+
LABEL maintainer="Luc Perkins <[email protected]>"
1010

1111
RUN apk add --no-cache \
1212
curl \
@@ -20,7 +20,7 @@ ARG HUGO_VERSION
2020

2121
RUN mkdir -p /usr/local/src && \
2222
cd /usr/local/src && \
23-
curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_linux-64bit.tar.gz | tar -xz && \
23+
curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz | tar -xz && \
2424
mv hugo /usr/local/bin/hugo && \
2525
addgroup -Sg 1000 hugo && \
2626
adduser -Sg hugo -u 1000 -h /src hugo

‎Makefile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
DOCKER = docker
2-
HUGO_VERSION = 0.53
2+
HUGO_VERSION = $(shell grep ^HUGO_VERSION netlify.toml | tail -n 1 | cut -d '=' -f 2 | tr -d " \"\n")
33
DOCKER_IMAGE = kubernetes-hugo
44
DOCKER_RUN = $(DOCKER) run --rm --interactive --tty --volume $(CURDIR):/src
55
NODE_BIN = node_modules/.bin
66
NETLIFY_FUNC = $(NODE_BIN)/netlify-lambda
77

8-
.PHONY: all build sass build-preview help serve
8+
.PHONY: all build build-preview help serve
99

1010
help: ## Show this help.
1111
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
@@ -18,38 +18,43 @@ build: ## Build site with production settings and put deliverables in ./public
1818
build-preview: ## Build site with drafts and future posts enabled
1919
hugo --buildDrafts --buildFuture
2020

21+
deploy-preview: ## Deploy preview site via netlify
22+
hugo --enableGitInfo --buildFuture -b $(DEPLOY_PRIME_URL)
23+
2124
functions-build:
2225
$(NETLIFY_FUNC) build functions-src
2326

2427
check-headers-file:
2528
scripts/check-headers-file.sh
2629

27-
production-build: check-hugo-versions build check-headers-file ## Build the production site and ensure that noindex headers aren't added
30+
production-build: build check-headers-file ## Build the production site and ensure that noindex headers aren't added
2831

29-
non-production-build: test-examples check-hugo-versions ## Build the non-production site, which adds noindex headers to prevent indexing
32+
non-production-build: ## Build the non-production site, which adds noindex headers to prevent indexing
3033
hugo --enableGitInfo
3134

32-
sass-build:
33-
scripts/sass.sh build
34-
35-
sass-develop:
36-
scripts/sass.sh develop
37-
3835
serve: ## Boot the development server.
3936
hugo server --buildFuture
4037

4138
docker-image:
42-
$(DOCKER) build . --tag $(DOCKER_IMAGE) --build-arg HUGO_VERSION=$(HUGO_VERSION)
39+
$(DOCKER) build . \
40+
--network=host \
41+
--tag $(DOCKER_IMAGE) \
42+
--build-arg HUGO_VERSION=$(HUGO_VERSION)
4343

4444
docker-build:
4545
$(DOCKER_RUN) $(DOCKER_IMAGE) hugo
4646

4747
docker-serve:
48-
$(DOCKER_RUN) -p 1313:1313 $(DOCKER_IMAGE) hugo server --buildFuture --bind 0.0.0.0
48+
$(DOCKER_RUN) --mount type=tmpfs,destination=/src/resources,tmpfs-mode=0755 -p 1313:1313 $(DOCKER_IMAGE) hugo server --buildFuture --bind 0.0.0.0
4949

5050
test-examples:
5151
scripts/test_examples.sh install
5252
scripts/test_examples.sh run
5353

54-
check-hugo-versions:
55-
scripts/hugo-version-check.sh $(HUGO_VERSION)
54+
.PHONY: link-checker-setup
55+
link-checker-image-pull:
56+
docker pull wjdp/htmltest
57+
58+
docker-internal-linkcheck: link-checker-image-pull
59+
$(DOCKER_RUN) $(DOCKER_IMAGE) hugo --config config.toml,linkcheck-config.toml --buildFuture
60+
$(DOCKER) run --mount type=bind,source=$(CURDIR),target=/test --rm wjdp/htmltest htmltest

‎OWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,11 @@ reviewers:
66
approvers:
77
- sig-docs-en-owners # Defined in OWNERS_ALIASES
88

9+
emeritus_approvers:
10+
# chenopis, you're welcome to return when you're ready to resume PR wrangling
11+
# jaredbhatti, you're welcome to return when you're ready to resume PR wrangling
12+
# stewart-yu, you're welcome to return when you're ready to resume PR wrangling
13+
- stewart-yu
14+
915
labels:
10-
- sig/docs
16+
- sig/docs

0 commit comments

Comments
 (0)