Skip to content

Commit 5ff2196

Browse files
cnvergencecnvergence
committed
Bump Go dependencies, kcp and multicluster-provider versions
Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> On-behalf-of: @SAP karol.szwaj@sap.com
1 parent f3f89e7 commit 5ff2196

36 files changed

Lines changed: 1378 additions & 1272 deletions

‎backend/controllers/bindableresourcesrequest/bindableresourcesrequest_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (r *BindableResourcesRequestReconciler) Reconcile(ctx context.Context, req
131131
original := bindableRequest.DeepCopy()
132132

133133
// Run the reconciliation logic
134-
result, err := r.reconciler.reconcile(ctx, req.ClusterName, client, bindableRequest)
134+
result, err := r.reconciler.reconcile(ctx, string(req.ClusterName), client, bindableRequest)
135135
if err != nil {
136136
logger.Error(err, "Failed to reconcile BindableResourcesRequest")
137137
if !reflect.DeepEqual(original.Status, bindableRequest.Status) {

‎backend/controllers/clusterbinding/clusterbinding_controller.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828
"sigs.k8s.io/controller-runtime/pkg/cluster"
2929
"sigs.k8s.io/controller-runtime/pkg/controller"
30-
"sigs.k8s.io/controller-runtime/pkg/handler"
30+
crhandler "sigs.k8s.io/controller-runtime/pkg/handler"
3131
"sigs.k8s.io/controller-runtime/pkg/log"
3232
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3333
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
34+
mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
3435
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
36+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
3537
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
3638

3739
kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2"
@@ -133,8 +135,8 @@ func (r *ClusterBindingReconciler) SetupWithManager(mgr mcmanager.Manager) error
133135
Complete(r)
134136
}
135137

136-
func mapAPIResourceSchema(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
137-
return handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
138+
func mapAPIResourceSchema(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
139+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
138140
serviceExport, ok := obj.(*kubebindv1alpha2.APIServiceExport)
139141
if !ok {
140142
return nil

‎backend/controllers/serviceexport/serviceexport_controller.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client"
2929
"sigs.k8s.io/controller-runtime/pkg/cluster"
3030
"sigs.k8s.io/controller-runtime/pkg/controller"
31-
"sigs.k8s.io/controller-runtime/pkg/handler"
31+
crhandler "sigs.k8s.io/controller-runtime/pkg/handler"
3232
"sigs.k8s.io/controller-runtime/pkg/log"
3333
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3434
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
35+
mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
3536
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
37+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
3638
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
3739

3840
"github.com/kube-bind/kube-bind/pkg/indexers"
@@ -144,8 +146,8 @@ func (r *APIServiceExportReconciler) Reconcile(ctx context.Context, req mcreconc
144146
}
145147

146148
// getAPIResourceSchemaMapper returns a mapper function that uses the manager to find related APIServiceExports.
147-
func getBoundSchemaMapper(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
148-
return handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
149+
func getBoundSchemaMapper(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
150+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
149151
boundSchema := obj.(*kubebindv1alpha2.BoundSchema)
150152
boundSchemaKey := boundSchema.Spec.Names.Plural + "." + boundSchema.Spec.Group
151153
c := cl.GetClient()

‎backend/controllers/serviceexportrbac/rbac_controller.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030
"sigs.k8s.io/controller-runtime/pkg/cluster"
3131
"sigs.k8s.io/controller-runtime/pkg/controller"
32-
"sigs.k8s.io/controller-runtime/pkg/handler"
32+
crhandler "sigs.k8s.io/controller-runtime/pkg/handler"
3333
"sigs.k8s.io/controller-runtime/pkg/log"
3434
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3535
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
36+
mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
3637
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
38+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
3739
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
3840

3941
kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2"
@@ -186,8 +188,8 @@ func (r *APIServiceExportRBACReconciler) SetupWithManager(mgr mcmanager.Manager)
186188
Complete(r)
187189
}
188190

189-
func mapAPIServiceNamespace(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
190-
return handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
191+
func mapAPIServiceNamespace(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
192+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
191193
serviceNamespace, ok := obj.(*kubebindv1alpha2.APIServiceNamespace)
192194
if !ok {
193195
return nil

‎backend/controllers/serviceexportrequest/serviceexportrequest_controller.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
"sigs.k8s.io/controller-runtime/pkg/cluster"
3232
"sigs.k8s.io/controller-runtime/pkg/controller"
33-
"sigs.k8s.io/controller-runtime/pkg/handler"
33+
crhandler "sigs.k8s.io/controller-runtime/pkg/handler"
3434
"sigs.k8s.io/controller-runtime/pkg/log"
3535
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3636
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
37+
mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
3738
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
39+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
3840
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
3941

4042
"github.com/kube-bind/kube-bind/pkg/indexers"
@@ -126,8 +128,8 @@ func NewAPIServiceExportRequestReconciler(
126128
}
127129

128130
// getServiceExportRequestMapper creates a mapping function for ServiceExport changes.
129-
func getServiceExportRequestMapper(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
130-
return handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
131+
func getServiceExportRequestMapper(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
132+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
131133
serviceExport := obj.(*kubebindv1alpha2.APIServiceExport)
132134
seKey := serviceExport.Namespace + "/" + serviceExport.Name
133135

@@ -156,8 +158,8 @@ func getServiceExportRequestMapper(clusterName string, cl cluster.Cluster) handl
156158
}
157159

158160
// getBoundSchemaMapper creates a mapping function for BoundSchema changes.
159-
func getBoundSchemaMapper(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
160-
return handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
161+
func getBoundSchemaMapper(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
162+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
161163
boundSchema := obj.(*kubebindv1alpha2.BoundSchema)
162164
boundSchemaKey := boundSchema.Spec.Names.Plural + "." + boundSchema.Spec.Group
163165
c := cl.GetClient()

‎backend/controllers/servicenamespace/servicenamespace_controller.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
"sigs.k8s.io/controller-runtime/pkg/cluster"
3232
"sigs.k8s.io/controller-runtime/pkg/controller"
33-
"sigs.k8s.io/controller-runtime/pkg/handler"
33+
crhandler "sigs.k8s.io/controller-runtime/pkg/handler"
3434
"sigs.k8s.io/controller-runtime/pkg/log"
3535
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3636
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
37+
mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
3738
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
39+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
3840
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
3941

4042
"github.com/kube-bind/kube-bind/pkg/indexers"
@@ -119,8 +121,8 @@ func NewAPIServiceNamespaceReconciler(
119121
}
120122

121123
// getNamespaceMapper creates a mapping function for Namespace changes.
122-
func getNamespaceMapper(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
123-
return handler.TypedEnqueueRequestsFromMapFunc[client.Object, mcreconcile.Request](func(ctx context.Context, obj client.Object) []mcreconcile.Request {
124+
func getNamespaceMapper(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
125+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation[client.Object, mcreconcile.Request](func(ctx context.Context, obj client.Object) []mcreconcile.Request {
124126
namespace := obj.(*corev1.Namespace)
125127
nsKey := namespace.Name
126128

@@ -148,8 +150,8 @@ func getNamespaceMapper(clusterName string, cl cluster.Cluster) handler.TypedEve
148150
}
149151

150152
// createClusterBindingMapper creates a mapping function for ClusterBinding changes.
151-
func getClusterBindingMapper(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
152-
return handler.TypedEnqueueRequestsFromMapFunc[client.Object, mcreconcile.Request](func(ctx context.Context, obj client.Object) []mcreconcile.Request {
153+
func getClusterBindingMapper(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
154+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation[client.Object, mcreconcile.Request](func(ctx context.Context, obj client.Object) []mcreconcile.Request {
153155
clusterBinding := obj.(*kubebindv1alpha2.ClusterBinding)
154156
ns := clusterBinding.Namespace
155157

@@ -178,8 +180,8 @@ func getClusterBindingMapper(clusterName string, cl cluster.Cluster) handler.Typ
178180
}
179181

180182
// getServiceExportMapper creates a mapping function for APIServiceExport changes.
181-
func getServiceExportMapper(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
182-
return handler.TypedEnqueueRequestsFromMapFunc[client.Object, mcreconcile.Request](func(ctx context.Context, obj client.Object) []mcreconcile.Request {
183+
func getServiceExportMapper(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
184+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation[client.Object, mcreconcile.Request](func(ctx context.Context, obj client.Object) []mcreconcile.Request {
183185
serviceExport := obj.(*kubebindv1alpha2.APIServiceExport)
184186
ns := serviceExport.Namespace
185187

‎backend/kubernetes/manager.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
"k8s.io/klog/v2"
4242
"sigs.k8s.io/controller-runtime/pkg/client"
4343
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
44+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
4445

4546
kuberesources "github.com/kube-bind/kube-bind/backend/kubernetes/resources"
4647
kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2"
@@ -105,7 +106,7 @@ func (m *Manager) HandleResources(
105106
logger := klog.FromContext(ctx).WithValues("identity", identity)
106107
ctx = klog.NewContext(ctx, logger)
107108

108-
cl, err := m.manager.GetCluster(ctx, cluster)
109+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
109110
if err != nil {
110111
return nil, err
111112
}
@@ -189,7 +190,7 @@ func (m *Manager) CreateAPIServiceExportRequest(
189190
) (*kubebindv1alpha2.APIServiceExportRequest, error) {
190191
logger := klog.FromContext(ctx).WithValues("namespace", namespace, "name", name)
191192

192-
cl, err := m.manager.GetCluster(ctx, cluster)
193+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
193194
if err != nil {
194195
return nil, fmt.Errorf("failed to get cluster client: %w", err)
195196
}
@@ -255,7 +256,7 @@ func (m *Manager) CreateAPIServiceExportRequest(
255256
}
256257

257258
func (m *Manager) ListCustomResourceDefinitions(ctx context.Context, cluster string, selector labels.Selector) (*apiextensionsv1.CustomResourceDefinitionList, error) {
258-
cl, err := m.manager.GetCluster(ctx, cluster)
259+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
259260
if err != nil {
260261
return nil, err
261262
}
@@ -271,7 +272,7 @@ func (m *Manager) ListCustomResourceDefinitions(ctx context.Context, cluster str
271272
}
272273

273274
func (m *Manager) ListCollections(ctx context.Context, cluster string) (*kubebindv1alpha2.CollectionList, error) {
274-
cl, err := m.manager.GetCluster(ctx, cluster)
275+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
275276
if err != nil {
276277
return nil, err
277278
}
@@ -287,7 +288,7 @@ func (m *Manager) ListCollections(ctx context.Context, cluster string) (*kubebin
287288
}
288289

289290
func (m *Manager) ListTemplates(ctx context.Context, cluster string) (*kubebindv1alpha2.APIServiceExportTemplateList, error) {
290-
cl, err := m.manager.GetCluster(ctx, cluster)
291+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
291292
if err != nil {
292293
return nil, err
293294
}
@@ -303,7 +304,7 @@ func (m *Manager) ListTemplates(ctx context.Context, cluster string) (*kubebindv
303304
}
304305

305306
func (m *Manager) GetTemplates(ctx context.Context, cluster, name string) (*kubebindv1alpha2.APIServiceExportTemplate, error) {
306-
cl, err := m.manager.GetCluster(ctx, cluster)
307+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
307308
if err != nil {
308309
return nil, err
309310
}
@@ -319,7 +320,7 @@ func (m *Manager) GetTemplates(ctx context.Context, cluster, name string) (*kube
319320
}
320321

321322
func (m *Manager) ListDynamicResources(ctx context.Context, cluster string, gvk schema.GroupVersionKind, selector labels.Selector) (*unstructured.UnstructuredList, error) {
322-
cl, err := m.manager.GetCluster(ctx, cluster)
323+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
323324
if err != nil {
324325
return nil, err
325326
}
@@ -349,7 +350,7 @@ func (m *Manager) ListDynamicResources(ctx context.Context, cluster string, gvk
349350
func (m *Manager) AuthorizeRequest(ctx context.Context, subject string, groups []string, cluster, method, path string) error {
350351
logger := klog.FromContext(ctx).WithValues("subject", subject, "cluster", cluster, "method", method, "path", path, "groups", groups)
351352

352-
cl, err := m.manager.GetCluster(ctx, cluster)
353+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
353354
if err != nil {
354355
return err
355356
}
@@ -411,7 +412,7 @@ type ConsumerStatus struct {
411412
func (m *Manager) GetConsumerStatus(ctx context.Context, identity, cluster string) (*ConsumerStatus, error) {
412413
logger := klog.FromContext(ctx).WithValues("identity", identity)
413414

414-
cl, err := m.manager.GetCluster(ctx, cluster)
415+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(cluster))
415416
if err != nil {
416417
return nil, err
417418
}
@@ -683,7 +684,7 @@ func (m *Manager) waitForCRD(ctx context.Context, c client.Client, crdName strin
683684
func (m *Manager) SeedDefaultCluster(ctx context.Context) error {
684685
logger := klog.FromContext(ctx)
685686

686-
cl, err := m.manager.GetCluster(ctx, "")
687+
cl, err := m.manager.GetCluster(ctx, multicluster.ClusterName(""))
687688
if err != nil {
688689
return err
689690
}

‎backend/provider/kcp/controllers/apibindingtemplate/controller.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ import (
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535
"sigs.k8s.io/controller-runtime/pkg/cluster"
3636
"sigs.k8s.io/controller-runtime/pkg/controller"
37-
"sigs.k8s.io/controller-runtime/pkg/handler"
37+
crhandler "sigs.k8s.io/controller-runtime/pkg/handler"
3838
"sigs.k8s.io/controller-runtime/pkg/log"
3939
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4040
mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
41+
mchandler "sigs.k8s.io/multicluster-runtime/pkg/handler"
4142
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
43+
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
4244
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
4345

4446
"github.com/kube-bind/kube-bind/backend/provider/kcp/controllers/shared"
@@ -138,8 +140,8 @@ func (r *APIBindingTemplateReconciler) Reconcile(ctx context.Context, req mcreco
138140
// This function has the signature func(clusterName string, cl cluster.Cluster) handler.TypedEventHandler
139141
// because multicluster-runtime's mcbuilder.Watches accepts a "per-cluster event handler factory"
140142
// rather than a plain handler — it calls this factory for each cluster that is engaged.
141-
func getTemplateMapper(clusterName string, cl cluster.Cluster) handler.TypedEventHandler[client.Object, mcreconcile.Request] {
142-
return handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
143+
func getTemplateMapper(clusterName multicluster.ClusterName, cl cluster.Cluster) crhandler.TypedEventHandler[client.Object, mcreconcile.Request] {
144+
return mchandler.TypedEnqueueRequestsFromMapFuncWithClusterPreservation(func(ctx context.Context, obj client.Object) []mcreconcile.Request {
143145
annotations := obj.GetAnnotations()
144146
if annotations == nil {
145147
return nil

‎backend/provider/kcp/provider.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func New(cfg *rest.Config, endpointSliceName string, options provider.Options) (
6262
}
6363

6464
// Get returns the cluster with the given name as a cluster.Cluster.
65-
func (p *Provider) Get(ctx context.Context, clusterName string) (cluster.Cluster, error) {
65+
func (p *Provider) Get(ctx context.Context, clusterName multicluster.ClusterName) (cluster.Cluster, error) {
6666
return p.Provider.Get(ctx, clusterName)
6767
}
6868

@@ -82,12 +82,12 @@ type awareWrapper struct {
8282
multicluster.Aware
8383
}
8484

85-
func (a *awareWrapper) Engage(ctx context.Context, name string, cluster cluster.Cluster) error {
86-
ctx, cancel := context.WithCancel(ctx) //nolint:govet // cancel is called in the error case only.
85+
func (a *awareWrapper) Engage(ctx context.Context, name multicluster.ClusterName, cluster cluster.Cluster) error {
86+
ctx, cancel := context.WithCancel(ctx)
87+
defer cancel()
8788

8889
err := a.Aware.Engage(ctx, name, cluster)
8990
if err != nil {
90-
cancel()
9191
return err
9292
}
9393

@@ -108,7 +108,6 @@ func (a *awareWrapper) Engage(ctx context.Context, name string, cluster cluster.
108108
}
109109

110110
if !apierrors.IsForbidden(err) {
111-
cancel()
112111
return err
113112
}
114113

@@ -117,17 +116,15 @@ func (a *awareWrapper) Engage(ctx context.Context, name string, cluster cluster.
117116
select {
118117
case <-time.After(backoff):
119118
case <-ctx.Done():
120-
cancel()
121119
return ctx.Err()
122120
}
123121
}
124122
}
125123

126124
if err != nil && !apierrors.IsAlreadyExists(err) {
127-
cancel()
128125
return err
129126
}
130-
return nil //nolint:govet // cancel is called in the error case only.
127+
return nil
131128
}
132129

133130
// NewKCPExternalAddressGenerator returns an ExternalAddressGeneratorFunc

0 commit comments

Comments
 (0)