Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged master into dev 1.21 - 1/13/21 #26083

Merged
merged 207 commits into from
Jan 14, 2021
Merged

Merged master into dev 1.21 - 1/13/21 #26083

merged 207 commits into from
Jan 14, 2021

Conversation

reylejano
Copy link
Member

Merge master into dev-1.21 to keep in sync - SIG-Release 1.21 Docs team 1/13/21

arman-personal and others added 30 commits November 2, 2020 22:30
@arman-personal
fix typo
71e501a 
tpyically -> typically
@PrakherS
Update pod-lifecycle.md
a2a2896 
Default for periodSeconds field of startupProbe resource is 10 seconds.

$ kubectl explain pod.spec.containers.startupProbe.periodSeconds
KIND:     Pod
VERSION:  v1

FIELD:    periodSeconds <integer>

DESCRIPTION:
     How often (in seconds) to perform the probe. Default to 10 seconds. Minimum
     value is 1.
@neha-viswanathan
short link for k8s cheat sheet
2ed094f
@lethe2211
Translate reference/kubectl/jsonpath/ into Japanese
332beb7
@lethe2211
Translate a table heading in reference/kubectl/jsonpath/ into Japanese
8e9b156
@lethe2211
Fix the case of kubectl in the beginning of sentences
2081989
expand nodelocaldns docs with IPv6
e1bd7c0
clairfy pod phase Terminating
9e9bb44 
Signed-off-by: Weiping Cai <weiping.cai@daocloud.io>
@lethe2211
Fix Japanese translation of "curly braces" in reference/kubectl/jsonpath
147a071
@lethe2211
Fix Japanese translation of "Use" in reference/kubectl/jsonpath
96ca298
@lethe2211
Fix Japanese translation of "Interpreted" in reference/kubectl/jsonpath
ad6896c
@lethe2211
Fix Japanese translation of a note in reference/kubectl/jsonpath
1050eea
Adding AKO (Avi Kubernetes Operator) to the list of ingress controllers
2ec4b1d
Update hello minikube tutorial intro page
0a2ec70
@smashse
Update docker-cli-to-kubectl.md
f4e15f3
@squarebracket
Fix minor typo
4d9cbb7
@bl-ue
Update 2020-12-02-dockershim-faq.md
7947cff 
Fix grammar
@bl-ue
Update 2020-12-02-dont-panic-kubernetes-and-docker.md
73adc5b 
Fix grammar
@mysunshine92
Update feature-gates description for TopologyManager
58c6e38
@stefanpetter
Applied suggested changes to create /etc/docker folder instead of sta…
f6e5496 
…rting the service

The "Set up the Docker daemon" step fails because the initial files have not been created. I copied the step of creating of the /etc/docker/ folder from the CentOS/RHEL instructions to the Ubuntu Instructions
@tomkivlin
monospaced --> unordered list
441cafe 
As mentioned in issue #25501.
@yue9944882
references api-priority-and-fairness slack channel
5ab0622
@lostsquirrel
Add missing word
31bbd71 
According to the content, it seems missing this word
@timosmit
Fixed link to configuring cgroup driver on control-plane node
6340f87
@pingtimeout
Clarify pod anti-affinity description
fc202da 
The code example uses `preferredDuringScheduling...`, as opposed to
`requiredDuringScheduling...`.  So the anti-affinity rule is a soft one.  It
says that the pod _should_ not be scheduled on [...] rather than that the pod
_cannot_ be scheduled on [...].
@EricMountain
Scheduling plugins: fix typo for clarity
a526871
Update kubeadm install page
9a386e5
Merge branch 'master' into kubeadm_inst
fcfe1b6
@philiplee13
Update README.md
cd72265 
update readme to include anchors
@mrbobbytables
Update blog team reviewers
8a0cf9f
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 13, 2021
@reylejano
Copy link
Member Author

/cc @annajung

@k8s-ci-robot k8s-ci-robot added the language/en Issues or PRs related to English language label Jan 13, 2021
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label Jan 13, 2021
@reylejano reylejano changed the base branch from master to dev-1.21 January 13, 2021 22:09
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 13, 2021
@netlify
Copy link

netlify bot commented Jan 13, 2021

✔️ Deploy preview for kubernetes-io-master-staging ready!

🔨 Explore the source changes: eab2200

🔍 Inspect the deploy logs: https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5fff6f27d6403600086b93cc

😎 Browse the preview: https://deploy-preview-26083--kubernetes-io-master-staging.netlify.app

@annajung
Copy link
Contributor

There are two commits with build errors which were resolved in the same PR

f51174d was resolved as you can see from here https://github.com/kubernetes/website/pull/25843/commits

9a386e5 was resolved as you can see from here https://github.com/kubernetes/website/pull/25489/commits

/lgtm

Thanks Rey!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 13, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 44ecba0ef3a9d738a64a1b1e1f7f0d5137dcc0bc

@savitharaghunathan
Copy link
Member

02c26ab is related to https://github.com/kubernetes/website/pull/25489/commits which looks resolved as well.

@kbhawkey
Copy link
Contributor

kbhawkey commented Jan 14, 2021 •
edited
Loading

Hi @reylejano .
Any insight into PR #25489 and the deployment error/warnings:

WARN 2021/01/07 14:30:39 Failed to get translated string for language "pt" and ID "post_last_mod": %!s(<nil>)
9:30:39 AM: WARN 2021/01/07 14:30:39 Failed to get translated string for language "pt" and ID "post_edit_this": %!s(<nil>)
9:30:39 AM: WARN 2021/01/07 14:30:39 Failed to get translated string for language "pt" and ID "post_create_issue": %!s(<nil>)

Earlier today I tested a local build of the docs and saw these warnings.
I see the variables in the file, /website/themes/docsy/i18n/pt-br.toml.
Could be issue with pt-br vs. /website/i18n/pt.toml.

@kbhawkey
Copy link
Contributor

/lgtm

@kbhawkey
Copy link
Contributor

kbhawkey commented Jan 14, 2021 •
edited
Loading

I logged an issue with the theme for the warnings.

@kbhawkey
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kbhawkey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 14, 2021
@k8s-ci-robot k8s-ci-robot merged commit 14d97e0 into kubernetes:dev-1.21 Jan 14, 2021
@k8s-ci-robot k8s-ci-robot added this to the 1.21 milestone Jan 14, 2021
@reylejano reylejano deleted the merged-master-dev-1.21 branch January 15, 2021 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@celestehorgan celestehorgan Awaiting requested review from celestehorgan

@jimangel jimangel Awaiting requested review from jimangel

@annajung annajung Awaiting requested review from annajung

Assignees

@kbhawkey kbhawkey

@annajung annajung

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
1.21
Development

Successfully merging this pull request may close these issues.