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.

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

Merge main into dev-1.22 to keep in sync 22/06/2021 #28569

Merged
merged 195 commits into from
Jun 24, 2021

Conversation

PI-Victor
Copy link
Member

/cc @ashnehete @carlisia @chrisnegus @ritpanjw
Weekly branch sync done early because i didn't have time to do it last week, this also fixes the integration branch, since it has a trivial conflict.

ameukam and others added 30 commits October 6, 2020 00:42
As suggested by BenTheElder, we need to add a cloudbuild.yaml spec that
will be used by the prow job to automate the container build and push
the tags.

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
We *can* use field selectors across multiple resource types.
cmd => command for more accurate
Pykube is archived and not maintained anymore.
This update modifies the "pods-per-node" recommendation to align with the default Kubernetes setting of 110 pods per node.
Typo issue in Korean
break long lines

simplify wording (suggested by neolit123)

phrasing error/typo

don't mention creating a new kuebadm config file, not really relevant here

remove unnecessary stop from kubelet cert troubleshoot

minor phrasing improvement: *the* kublet

make the steps for fixing kubelet certs separate from other troubleshooting suggestions

move kubelet cert troubleshooting to a better place

improve note wording and add link

add missing dot

Co-authored-by: Lubomir I. Ivanov <neolit123@gmail.com>

add missing dot

Co-authored-by: Lubomir I. Ivanov <neolit123@gmail.com>

remove steps not related to the issue

Make instructions work on worker nodes too

Co-authored-by: Lubomir I. Ivanov <neolit123@gmail.com>
The output from `minikube addons enable` in the documentation should match the output from the current version of minikube (which is also in katakoda)
@netlify
Copy link

netlify bot commented Jun 22, 2021

👷 Deploy Preview for kubernetes-io-vnext-staging processing.

🔨 Explore the source changes: 1064c8d

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/60d2248d637dd60007e6c9fe

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. area/blog Issues or PRs related to the Kubernetes Blog subproject area/release-eng Issues or PRs related to the Release Engineering subproject language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/uk Issues or PRs related to Ukrainian language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. sig/release Categorizes an issue or PR as relevant to SIG Release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 22, 2021
@PI-Victor
Copy link
Member Author

PI-Victor commented Jun 22, 2021

all the topology manager related fails were fixed in the last commit in #28075 .

5a5c96b was fixed in #28434

@PI-Victor PI-Victor changed the title Merged main into dev 1.22 to keep in sync 22/06/2021 Merge main into dev 1.22 to keep in sync 22/06/2021 Jun 22, 2021
@PI-Victor PI-Victor changed the title Merge main into dev 1.22 to keep in sync 22/06/2021 Merge main into dev-1.22 to keep in sync 22/06/2021 Jun 22, 2021
@reylejano
Copy link
Member

/lgtm

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

LGTM label has been added.

Git tree hash: 8c9d74b37c25006122c2b703ec6b9174ae73e270

@kbhawkey
Copy link
Contributor

Thanks @PI-Victor .
/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 Jun 24, 2021
@k8s-ci-robot k8s-ci-robot merged commit e53208d into kubernetes:dev-1.22 Jun 24, 2021
@PI-Victor PI-Victor deleted the merged-master-dev-1.22 branch June 24, 2021 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/blog Issues or PRs related to the Kubernetes Blog subproject area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/fr Issues or PRs related to French language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pt Issues or PRs related to Portuguese language language/uk Issues or PRs related to Ukrainian language language/zh Issues or PRs related to Chinese 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. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.