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

Update dev-1.29 branch to sync with main #44286

Merged
merged 21 commits into from
Dec 10, 2023

Conversation

sftim
Copy link
Contributor

@sftim sftim commented Dec 9, 2023

Fix a merge conflict provoked by PR #42823

pegasas and others added 20 commits October 24, 2023 14:54
In the operations table, the row that describes the "top" command was displayed incorrectly in context of the other rows in the table. This updates the docs to fix that display issue.

Revert changes for [ja] [ko] and [zh-cn]
kubectl can apply manifests direct from the web; let's teach that.
[zh] sync change-package-repository /tasks/debug/debug-cluster/_index verify-kubectl
Document snag with Secrets, stringData, and server-side apply
Fix minor formatting issue in kubectl docs
…hanges

Switch StatefulSet tutorial to HTTP manifest source
[ru] Update KubeCon dates for 2023-2024
[uk] Update KubeCon dates for 2024
…le-column-metrics

Metrics reference is for (unreleased) v1.29
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 9, 2023
@k8s-ci-robot k8s-ci-robot added this to the 1.29 milestone Dec 9, 2023
Copy link

netlify bot commented Dec 9, 2023

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

Name Link
🔨 Latest commit 0f9c965
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/6574cc18bca4a900086f27e6

@sftim sftim marked this pull request as ready for review December 9, 2023 19:38
@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. language/en Issues or PRs related to English language and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Dec 9, 2023
@k8s-ci-robot k8s-ci-robot requested review from Arhell and AWKIF December 9, 2023 19:38
@k8s-ci-robot k8s-ci-robot added language/fr Issues or PRs related to French language language/ru Issues or PRs related to Russian 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. labels Dec 9, 2023
@k8s-ci-robot k8s-ci-robot requested a review from foxish December 9, 2023 19:38
@sftim
Copy link
Contributor Author

sftim commented Dec 9, 2023

/approve

given the time constraints. A second approval would be nice.

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2023
@katcosgrove
Copy link
Contributor

/approve

@sftim sftim force-pushed the 20231209_dev_1.29_sync branch from fc0beaa to 0f9c965 Compare December 9, 2023 20:20
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: katcosgrove, 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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 9, 2023
@sftim
Copy link
Contributor Author

sftim commented Dec 9, 2023

Oops. #44286 (comment) fixes a stylesheet needed for the v1.29 metrics.

Copy link
Member

@Arhell Arhell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

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

LGTM label has been added.

Git tree hash: 2411f13a35307b367ae2a0696cc57690a273e707

@k8s-ci-robot k8s-ci-robot merged commit 58a6a19 into kubernetes:dev-1.29 Dec 10, 2023
6 checks passed
@sftim sftim deleted the 20231209_dev_1.29_sync branch December 10, 2023 01:56
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language language/fr Issues or PRs related to French language language/ru Issues or PRs related to Russian 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.