Skip to content

Commit f6cb9c8

Browse files
mcbenjemaamcbenjemaa
committed
Fix APIGroup for addonsv1
1 parent 594cce7 commit f6cb9c8

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

‎api/addons/v1beta1/clusterresourcesetbinding_types.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import (
2121

2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
"k8s.io/apimachinery/pkg/runtime/schema"
24-
25-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2624
)
2725

2826
// ANCHOR: ResourceBinding
@@ -124,7 +122,7 @@ func (c *ClusterResourceSetBinding) DeleteBinding(clusterResourceSet *ClusterRes
124122
}
125123
}
126124
c.OwnerReferences = removeOwnerRef(c.GetOwnerReferences(), metav1.OwnerReference{
127-
APIVersion: clusterv1.GroupVersion.String(),
125+
APIVersion: GroupVersion.String(),
128126
Kind: "ClusterResourceSet",
129127
Name: clusterResourceSet.Name,
130128
})

‎cmd/clusterctl/client/cluster/objectgraph.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (n *node) captureAdditionalInformation(obj *unstructured.Unstructured) erro
164164
}
165165

166166
// If the node is a ClusterResourceSetBinding capture the name of the cluster it is referencing to.
167-
if n.identity.GroupVersionKind().GroupKind() == clusterv1.GroupVersion.WithKind("ClusterResourceSetBinding").GroupKind() {
167+
if n.identity.GroupVersionKind().GroupKind() == addonsv1.GroupVersion.WithKind("ClusterResourceSetBinding").GroupKind() {
168168
binding := &addonsv1.ClusterResourceSetBinding{}
169169
if err := localScheme.Convert(obj, binding, nil); err != nil {
170170
return errors.Wrapf(err, "failed to convert object %s to ClusterResourceSetBinding", n.identityStr())
@@ -368,7 +368,7 @@ func (o *objectGraph) getDiscoveryTypes(ctx context.Context) error {
368368
if crd.Spec.Group == clusterv1.GroupVersion.Group && crd.Spec.Names.Kind == "ClusterClass" {
369369
forceMoveHierarchy = true
370370
}
371-
if crd.Spec.Group == clusterv1.GroupVersion.Group && crd.Spec.Names.Kind == "ClusterResourceSet" {
371+
if crd.Spec.Group == addonsv1.GroupVersion.Group && crd.Spec.Names.Kind == "ClusterResourceSet" {
372372
forceMoveHierarchy = true
373373
}
374374
if _, ok := crd.Labels[clusterctlv1.ClusterctlMoveHierarchyLabel]; ok {
@@ -637,7 +637,7 @@ func (o *objectGraph) getClusterClasses() []*node {
637637
func (o *objectGraph) getClusterResourceSetBinding() []*node {
638638
crs := []*node{}
639639
for _, node := range o.uidToNode {
640-
if node.identity.GroupVersionKind().GroupKind() == clusterv1.GroupVersion.WithKind("ClusterResourceSetBinding").GroupKind() {
640+
if node.identity.GroupVersionKind().GroupKind() == addonsv1.GroupVersion.WithKind("ClusterResourceSetBinding").GroupKind() {
641641
crs = append(crs, node)
642642
}
643643
}
@@ -668,7 +668,7 @@ func (o *objectGraph) getNodes() []*node {
668668
func (o *objectGraph) getCRSs() []*node {
669669
clusters := []*node{}
670670
for _, node := range o.uidToNode {
671-
if node.identity.GroupVersionKind().GroupKind() == clusterv1.GroupVersion.WithKind("ClusterResourceSet").GroupKind() {
671+
if node.identity.GroupVersionKind().GroupKind() == addonsv1.GroupVersion.WithKind("ClusterResourceSet").GroupKind() {
672672
clusters = append(clusters, node)
673673
}
674674
}

‎cmd/clusterctl/client/tree/discovery.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func addClusterResourceSetsToObjectTree(ctx context.Context, c client.Client, cl
191191
Kind: "ClusterResourceSet",
192192
Namespace: cluster.Namespace,
193193
Name: binding.ClusterResourceSetName,
194-
APIVersion: clusterv1.GroupVersion.String(),
194+
APIVersion: addonsv1.GroupVersion.String(),
195195
})
196196
tree.Add(resourceSetGroup, resourceSetRefObject)
197197
}
@@ -316,7 +316,7 @@ func getResourceSetBindingInCluster(ctx context.Context, c client.Client, namesp
316316
}
317317
resourceSetBinding.TypeMeta = metav1.TypeMeta{
318318
Kind: "ClusterResourceSetBinding",
319-
APIVersion: clusterv1.GroupVersion.String(),
319+
APIVersion: addonsv1.GroupVersion.String(),
320320
}
321321

322322
return resourceSetBinding, nil

‎internal/controllers/clusterresourceset/clusterresourceset_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func (r *ClusterResourceSetReconciler) reconcileDelete(ctx context.Context, clus
239239

240240
clusterResourceSetBinding.RemoveBinding(crs)
241241
clusterResourceSetBinding.OwnerReferences = util.RemoveOwnerRef(clusterResourceSetBinding.GetOwnerReferences(), metav1.OwnerReference{
242-
APIVersion: clusterv1.GroupVersion.String(),
242+
APIVersion: addonsv1.GroupVersion.String(),
243243
Kind: "ClusterResourceSet",
244244
Name: crs.Name,
245245
})
@@ -365,7 +365,7 @@ func (r *ClusterResourceSetReconciler) ApplyClusterResourceSet(ctx context.Conte
365365

366366
// Ensure that the owner references are set on the ClusterResourceSetBinding.
367367
clusterResourceSetBinding.SetOwnerReferences(util.EnsureOwnerRef(clusterResourceSetBinding.GetOwnerReferences(), metav1.OwnerReference{
368-
APIVersion: clusterv1.GroupVersion.String(),
368+
APIVersion: addonsv1.GroupVersion.String(),
369369
Kind: "ClusterResourceSet",
370370
Name: clusterResourceSet.Name,
371371
UID: clusterResourceSet.UID,
@@ -507,7 +507,7 @@ func (r *ClusterResourceSetReconciler) ensureResourceOwnerRef(ctx context.Contex
507507
return err
508508
}
509509
newRef := metav1.OwnerReference{
510-
APIVersion: clusterv1.GroupVersion.String(),
510+
APIVersion: addonsv1.GroupVersion.String(),
511511
Kind: clusterResourceSet.GroupVersionKind().Kind,
512512
Name: clusterResourceSet.GetName(),
513513
UID: clusterResourceSet.GetUID(),

‎internal/webhooks/clusterresourceset_webhook.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
3131

3232
addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
33-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3433
)
3534

3635
// ClusterResourceSet implements a validation and defaulting webhook for ClusterResourceSet.
@@ -128,5 +127,5 @@ func (webhook *ClusterResourceSet) validate(oldCRS, newCRS *addonsv1.ClusterReso
128127
return nil
129128
}
130129

131-
return apierrors.NewInvalid(clusterv1.GroupVersion.WithKind("ClusterResourceSet").GroupKind(), newCRS.Name, allErrs)
130+
return apierrors.NewInvalid(addonsv1.GroupVersion.WithKind("ClusterResourceSet").GroupKind(), newCRS.Name, allErrs)
132131
}

‎internal/webhooks/clusterresourcesetbinding_webhook.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2929

3030
addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
31-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3231
)
3332

3433
func (webhook *ClusterResourceSetBinding) SetupWebhookWithManager(mgr ctrl.Manager) error {
@@ -82,5 +81,5 @@ func (webhook *ClusterResourceSetBinding) validate(oldCRSB, newCRSB *addonsv1.Cl
8281
return nil
8382
}
8483

85-
return apierrors.NewInvalid(clusterv1.GroupVersion.WithKind("ClusterResourceSetBinding").GroupKind(), newCRSB.Name, allErrs)
84+
return apierrors.NewInvalid(addonsv1.GroupVersion.WithKind("ClusterResourceSetBinding").GroupKind(), newCRSB.Name, allErrs)
8685
}

0 commit comments

Comments
 (0)