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

fix typos #4136

Merged
merged 1 commit into from
Oct 16, 2023
Merged

fix typos #4136

merged 1 commit into from
Oct 16, 2023

Conversation

nawazkh
Copy link
Member

@nawazkh nawazkh commented Oct 16, 2023

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 16, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 16, 2023
@nawazkh
Copy link
Member Author

nawazkh commented Oct 16, 2023

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@nawazkh: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 16, 2023
@nawazkh
Copy link
Member Author

nawazkh commented Oct 16, 2023

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot

@nawazkh: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@codecov
Copy link

codecov bot commented Oct 16, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (83fe434) 57.82% compared to head (89222bc) 57.83%.
Report is 10 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4136      +/-   ##
==========================================
+ Coverage   57.82%   57.83%   +0.01%     
==========================================
  Files         187      187              
  Lines       19190    19195       +5     
==========================================
+ Hits        11096    11101       +5     
  Misses       7466     7466              
  Partials      628      628              
Files Coverage Δ
azure/defaults.go 50.34% <ø> (ø)

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

egress-policy: audit

- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: codespell-project/actions-codespell@94259cd8be02ad2903ba34a22d9c13de21a74461 # master
Copy link
Contributor

Choose a reason for hiding this comment

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

So the latest codespell finds the typos that this PR fixes?

We also run codespell in the make verify target, so we'd be running it twice in CI. That's not terrible, unless the versions or configurations of the two codespells diverge. Then a contributor might have a PR rejected for something they can't reproduce locally.

(See also #4029, somewhat related.)

Copy link
Member Author

Choose a reason for hiding this comment

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

So the latest codespell finds the typos that this PR fixes?

It looks like the latest codespell, v2.2.6 does find the typos this PR aims to fix.

We also run codespell in the make verify target, so we'd run it twice in CI.

You are right. It is better if I update the codespell version in the Makefile instead of adding the codespell.yml github action.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 16, 2023
Copy link
Contributor

@mboersma mboersma 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 Oct 16, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 22993e660cc3a21c08744290e255999f132c0b5f

@nojnhuh
Copy link
Contributor

nojnhuh commented Oct 16, 2023

/approve

@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 16, 2023
@nawazkh
Copy link
Member Author

nawazkh commented Oct 16, 2023

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

You should only use this feature if your cluster infrastructure lifecycle management has constraints that the reference implementation does not support. See [user stories](https://github.com/kubernetes-sigs/cluster-api/blob/10d89ceca938e4d3d94a1d1c2b60515bcdf39829/docs/proposals/20210203-externally-managed-cluster-infrastructure.md#user-stories) for more details.
Copy link
Member Author

Choose a reason for hiding this comment

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

Strange that there is a diff in this line. Rechecking and fixing any errors I see.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copied over the earlier file and updated the spelling I was concerned about.
I don't see a reason for this line to show up as a diff.
Leaving it as is now, sorry for the force push leading to the removal of "lgtm".
Please take a look again.

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks related to whitespace.

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

@nojnhuh nojnhuh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 17a26817c94eec12fbf6a07f4bc747ffdd16a5da

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nojnhuh

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

@mboersma
Copy link
Contributor

/override pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

@k8s-ci-robot
Copy link
Contributor

@mboersma: Overrode contexts on behalf of mboersma: pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

In response to this:

/override pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mboersma
Copy link
Contributor

/override pull-cluster-api-provider-azure-e2e-aks

Mea culpa, but I'm fairly sure these typo fixes are not affecting that test.

@k8s-ci-robot
Copy link
Contributor

@mboersma: Overrode contexts on behalf of mboersma: pull-cluster-api-provider-azure-e2e-aks

In response to this:

/override pull-cluster-api-provider-azure-e2e-aks

Mea culpa, but I'm fairly sure these typo fixes are not affecting that test.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot merged commit 5c6f04d into kubernetes-sigs:main Oct 16, 2023
11 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Oct 16, 2023
@k8s-infra-cherrypick-robot

@nawazkh: #4136 failed to apply on top of branch "release-1.10":

Applying: fix typos and update the version of Codespell
.git/rebase-apply/patch:64: trailing whitespace.
You should only use this feature if your cluster infrastructure lifecycle management has constraints that the reference implementation does not support. See [user stories](https://github.com/kubernetes-sigs/cluster-api/blob/10d89ceca938e4d3d94a1d1c2b60515bcdf39829/docs/proposals/20210203-externally-managed-cluster-infrastructure.md#user-stories) for more details. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	Makefile
M	azure/defaults.go
M	docs/book/src/topics/addons.md
Falling back to patching base and 3-way merge...
Auto-merging docs/book/src/topics/addons.md
Auto-merging azure/defaults.go
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix typos and update the version of Codespell
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot

@nawazkh: new pull request created: #4142

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@nawazkh nawazkh deleted the fix_codespell_errors branch October 17, 2023 16:16
@nawazkh nawazkh mentioned this pull request Oct 17, 2023
4 tasks
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants