add ListProviderResources

kubernetes-sigs · Oct 12, 2021 · ab56cff · ab56cff
1 parent 60cd932
commit ab56cff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/cmd/clusterctl/client/cluster/cert_manager.go b/cmd/clusterctl/client/cluster/cert_manager.go
@@ -230,10 +230,7 @@ func (cm *certManagerClient) PlanUpgrade() (CertManagerUpgradePlan, error) {
 func (cm *certManagerClient) EnsureLatestVersion() error {
 	log := logf.Log
 
-	objs, err := cm.proxy.List(context.TODO(), &listOptions{
-		Labels:     map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue},
-		Namespaces: []string{certManagerNamespace},
-	})
+	objs, err := cm.proxy.ListResources(map[string]string{clusterctlv1.ClusterctlCoreLabelName: clusterctlv1.ClusterctlCoreLabelCertManagerValue}, certManagerNamespace)
 	if err != nil {
 		return errors.Wrap(err, "failed get cert manager components")
 	}

diff --git a/cmd/clusterctl/internal/test/fake_proxy.go b/cmd/clusterctl/internal/test/fake_proxy.go
@@ -137,7 +137,7 @@ func (f *FakeProxy) ListResources(labels map[string]string, namespaces ...string
 }
 
 func (f *FakeProxy) ListProviderResources(_ context.Context, provider, namespace string) ([]unstructured.Unstructured, error) {
-	// FIXME: filter
+	// TODO: this func should filter out objects of CRDs of other providers
 	return f.ListResources(map[string]string{
 		clusterctlv1.ClusterctlLabelName: "",
 		clusterv1.ProviderLabelName:      provider,