Skip to content
This repository was archived by the owner on Apr 24, 2024. It is now read-only.

Commit 88d7475

Browse files
ncdcncdc
authored
Merge pull request #10 from ncdc/drop-kcp-go-mod-replace
React to latest kcp-dev/controller-runtime changes that drop the need to use kcp-dev/kubernetes forks
2 parents cbb3657 + 3dc2539 commit 88d7475

File tree

5 files changed

+31
-285
lines changed

5 files changed

+31
-285
lines changed

‎controllers/configmap_controller.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ type ConfigMapReconciler struct {
4141
}
4242

4343
func (r *ConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
44-
log := log.FromContext(ctx).WithValues("cluster", req.ObjectKey.Cluster.String())
44+
log := log.FromContext(ctx).WithValues("cluster", req.ClusterName)
4545

46-
ctx = kcpclient.WithCluster(ctx, req.ObjectKey.Cluster)
46+
ctx = kcpclient.WithCluster(ctx, logicalcluster.New(req.ClusterName))
4747

4848
// Test get
4949
var configMap corev1.ConfigMap
5050

51-
if err := r.Get(ctx, req.ObjectKey, &configMap); err != nil {
51+
if err := r.Get(ctx, req.NamespacedName, &configMap); err != nil {
5252
log.Error(err, "unable to get configmap")
5353
return ctrl.Result{}, nil
5454
}
@@ -85,10 +85,7 @@ func (r *ConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
8585
nsName, exists := configMap.Data["namespace"]
8686
if exists {
8787
var namespace corev1.Namespace
88-
nsKey := client.ObjectKey{
89-
NamespacedName: types.NamespacedName{Name: nsName},
90-
Cluster: req.ObjectKey.Cluster,
91-
}
88+
nsKey := types.NamespacedName{Name: nsName}
9289

9390
if err := r.Get(ctx, nsKey, &namespace); err != nil {
9491
if !apierrors.IsNotFound(err) {

‎controllers/widget_controller.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121

2222
kcpclient "github.com/kcp-dev/apimachinery/pkg/client"
23+
"github.com/kcp-dev/logicalcluster"
2324
"k8s.io/apimachinery/pkg/api/errors"
2425
"k8s.io/apimachinery/pkg/runtime"
2526
ctrl "sigs.k8s.io/controller-runtime"
@@ -45,7 +46,7 @@ func (r *WidgetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
4546

4647
// Include the clusterName from req.ObjectKey in the logger, similar to the namespace and name keys that are already
4748
// there.
48-
logger = logger.WithValues("clusterName", req.ObjectKey.Cluster.String())
49+
logger = logger.WithValues("clusterName", req.ClusterName)
4950

5051
// You probably wouldn't need to do this, but if you wanted to list all instances across all logical clusters:
5152
var allWidgets datav1alpha1.WidgetList
@@ -56,11 +57,11 @@ func (r *WidgetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
5657
logger.Info("Listed all widgets across all workspaces", "count", len(allWidgets.Items))
5758

5859
// Add the logical cluster to the context
59-
ctx = kcpclient.WithCluster(ctx, req.ObjectKey.Cluster)
60+
ctx = kcpclient.WithCluster(ctx, logicalcluster.New(req.ClusterName))
6061

6162
logger.Info("Getting widget")
6263
var w datav1alpha1.Widget
63-
if err := r.Get(ctx, req.ObjectKey, &w); err != nil {
64+
if err := r.Get(ctx, req.NamespacedName, &w); err != nil {
6465
if errors.IsNotFound(err) {
6566
// Normal - was deleted
6667
return ctrl.Result{}, nil

‎go.mod

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/kcp-dev/controller-runtime-example
33
go 1.17
44

55
require (
6-
github.com/kcp-dev/apimachinery v0.0.0-20220531195037-598aef366e6d
7-
github.com/kcp-dev/kcp v0.4.0-alpha.0.0.20220527200938-63b311a088fe
6+
github.com/kcp-dev/apimachinery v0.0.0-20220621200107-3d03cbbc3770
7+
github.com/kcp-dev/kcp/pkg/apis v0.5.0-alpha.1
88
github.com/kcp-dev/logicalcluster v1.0.0
99
github.com/onsi/ginkgo v1.16.5
1010
github.com/onsi/gomega v1.17.0
@@ -76,32 +76,4 @@ require (
7676
sigs.k8s.io/yaml v1.3.0 // indirect
7777
)
7878

79-
replace (
80-
k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20220524063253-5bb0eeecf2cf
81-
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20220524063253-5bb0eeecf2cf
82-
k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20220524063253-5bb0eeecf2cf
83-
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20220524063253-5bb0eeecf2cf
84-
k8s.io/cli-runtime => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20220524063253-5bb0eeecf2cf
85-
k8s.io/client-go => github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20220524063253-5bb0eeecf2cf
86-
k8s.io/cloud-provider => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20220524063253-5bb0eeecf2cf
87-
k8s.io/cluster-bootstrap => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20220524063253-5bb0eeecf2cf
88-
k8s.io/code-generator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20220524063253-5bb0eeecf2cf
89-
k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20220524063253-5bb0eeecf2cf
90-
k8s.io/component-helpers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20220524063253-5bb0eeecf2cf
91-
k8s.io/controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20220524063253-5bb0eeecf2cf
92-
k8s.io/cri-api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20220524063253-5bb0eeecf2cf
93-
k8s.io/csi-translation-lib => github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20220524063253-5bb0eeecf2cf
94-
k8s.io/kube-aggregator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20220524063253-5bb0eeecf2cf
95-
k8s.io/kube-controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20220524063253-5bb0eeecf2cf
96-
k8s.io/kube-proxy => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20220524063253-5bb0eeecf2cf
97-
k8s.io/kube-scheduler => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20220524063253-5bb0eeecf2cf
98-
k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20220524063253-5bb0eeecf2cf
99-
k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20220524063253-5bb0eeecf2cf
100-
k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20220524063253-5bb0eeecf2cf
101-
k8s.io/legacy-cloud-providers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20220524063253-5bb0eeecf2cf
102-
k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20220524063253-5bb0eeecf2cf
103-
k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20220524063253-5bb0eeecf2cf
104-
k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20220524063253-5bb0eeecf2cf
105-
k8s.io/sample-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20220524063253-5bb0eeecf2cf
106-
sigs.k8s.io/controller-runtime => github.com/kcp-dev/controller-runtime v0.11.3-0.20220601041701-6ae831c93ef5
107-
)
79+
replace sigs.k8s.io/controller-runtime => github.com/kcp-dev/controller-runtime v0.11.3-0.20220624161137-f6e5a2f56683

0 commit comments

Comments
 (0)