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

[bn] merging main in to dev-1.24-bn.1 #46246

Closed
wants to merge 1,796 commits into from
Closed

[bn] merging main in to dev-1.24-bn.1 #46246

wants to merge 1,796 commits into from

Conversation

asem-hamid
Copy link
Contributor

@asem-hamid asem-hamid commented May 7, 2024

Merging main in to dev-1.24-bn.1 to update dev-1.24-bn.1 branch

Fixes Issue : #44993

Tracking Issue: #31677

/cc @sftim
/cc @seokho-son
/cc @a-mccarthy
/cc @dipesh-rawat
/cc @divya-mohan0209

niranjandarshann and others added 30 commits April 25, 2024 14:17
Remove Redundant 'the' word in pod-lifecycle.md
Update doc title

Rename file/update link

Update api_metadata

Update what's next

Remove api_metadata, add tootip
Resync kubelet reference for 1.30
Remove 1.30 leads from sig-docs-website-owners
…unity

Ready community pages for vanilla Docsy
[zh-cn]sync network-plugins field-selectors replicaset statefulset
[zh] sync resize-container-resources user-namespaces
Signed-off-by: tico88612 <[email protected]>

[zh-ch] Add the LimitRange en metadata

Signed-off-by: tico88612 <[email protected]>

[zh-cn] Add api_reference_title translation

Signed-off-by: tico88612 <[email protected]>
Update 2023 blog content files to move author details in front-matter
Update documented metrics for v1.30
Add missing check-required-ports anchor
* Adds a new lines to documents explaining that this section assumes we have created a kuberentes-bootcamp service with LoadBalancer type

* Update content/en/docs/tutorials/kubernetes-basics/scale/scale-intro.html

Co-authored-by: Anuj Tiwari <[email protected]>

* Update content/en/docs/tutorials/kubernetes-basics/scale/scale-intro.html

Co-authored-by: Anuj Tiwari <[email protected]>

* Update content/en/docs/tutorials/kubernetes-basics/scale/scale-intro.html

Co-authored-by: Anuj Tiwari <[email protected]>

* Update content/en/docs/tutorials/kubernetes-basics/scale/scale-intro.html

Co-authored-by: Tim Bannister <[email protected]>

* Update content/en/docs/tutorials/kubernetes-basics/scale/scale-intro.html

Co-authored-by: Tim Bannister <[email protected]>

* Update content/en/docs/tutorials/kubernetes-basics/scale/scale-intro.html

Rephrase

Co-authored-by: Tim Bannister <[email protected]>

* Update scale-intro.html

Fixed typo: Sservice -> service

---------

Co-authored-by: Anuj Tiwari <[email protected]>
Co-authored-by: Tim Bannister <[email protected]>
Update "app.kubernetes.io/managed-by" annotation example value
[zh-cn] sync only update `api_metadata` docs
[zh-cn]sync policy kubernetes-api kubeadm-config.v1beta3 hello-minikube apiserver-audit.v1
Fix typo in 'Jobs' concept page
asa3311 and others added 7 commits May 7, 2024 21:37
Updating OWNERS_ALIASES with final changes
[zh] sync control-plane-flags encrypt-data
[ja] revise `content/ja/docs/contribute/localization.md`
[ja] Ready training section for vanilla Docsy
[ja] Update content/ja/docs/tasks/tools/included/optional-kubectl-configs-bash-mac.md
@seokho-son
Copy link
Member

/lgtm

Considering this PR is to update dev-1.24-bn.1 branch to make it up to date (from upstream/main) and there is no merge conflict. This PR will help reducing merge conflict when we try to merge dev-1.24-bn.1 into main branch for the first live version of Bengali localization. :)

Note that I am not sure any possible build errors exist in the dev-1.24-bn.1 (Netlify build test is for main branch), if there is, we need to fix it in the dev branch.

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

LGTM label has been added.

Git tree hash: 1b6a19be3e63ff32e808d85d3a45ab410a80b824

@sftim
Copy link
Contributor

sftim commented May 7, 2024

Note that I am not sure any possible build errors exist in the dev-1.24-bn.1 (Netlify build test is for main branch), if there is, we need to fix it in the dev branch.

For any PR, you can always pull it locally and run a test to confirm that it builds OK.

@asem-hamid
Copy link
Contributor Author

@seokho-son Actually, yes, we have build errors, but most of them are glossary-related. We are already working on that.

[zh-cn] sync apiserver-admission.v1 imagepolicy.v1alpha1
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 8, 2024
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

[zh] Sync 9 reference files in setup-tools/kubeadm
Copy link
Contributor

@divya-mohan0209 divya-mohan0209 left a comment

Choose a reason for hiding this comment

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

My two cents on this issue.

This is a very large change, and I haven't seen a precedent for it earlier on despite also being a maintainer for the Hindi localisation. I understand that we're very close to the minimum requirement, and it'd help if we approved this change, but I'm also wary of such changes being forced through for a localisation because certain files are missing.

I'd rather have the second approach listed on this PR by
@sftim followed and would not recommend the approach of merging main into the dev branch like we do for branch syncs during a release.

@natalisucks @reylejano : I would like your thoughts on this, as well.

@reylejano
Copy link
Member

reylejano commented May 8, 2024

Technically the dev-1.24-bn.1 branch was created from what was the 1.24 docs. The main branch is currently for the 1.30 docs and will be a very large change. I don't think we should merge main into dev-1.24-bn.1.
Imo, it would be much easier to follow option 2 from this comment

@asem-hamid
Copy link
Contributor Author

@divya-mohan0209
@reylejano
@sftim

Thanks for suggestion , we are going with option 2 from this #46210 (comment) now

@divya-mohan0209
Copy link
Contributor

divya-mohan0209 commented May 8, 2024

@asem-hamid Can we close this PR, please, if we're following option 2?

@asem-hamid
Copy link
Contributor Author

ok

@asem-hamid asem-hamid closed this May 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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/de Issues or PRs related to German language 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/hi Issues or PRs related to Hindi language language/id Issues or PRs related to Indonesian language language/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pl Issues or PRs related to Polish language language/pt Issues or PRs related to Portuguese language language/ru Issues or PRs related to Russian language language/uk Issues or PRs related to Ukrainian language language/vi Issues or PRs related to Vietnamese 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. 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.