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

feat: add annotation to control pls creation rg #4660

Merged
merged 1 commit into from Sep 21, 2023

Conversation

jwtty
Copy link
Member

@jwtty jwtty commented Sep 20, 2023

What type of PR is this?

/kind feature

What this PR does / why we need it:

Add ServiceAnnotationPLSResourceGroup = "service.beta.kubernetes.io/azure-pls-resource-group" to control pls creation resource group.

Which issue(s) this PR fixes:

Fixes #4608

Special notes for your reviewer:

Does this PR introduce a user-facing change?

By default, all managed private link service (PLS) are created in the resource group configured by azure config (az.privateLinkServiceResourceGroup or az.ResourceGroup).
Add `ServiceAnnotationPLSResourceGroup = "service.beta.kubernetes.io/azure-pls-resource-group"` to control a specific PLS creation resource group. 

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


@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/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 20, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jwtty

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 Sep 20, 2023
@jwtty
Copy link
Member Author

jwtty commented Sep 20, 2023

/test pull-cloud-provider-azure-e2e-ccm-vmss-capz

@jwtty
Copy link
Member Author

jwtty commented Sep 20, 2023

/cherrypick release-1.28

@k8s-infra-cherrypick-robot

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

In response to this:

/cherrypick release-1.28

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.

@jwtty
Copy link
Member Author

jwtty commented Sep 20, 2023

/cherrypick release-1.27

@k8s-infra-cherrypick-robot

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

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.

@jwtty
Copy link
Member Author

jwtty commented Sep 20, 2023

/cherrypick release-1.26

@k8s-infra-cherrypick-robot

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

In response to this:

/cherrypick release-1.26

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.

@jwtty
Copy link
Member Author

jwtty commented Sep 20, 2023

/cherrypick release-1.25

@k8s-infra-cherrypick-robot

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

In response to this:

/cherrypick release-1.25

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.

@nilo19
Copy link
Contributor

nilo19 commented Sep 21, 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 21, 2023
@k8s-ci-robot k8s-ci-robot merged commit 3b8e565 into kubernetes-sigs:master Sep 21, 2023
17 checks passed
@k8s-infra-cherrypick-robot

@jwtty: new pull request created: #4675

In response to this:

/cherrypick release-1.28

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

@jwtty: #4660 failed to apply on top of branch "release-1.27":

Applying: add annotation to control pls creation rg
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure.go
A	pkg/provider/azure_privatelinkservice_repo.go
M	tests/e2e/network/private_link_service.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/private_link_service.go
CONFLICT (modify/delete): pkg/provider/azure_privatelinkservice_repo.go deleted in HEAD and modified in add annotation to control pls creation rg. Version add annotation to control pls creation rg of pkg/provider/azure_privatelinkservice_repo.go left in tree.
Auto-merging pkg/provider/azure.go
CONFLICT (content): Merge conflict in pkg/provider/azure.go
Auto-merging pkg/consts/consts.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 add annotation to control pls creation rg
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.

@k8s-infra-cherrypick-robot

@jwtty: #4660 failed to apply on top of branch "release-1.26":

Applying: add annotation to control pls creation rg
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure.go
M	pkg/provider/azure_privatelinkservice.go
A	pkg/provider/azure_privatelinkservice_repo.go
M	pkg/provider/azure_privatelinkservice_test.go
M	tests/e2e/network/private_link_service.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/private_link_service.go
Auto-merging pkg/provider/azure_privatelinkservice_test.go
CONFLICT (modify/delete): pkg/provider/azure_privatelinkservice_repo.go deleted in HEAD and modified in add annotation to control pls creation rg. Version add annotation to control pls creation rg of pkg/provider/azure_privatelinkservice_repo.go left in tree.
Auto-merging pkg/provider/azure_privatelinkservice.go
Auto-merging pkg/provider/azure.go
CONFLICT (content): Merge conflict in pkg/provider/azure.go
Auto-merging pkg/consts/consts.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 add annotation to control pls creation rg
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.26

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

@jwtty: #4660 failed to apply on top of branch "release-1.25":

Applying: add annotation to control pls creation rg
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure.go
M	pkg/provider/azure_privatelinkservice.go
A	pkg/provider/azure_privatelinkservice_repo.go
M	pkg/provider/azure_privatelinkservice_test.go
M	tests/e2e/network/private_link_service.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/private_link_service.go
Auto-merging pkg/provider/azure_privatelinkservice_test.go
CONFLICT (modify/delete): pkg/provider/azure_privatelinkservice_repo.go deleted in HEAD and modified in add annotation to control pls creation rg. Version add annotation to control pls creation rg of pkg/provider/azure_privatelinkservice_repo.go left in tree.
Auto-merging pkg/provider/azure_privatelinkservice.go
Auto-merging pkg/provider/azure.go
CONFLICT (content): Merge conflict in pkg/provider/azure.go
Auto-merging pkg/consts/consts.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 add annotation to control pls creation rg
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.25

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.

@jwtty jwtty deleted the pls-rg branch September 21, 2023 07:02
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/feature Categorizes issue or PR as related to a new feature. 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.

How to specify resource group for PLS?
4 participants