Merge pull request #1918 from anmazzotti/e2e_add_docker_spec_name

fix: Use CAPIProvider's name to select resources

Author: salasberryfin

internal/provider/wrangler.go

@@ -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)

test/e2e/data/capi-operator/capi-providers.yaml

@@ -10,6 +10,7 @@ metadata:
   name: docker
   namespace: capd-system
 spec:
+  name: docker
   type: infrastructure
 ---
 apiVersion: v1