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 parsing error for CCM tag #2390

Merged

Conversation

lzhecheng
Copy link
Contributor

If CCM tag is numerical, helm will parse it incorrectly.
helm/helm#1707 (comment)

Signed-off-by: Zhecheng Li zhechengli@microsoft.com

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fix parsing error for CCM tag. If CCM tag is numerical, helm will parse it incorrectly.
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:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Fix parsing error for CCM tag. If CCM tag is numerical, helm will parse it incorrectly.

If CCM tag is numerical, helm will parse it incorrectly.
helm/helm#1707 (comment)

Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 16, 2022
@lzhecheng
Copy link
Contributor Author

/assign @CecileRobertMichon
/cc @feiskyer

@k8s-ci-robot
Copy link
Contributor

@lzhecheng: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-azure-coverage 5f9878b link false /test pull-cluster-api-provider-azure-coverage

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon 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
/cherry-pick release-1.3

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 Jun 16, 2022
@k8s-ci-robot k8s-ci-robot merged commit 336e9bc into kubernetes-sigs:main Jun 16, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Jun 16, 2022
@lzhecheng lzhecheng deleted the fix-install-ccm-int-tag branch June 16, 2022 14:26
@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.3

@k8s-infra-cherrypick-robot

@lzhecheng: #2390 failed to apply on top of branch "release-1.3":

Applying: Fix parsing error for CCM tag If CCM tag is numerical, helm will parse it incorrectly. https://github.com/helm/helm/issues/1707#issuecomment-810371666
Using index info to reconstruct a base tree...
M	scripts/ci-entrypoint.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/ci-entrypoint.sh
CONFLICT (content): Merge conflict in scripts/ci-entrypoint.sh
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 parsing error for CCM tag If CCM tag is numerical, helm will parse it incorrectly. https://github.com/helm/helm/issues/1707#issuecomment-810371666
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:

/cherrypick release-1.3

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.

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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants