diff --git a/go.mod b/go.mod index 7a44f1a2ee6b..8709e0227229 100644 --- a/go.mod +++ b/go.mod @@ -38,6 +38,6 @@ require ( k8s.io/klog/v2 v2.9.0 k8s.io/kubectl v0.22.2 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b - sigs.k8s.io/controller-runtime v0.10.2 + sigs.k8s.io/controller-runtime v0.10.3-0.20211011182302-43ea648ec318 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index a56f55275044..f795c572bce9 100644 --- a/go.sum +++ b/go.sum @@ -1134,8 +1134,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.10.2 h1:jW8qiY+yMnnPx6O9hu63tgcwaKzd1yLYui+mpvClOOc= -sigs.k8s.io/controller-runtime v0.10.2/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY= +sigs.k8s.io/controller-runtime v0.10.3-0.20211011182302-43ea648ec318 h1:MxgxYdJH4JJcEkyzFwYeH2o8WAlRlWE4cuIfsMvqK5g= +sigs.k8s.io/controller-runtime v0.10.3-0.20211011182302-43ea648ec318/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY= sigs.k8s.io/kustomize/api v0.8.11 h1:LzQzlq6Z023b+mBtc6v72N2mSHYmN8x7ssgbf/hv0H8= sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g= sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs= diff --git a/test/go.mod b/test/go.mod index 4db7a3f37e02..0f0f587ed90f 100644 --- a/test/go.mod +++ b/test/go.mod @@ -24,7 +24,7 @@ require ( k8s.io/klog/v2 v2.9.0 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000 - sigs.k8s.io/controller-runtime v0.10.2 + sigs.k8s.io/controller-runtime v0.10.3-0.20211011182302-43ea648ec318 sigs.k8s.io/kind v0.11.1 sigs.k8s.io/yaml v1.3.0 ) diff --git a/test/go.sum b/test/go.sum index 67239dc2a7cc..67f7a7222a7d 100644 --- a/test/go.sum +++ b/test/go.sum @@ -1477,8 +1477,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.10.2 h1:jW8qiY+yMnnPx6O9hu63tgcwaKzd1yLYui+mpvClOOc= -sigs.k8s.io/controller-runtime v0.10.2/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY= +sigs.k8s.io/controller-runtime v0.10.3-0.20211011182302-43ea648ec318 h1:MxgxYdJH4JJcEkyzFwYeH2o8WAlRlWE4cuIfsMvqK5g= +sigs.k8s.io/controller-runtime v0.10.3-0.20211011182302-43ea648ec318/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY= sigs.k8s.io/kind v0.11.1 h1:pVzOkhUwMBrCB0Q/WllQDO3v14Y+o2V0tFgjTqIUjwA= sigs.k8s.io/kind v0.11.1/go.mod h1:fRpgVhtqAWrtLB9ED7zQahUimpUXuG/iHT88xYqEGIA= sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g= diff --git a/util/util.go b/util/util.go index e1dce4434b18..56e988a8f9c8 100644 --- a/util/util.go +++ b/util/util.go @@ -32,6 +32,7 @@ import ( corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" @@ -489,15 +490,30 @@ func ClusterToObjectsMapper(c client.Client, ro client.ObjectList, scheme *runti return nil, err } + isNamespaced, err := isAPINamespaced(gvk, c.RESTMapper()) + if err != nil { + return nil, err + } + return func(o client.Object) []ctrl.Request { cluster, ok := o.(*clusterv1.Cluster) if !ok { return nil } + listOpts := []client.ListOption{ + client.MatchingLabels{ + clusterv1.ClusterLabelName: cluster.Name, + }, + } + + if isNamespaced { + listOpts = append(listOpts, client.InNamespace(cluster.Namespace)) + } + list := &unstructured.UnstructuredList{} list.SetGroupVersionKind(gvk) - if err := c.List(context.TODO(), list, client.MatchingLabels{clusterv1.ClusterLabelName: cluster.Name}); err != nil { + if err := c.List(context.TODO(), list, listOpts...); err != nil { return nil } @@ -511,6 +527,23 @@ func ClusterToObjectsMapper(c client.Client, ro client.ObjectList, scheme *runti }, nil } +// isAPINamespaced detects if a GroupVersionKind is namespaced. +func isAPINamespaced(gk schema.GroupVersionKind, restmapper meta.RESTMapper) (bool, error) { + restMapping, err := restmapper.RESTMapping(schema.GroupKind{Group: gk.Group, Kind: gk.Kind}) + if err != nil { + return false, fmt.Errorf("failed to get restmapping: %w", err) + } + + switch restMapping.Scope.Name() { + case "": + return false, errors.New("Scope cannot be identified. Empty scope returned") + case meta.RESTScopeNameRoot: + return false, nil + default: + return true, nil + } +} + // ObjectReferenceToUnstructured converts an object reference to an unstructured object. func ObjectReferenceToUnstructured(in corev1.ObjectReference) *unstructured.Unstructured { out := &unstructured.Unstructured{} diff --git a/util/util_test.go b/util/util_test.go index 6bc0939d3003..f933fd690775 100644 --- a/util/util_test.go +++ b/util/util_test.go @@ -23,14 +23,15 @@ import ( "github.com/blang/semver" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/kubernetes/scheme" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) @@ -673,8 +674,19 @@ func TestClusterToObjectsMapper(t *testing.T) { for _, tc := range table { tc.objects = append(tc.objects, cluster) - client := fake.NewClientBuilder().WithObjects(tc.objects...).Build() - f, err := ClusterToObjectsMapper(client, tc.input, scheme.Scheme) + + scheme := runtime.NewScheme() + _ = clusterv1.AddToScheme(scheme) + + restMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{clusterv1.GroupVersion}) + + // Add tc.input gvk to the restMapper. + gvk, err := apiutil.GVKForObject(tc.input, scheme) + g.Expect(err).ToNot(HaveOccurred()) + restMapper.Add(gvk, meta.RESTScopeNamespace) + + client := fake.NewClientBuilder().WithObjects(tc.objects...).WithRESTMapper(restMapper).Build() + f, err := ClusterToObjectsMapper(client, tc.input, scheme) g.Expect(err != nil, err).To(Equal(tc.expectError)) g.Expect(f(cluster)).To(ConsistOf(tc.output)) }