kubernetes / website

Kubernetes website and documentation repo:
https://kubernetes.io
Creative Commons Attribution 4.0 International
4.59k stars 14.48k forks source link

fix: merge strategy table in SSA not rendering correctly #48836

Closed KevFan closed 3 days ago

KevFan commented 4 days ago

Description

Fixes rendering of the table in the Server Side Apply merge strategy section - https://kubernetes.io/docs/reference/using-api/server-side-apply/#merge-strategy

Before: image

After: image

k8s-ci-robot commented 4 days ago

Welcome @KevFan!

It looks like this is your first PR to kubernetes/website πŸŽ‰. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/website has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. :smiley:

k8s-ci-robot commented 4 days ago

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Once this PR has been reviewed and has the lgtm label, please assign chanieljdan for approval. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files: - **[content/en/docs/OWNERS](https://github.com/kubernetes/website/blob/main/content/en/docs/OWNERS)** Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
netlify[bot] commented 4 days ago

Pull request preview available for checking

Built without sensitive environment variables

Name Link
Latest commit 127d0a7852ec4e6a5b4c9b82192be2b3c4bc272e
Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/674489a2f7ed4e0008e55ef8
Deploy Preview https://deploy-preview-48836--kubernetes-io-main-staging.netlify.app
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

k8s-ci-robot commented 3 days ago

PR needs rebase.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
T-Lakshmi commented 3 days ago

Hello @KevFan, Thanks for your first contribution towards Kubernetes! This PR consists merge conflicts, can you please rebase it towards main branch.

T-Lakshmi commented 3 days ago

@KevFan, For guidance how to resolve merge conflict, you can follow the k8s official documentation steps mentioned in below URL: https://kubernetes.io/docs/contribute/new-content/open-a-pr/#merge-conflicts-and-rebasing

KevFan commented 3 days ago

Thanks @T-Lakshmi, looks like this has been resolved in another PR (which casued the merge conflict). Going to close this now as it's been resolved!