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: the pip without tags should be user-assigned #3877

Merged
merged 1 commit into from May 17, 2023

Conversation

nilo19
Copy link
Contributor

@nilo19 nilo19 commented May 12, 2023

What type of PR is this?

/kind bug

What this PR does / why we need it:

  1. PIPs without tags should be treated as user-assigned resources. We should not tag user-assigned pip without tags.
  2. When the svc changes its IP from one to another, the cached pip can be outdated. Need to refresh the cache when necessary.
  3. We should not tag user-assigned pip for DNS labels.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

fix: the pip without tags should be user-assigned
fix: refresh the pip cache when necessary
fix: do not tag user-assigned pip with `kubernetes-dns-label-service: <svcName>`

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 12, 2023
@netlify
Copy link

netlify bot commented May 12, 2023

Deploy Preview for kubernetes-sigs-cloud-provide-azure canceled.

Name Link
🔨 Latest commit c204dbe
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cloud-provide-azure/deploys/6464888783db250008f72e82

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 12, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nilo19

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 May 12, 2023
@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 May 12, 2023
@lzhecheng
Copy link
Contributor

/retest

2 similar comments
@nilo19
Copy link
Contributor Author

nilo19 commented May 13, 2023

/retest

@nilo19
Copy link
Contributor Author

nilo19 commented May 14, 2023

/retest

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 16, 2023
@nilo19 nilo19 force-pushed the fix/user-assigned-pip branch 3 times, most recently from 59c8691 to 9330e92 Compare May 16, 2023 05:15
@nilo19 nilo19 changed the title fix: the pip without tags should be user-assigned [WIP] fix: the pip without tags should be user-assigned May 16, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 16, 2023
fix: refresh the pip cache when necessary
fix: do not tag user-assigned pip with `kubernetes-dns-label-service: <svcName>`
@nilo19 nilo19 changed the title [WIP] fix: the pip without tags should be user-assigned fix: the pip without tags should be user-assigned May 17, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 17, 2023
@lzhecheng
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2023
@jwtty
Copy link
Member

jwtty commented May 17, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot merged commit 5901bf3 into kubernetes-sigs:master May 17, 2023
21 checks passed
@nilo19 nilo19 deleted the fix/user-assigned-pip branch May 17, 2023 11:40
@nilo19
Copy link
Contributor Author

nilo19 commented May 17, 2023

/cherrypick release-1.27

@k8s-infra-cherrypick-robot

@nilo19: #3877 failed to apply on top of branch "release-1.27":

Applying: fix: the pip without tags should be user-assigned fix: refresh the pip cache when necessary fix: do not tag user-assigned pip with `kubernetes-dns-label-service: <svcName>`
Using index info to reconstruct a base tree...
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_test.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_utils.go
M	pkg/provider/azure_wrap.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_wrap.go
Auto-merging pkg/provider/azure_utils.go
CONFLICT (content): Merge conflict in pkg/provider/azure_utils.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.go
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: the pip without tags should be user-assigned fix: refresh the pip cache when necessary fix: do not tag user-assigned pip with `kubernetes-dns-label-service: <svcName>`
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.27

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants