Skip to content

fix: Use CAPIProvider's name to select resources #1918

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Use CAPIProvider's name to select resources #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions internal/provider/wrangler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,17 @@ func providerDeploymentRestart(ctx context.Context, cl client.Client, provider *
}

func getSelector(provider *turtlesv1.CAPIProvider) ([]client.ListOption, error) {
matchingLabels := []string{
provider.Spec.Type.ToName() + provider.Spec.Name,
provider.Spec.Name, // ex. "fleet"
var matchingLabels []string
if provider.Spec.Name != "" {
matchingLabels = []string{
provider.Spec.Type.ToName() + provider.Spec.Name,
provider.Spec.Name, // ex. "fleet"
}
} else { // support for CAPIProvider's name used as CAPIProvider.spec.name
matchingLabels = []string{
provider.Spec.Type.ToName() + provider.GetName(),
provider.GetName(),
}
}

requirement, err := labels.NewRequirement(CAPIProviderLabel, selection.In, matchingLabels)
Expand Down
1 change: 1 addition & 0 deletions test/e2e/data/capi-operator/capi-providers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
name: docker
namespace: capd-system
spec:
name: docker
type: infrastructure
---
apiVersion: v1
Expand Down