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

Improved Explanation of Labels and Annotations #43178

Merged
merged 4 commits into from Oct 3, 2023

Conversation

khubaibalam2000
Copy link
Contributor

This Pull Request resolved the issue mentioned in #42524. I have added explanation and it makes clear that both labels and annotations can be used together.

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Sep 24, 2023

CLA Signed

The committers listed above are authorized under a signed CLA.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Sep 24, 2023
@k8s-ci-robot
Copy link
Contributor

Welcome @khubaibalam2000!

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. 😃

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 24, 2023
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Sep 24, 2023
@netlify
Copy link

netlify bot commented Sep 24, 2023

Pull request preview available for checking

Built without sensitive environment variables

Name Link
🔨 Latest commit af39488
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/65104b520d8f7c00084d3d5c
😎 Deploy Preview https://deploy-preview-43178--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 k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Sep 24, 2023
Copy link
Member

@dipesh-rawat dipesh-rawat left a comment

Choose a reason for hiding this comment

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

@khubaibalam2000 Thank you for your contribution!
It appears that this PR includes changes to files across multiple languages ('en', 'zh'). However, docs follows different processes for each localization, and and we typically don't accept pull requests that impact multiple languages simultaneously. I would recommend modify only the primary website content (which means only English content) initially with this PR. After the merge of the English content, we could create separate pull request for the remaining languages. I hope this suggestion is helpful.

@khubaibalam2000
Copy link
Contributor Author

khubaibalam2000 commented Sep 24, 2023

Yes, as you said, I have only made changes in the primary website content i.e. English content.

Copy link
Member

@aj11anuj aj11anuj left a comment

Choose a reason for hiding this comment

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

You have made changes to ("en" and "zh-cn") 2 files. Make another commit in which you have to revert changes of "zh-cn" localized file. So, only "en" file remain changed.

Screenshot (794)

@khubaibalam2000
Copy link
Contributor Author

@aj11anuj Thank you for pointing out this. In the new commit, I have revert it back to the original one.

@dipesh-rawat
Copy link
Member

/remove-language zh

@k8s-ci-robot k8s-ci-robot removed the language/zh Issues or PRs related to Chinese language label Sep 24, 2023
@@ -17,7 +17,8 @@ objects. Labels can be used to select objects and to find
collections of objects that satisfy certain conditions. In contrast, annotations
are not used to identify and select objects. The metadata
in an annotation can be small or large, structured or unstructured, and can
include characters not permitted by labels.
include characters not permitted by labels. It is also possible to use labels with
annotations to attach metadata to Kubernetes objects
Copy link
Contributor

Choose a reason for hiding this comment

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

  1. Missing period for the sentence.
  2. What do you mean by "use labels with annotations"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tengqm Thank you for pointing out the mistake. I have added missing period for the sentence. Moreover, I have made the sentence more clearer in the latest commit. As mentioned in the issue #42524, we can use labels as well as annotations in metadata of same object. Therefore, I added a clearer sentence in the end of the paragraph.

@windsonsea
Copy link
Member

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 24, 2023
@@ -17,7 +17,8 @@ objects. Labels can be used to select objects and to find
collections of objects that satisfy certain conditions. In contrast, annotations
are not used to identify and select objects. The metadata
in an annotation can be small or large, structured or unstructured, and can
include characters not permitted by labels.
include characters not permitted by labels. It is also possible to use labels as
well as annotations in metadata of same object.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
well as annotations in metadata of same object.
well as annotations in the metadata of the same object.

@khubaibalam2000
Copy link
Contributor Author

@tengqm Thank You for your guidance. In the latest commit, I fixed those mistakes. You can review now.

@tengqm
Copy link
Contributor

tengqm commented Sep 25, 2023

/lgtm

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

LGTM label has been added.

Git tree hash: 251d76efacc80e7380d37f120056bdd20c561086

@sftim
Copy link
Contributor

sftim commented Oct 3, 2023

/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 Oct 3, 2023
@k8s-ci-robot k8s-ci-robot merged commit 837991a into kubernetes:main Oct 3, 2023
6 checks passed
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 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants