Skip to content

Commit 6c83acc

Browse files
committed
review nits
1 parent fa7fd4f commit 6c83acc

3 files changed

Lines changed: 7 additions & 14 deletions

File tree

backend/controllers/serviceexportrequest/serviceexportrequest_reconcile.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,14 +378,14 @@ func (r *reconciler) ensureAPIServiceNamespaces(ctx context.Context, cl client.C
378378

379379
// TODO(mjudeikis): We have this object above already, pass it down to avoid extra get.
380380
export := &kubebindv1alpha2.APIServiceExport{}
381-
if err := cl.Get(ctx, client.ObjectKey{Namespace: req.Namespace, Name: req.Name}, export); err != nil {
381+
if err := cl.Get(ctx, client.ObjectKeyFromObject(req), export); err != nil {
382382
return fmt.Errorf("failed to get APIServiceExport %s/%s: %w", req.Namespace, req.Name, err)
383383
}
384384

385385
for _, ns := range req.Spec.Namespaces {
386386
apiServiceNamespace := helpers.APIServiceNamespaceFromExport(export, ns.Name)
387387
currentAPIServiceNamespace := &kubebindv1alpha2.APIServiceNamespace{}
388-
err := cache.Get(ctx, client.ObjectKey{Namespace: apiServiceNamespace.Namespace, Name: apiServiceNamespace.Name}, currentAPIServiceNamespace)
388+
err := cache.Get(ctx, client.ObjectKeyFromObject(apiServiceNamespace), currentAPIServiceNamespace)
389389
if err != nil {
390390
if apierrors.IsNotFound(err) {
391391
logger.V(1).Info("Creating APIServiceNamespace", "name", apiServiceNamespace.Name, "namespace", apiServiceNamespace.Namespace)

contrib/kcp/README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ kubectl kcp bind apiexport root:provider:cowboys-stable
104104
```bash
105105
kubectl get logicalcluster
106106
# NAME PHASE URL AGE
107-
# cluster Ready https://192.168.2.166:6443/clusters/1f4roigyt6meiaf8
107+
# cluster Ready https://192.168.2.166:6443/clusters/1f4roigyt6meiaf8
108108
```
109109

110110
## Consumer
@@ -169,9 +169,6 @@ kubectl apply -f contrib/kcp/deploy/examples/cowboy.yaml
169169
kubectl apply -f contrib/kcp/deploy/examples/sheriff.yaml
170170
```
171171

172-
173-
174-
175172
## Debug
176173

177174
```bash

pkg/konnector/controllers/cluster/namespacelifecycle/namespacelifecycle_controller.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,11 @@ func (c *controller) process(ctx context.Context, key string) error {
221221
return nil // we cannot do anything
222222
}
223223

224-
current, err := c.getServiceNamespace(snsNamespace, name)
225-
if err != nil && !errors.IsNotFound(err) {
226-
return err
227-
}
228-
229-
switch {
230-
case errors.IsNotFound(err):
224+
if current, err := c.getServiceNamespace(snsNamespace, name); errors.IsNotFound(err) {
231225
return c.handleNamespaceDeletion(ctx, snsNamespace, name)
232-
default:
226+
} else if err != nil {
227+
return err
228+
} else {
233229
return c.handleNamespaceLifecycle(ctx, current)
234230
}
235231
}

0 commit comments

Comments
 (0)