Skip to content

Merged main into dev 1.24 #31490

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
merged 73 commits into from
Jan 24, 2022
Merged

Merged main into dev 1.24 #31490

merged 73 commits into from
Jan 24, 2022

Conversation

nate-double-u
Copy link
Contributor

Week 3 update to bring main into dev-1.24 branch.

renan and others added 30 commits November 2, 2021 14:03
@renan
Fix default value for MaxSurge
b4b8893 
The implementation defines the default value for MaxSurge being 0, as to
preserve the current behavior of rolling updates in DaemonSets.

This change is just a copy-paste of the docblock defined in the types.go
file.

See:
- https://github.com/kubernetes/kubernetes/blob/10a3cc815bea73f78f7126cab5df95233da96e1b/pkg/apis/apps/types.go
- https://github.com/kubernetes/kubernetes/blob/10a3cc815bea73f78f7126cab5df95233da96e1b/pkg/apis/apps/v1/defaults.go#L87-L91
Update third party list of container runtimes
6d9fec4
@bglimepoint
Note that subPathExpr uses round brackets.
ab9fdcb 
As it's easy to misread this as curly brackets for users familiar with
shell interpolation.
@reylejano
Add Docker Engine as container runtime
65e92a8 
Mention that the support via Dockershim is deprecated.

Co-Authored-By: Rey Lejano <rlejano@gmail.com>
@riita10069
replace link to en
82a201c
@riita10069
Merge branch 'main' into ja-fix-link
2f511e4
Make only live website indexable
2dfe0d1 
This change updates how we run Hugo AND changes the logic for checking
whether a page should be indexable (copied with a backport from upstream
Docsy).
Mark live site in HTML
4592cf5 
This allows CSS, JavaScript etc to detect if the served website is the
live one.
Add Contiv-VPP network plugin
a3e8980
@brianpursley
Add instructions for enabling fish auto-completions for kubectl
ad015ad
@renan
Remove changes to ko and zh locales
696027c
Fix footer rendering
688c246 
The community page had the wrong rendering for the page footer.
Ensure that the footer is as wide as the viewport.
@shannonxtreme
Remove Docker mentions
be49000
@shannonxtreme
Minor wording fixes
b0da90d 
Co-authored-by: Tim Bannister <tim@scalefactory.com>
@Darshnadas
Removed weave url
c5881a1
@jberkus
Fix link to dev@kubernetes mailing list
b85a7df 
Signed-off-by: Josh Berkus <josh@agliodbs.com>
@humblec
mention the correct feature gate name for RBD CSI migration.
9abefab 
The feature gate string (CSIMigrationRBD) was not matching with the
implementation (csiMigrationRBD) and this commit make it in parity

Ref# kubernetes/kubernetes#107571

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
@Darshnadas
Added changes
8a5c44c
@k8s-ci-robot
Merge pull request kubernetes#31263 from brianpursley/fish-completion
19b327c 
Add instructions for enabling fish auto-completions for kubectl
@k8s-ci-robot
Merge pull request kubernetes#31349 from humblec/csiMigration
c7079c4 
mention the correct feature gate name for RBD CSI migration.
@k8s-ci-robot
Merge pull request kubernetes#31325 from Darshnadas/weave
d9edcc3 
Removed weave url
@k8s-ci-robot
Merge pull request kubernetes#30331 from renan/MaxSurgeDefault
9bdb086 
Fix default value for MaxSurge in RollingUpdates for DaemonSets beat feature
@k8s-ci-robot
Merge pull request kubernetes#30790 from sftim/20211207_mark_only_liv…
953bb28 
…e_site_indexable

Make only live website indexable
Link to DaemonSet update task
02f1234 
from DaemonSetUpdateSurge feature gate short description
@k8s-ci-robot
Merge pull request kubernetes#31374 from sftim/20220117_more_detail_d…
0d4211e 
…aemonset_update_surge

Link to DaemonSet update task from DaemonSetUpdateSurge feature gate short description
@k8s-ci-robot
Merge pull request kubernetes#30959 from bglimepoint/patch-1
b599a32 
Note that subPathExpr uses round brackets.
@krvaibhaw
Update _index.html
a91d4a2
@krvaibhaw
Update _index.html
446a98a
@krvaibhaw
Merge pull request #1 from krvaibhaw/krvaibhaw-patch-1
86b8b2e 
it: Link and description mismatch
@k8s-ci-robot
Merge pull request kubernetes#31385 from krvaibhaw/main
5dc4a88 
it: Link and description mismatch
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 24, 2022
@nate-double-u nate-double-u changed the base branch from main to dev-1.24 January 24, 2022 17:11
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jan 24, 2022
@nate-double-u
Copy link
Contributor Author

/milestone 1.24

@k8s-ci-robot k8s-ci-robot added this to the 1.24 milestone Jan 24, 2022
@nate-double-u
Copy link
Contributor Author

Errors relate to the EasyCLA — Missing CLA Authorization.

/cc @JamesLaverack, FYI
/cc @jlbutler @sftim @reylejano

@JamesLaverack
Copy link
Member

Errors relate to the EasyCLA — Missing CLA Authorization.

/cc @JamesLaverack, FYI /cc @jlbutler @sftim @reylejano

EasyCLA seems happy enough? Am I misunderstanding?

@netlify
Copy link

netlify bot commented Jan 24, 2022

✔️ Deploy Preview for kubernetes-io-main-staging ready!

🔨 Explore the source changes: 6fb319b

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/61eeddc7381c210007904d65

😎 Browse the preview: https://deploy-preview-31490--kubernetes-io-main-staging.netlify.app

@nate-double-u
Copy link
Contributor Author

Commit 15bc0c7 has an error X on it, relating to the EasyCLA. It's not an error we generally need to concern ourselves with as EasyCLA is a work in progress, but it is an error, so I bring it up so folks know why it's failing.

@nate-double-u
Copy link
Contributor Author

If there were other kinds of errors then we may need to take action to correct them.

@sftim
Copy link
Contributor

sftim commented Jan 24, 2022

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sftim

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 24, 2022
@jlbutler
Copy link
Contributor

/lgtm

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

LGTM label has been added.

Git tree hash: 7beee5f57fcdf4f891dc0f90dc72c55c297db441

@k8s-ci-robot k8s-ci-robot merged commit 7654b8c into kubernetes:dev-1.24 Jan 24, 2022
@nate-double-u nate-double-u deleted the merged-main-dev-1.24 branch January 24, 2022 21:11
@nate-double-u
Copy link
Contributor Author

Thanks everyone!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@divya-mohan0209 divya-mohan0209 Awaiting requested review from divya-mohan0209

@tallclair tallclair Awaiting requested review from tallclair

@jlbutler jlbutler Awaiting requested review from jlbutler

@reylejano reylejano Awaiting requested review from reylejano

@sftim sftim Awaiting requested review from sftim

Assignees

@jlbutler jlbutler

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
1.24
Development

Successfully merging this pull request may close these issues.