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

Commit a59ffcd

Browse files
christopherheinchristopherhein
committed
upgrading controller-runtime to v0.7.2
Signed-off-by: Chris Hein <[email protected]>
1 parent 5f78101 commit a59ffcd

File tree

94 files changed

+1815
-2459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1815
-2459
lines changed

‎virtualcluster/cmd/manager/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/apis"
2828
"sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/controller"
2929
"sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/webhook"
30+
ctrl "sigs.k8s.io/controller-runtime"
3031
"sigs.k8s.io/controller-runtime/pkg/client/config"
32+
logf "sigs.k8s.io/controller-runtime/pkg/log"
3133
"sigs.k8s.io/controller-runtime/pkg/manager"
32-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
33-
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
3434

3535
"sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/controller/constants"
3636
logrutil "sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/controller/util/logr"
@@ -139,7 +139,7 @@ func main() {
139139

140140
// Start the Cmd
141141
log.Info("Starting the Cmd.")
142-
if err := mgr.Start(signals.SetupSignalHandler()); err != nil {
142+
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
143143
log.Error(err, "unable to run the manager")
144144
os.Exit(1)
145145
}

‎virtualcluster/cmd/syncer/app/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626

2727
"github.com/spf13/cobra"
2828
"k8s.io/apiserver/pkg/server/healthz"
29-
"k8s.io/apiserver/pkg/util/term"
3029
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
3130
"k8s.io/client-go/tools/leaderelection"
3231
cliflag "k8s.io/component-base/cli/flag"
3332
"k8s.io/component-base/cli/globalflag"
33+
"k8s.io/component-base/term"
3434
"k8s.io/klog"
3535

3636
syncerconfig "sigs.k8s.io/cluster-api-provider-nested/virtualcluster/cmd/syncer/app/config"

‎virtualcluster/cmd/vn-agent/app/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525

2626
"github.com/pkg/errors"
2727
"github.com/spf13/cobra"
28-
"k8s.io/apiserver/pkg/util/term"
2928
certutil "k8s.io/client-go/util/cert"
3029
cliflag "k8s.io/component-base/cli/flag"
3130
"k8s.io/component-base/cli/globalflag"
31+
"k8s.io/component-base/term"
3232
"k8s.io/klog"
3333

3434
"sigs.k8s.io/cluster-api-provider-nested/virtualcluster/cmd/vn-agent/app/options"

‎virtualcluster/config/crds/tenancy.x-k8s.io_clusterversions.yaml

+1,450-891
Large diffs are not rendered by default.

‎virtualcluster/doc/customresource-syncer.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ type FooSpec struct {
3232
Replicas int `json:"replicas"`
3333
}
3434
35-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
35+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
3636
type Foo struct {
3737
metav1.TypeMeta `json:",inline"`
3838
metav1.ObjectMeta `json:"metadata,omitempty"`
3939
Spec FooSpec `json:"spec"`
4040
}
4141
42-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
42+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
4343
type FooList struct {
4444
metav1.TypeMeta `json:",inline"`
4545
metav1.ListMeta `json:"metadata,omitempty"`

‎virtualcluster/experiment/cmd/scheduler/app/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525

2626
"github.com/prometheus/client_golang/prometheus/promhttp"
2727
"github.com/spf13/cobra"
28-
"k8s.io/apiserver/pkg/util/term"
2928
"k8s.io/client-go/tools/leaderelection"
3029
cliflag "k8s.io/component-base/cli/flag"
3130
"k8s.io/component-base/cli/globalflag"
31+
"k8s.io/component-base/term"
3232
"k8s.io/klog"
3333

3434
schedulerappconfig "sigs.k8s.io/cluster-api-provider-nested/virtualcluster/experiment/cmd/scheduler/app/config"

‎virtualcluster/experiment/pkg/apis/cluster/v1alpha4/cluster_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func (v APIEndpoint) String() string {
221221

222222
// Cluster is the Schema for the clusters API
223223
// +genclient
224-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
224+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
225225
type Cluster struct {
226226
metav1.TypeMeta `json:",inline"`
227227
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -239,7 +239,7 @@ func (c *Cluster) SetConditions(conditions Conditions) {
239239
}
240240

241241
// ClusterList contains a list of Cluster
242-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
242+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
243243
type ClusterList struct {
244244
metav1.TypeMeta `json:",inline"`
245245
metav1.ListMeta `json:"metadata,omitempty"`

‎virtualcluster/experiment/pkg/apis/cluster/v1alpha4/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v1alpha4
1818

1919
import (
2020
"k8s.io/apimachinery/pkg/runtime/schema"
21-
"sigs.k8s.io/controller-runtime/pkg/runtime/scheme"
21+
"sigs.k8s.io/controller-runtime/pkg/scheme"
2222
)
2323

2424
var (

‎virtualcluster/experiment/pkg/apis/cluster/v1alpha4/zz_generated.deepcopy.go

-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎virtualcluster/experiment/pkg/scheduler/reconciler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
v1 "k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27-
"k8s.io/apimachinery/pkg/runtime"
2827
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2928
"k8s.io/client-go/tools/cache"
3029
"k8s.io/klog"
@@ -38,6 +37,7 @@ import (
3837
"sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/syncer/conversion"
3938
"sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/util/cluster"
4039
mc "sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/util/mccontroller"
40+
"sigs.k8s.io/controller-runtime/pkg/client"
4141
)
4242

4343
type virtualclusterGetter struct {
@@ -46,7 +46,7 @@ type virtualclusterGetter struct {
4646

4747
var _ mc.Getter = &virtualclusterGetter{}
4848

49-
func (v *virtualclusterGetter) GetObject(namespace, name string) (runtime.Object, error) {
49+
func (v *virtualclusterGetter) GetObject(namespace, name string) (client.Object, error) {
5050
vc, err := v.lister.VirtualClusters(namespace).Get(name)
5151
if err != nil {
5252
return nil, err
@@ -212,7 +212,7 @@ type superclusterGetter struct {
212212

213213
var _ mc.Getter = &superclusterGetter{}
214214

215-
func (v *superclusterGetter) GetObject(namespace, name string) (runtime.Object, error) {
215+
func (v *superclusterGetter) GetObject(namespace, name string) (client.Object, error) {
216216
super, err := v.lister.Clusters(namespace).Get(name)
217217
if err != nil {
218218
return nil, err

‎virtualcluster/experiment/pkg/scheduler/resource/supercluster/namespace/controller.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package namespace
1818

1919
import (
2020
"fmt"
21+
2122
v1 "k8s.io/api/core/v1"
2223
"k8s.io/klog"
2324

@@ -84,9 +85,9 @@ func (c *controller) Reconcile(request reconciler.Request) (reconciler.Result, e
8485
klog.Infof("reconcile namespace %s for super cluster %s", request.Name, request.ClusterName)
8586
key := fmt.Sprintf("%s/%s", request.ClusterName, request.Name)
8687
exists := true
87-
nsObj, err := c.MultiClusterController.Get(request.ClusterName, request.Namespace, request.Name)
88-
ns := nsObj.(*v1.Namespace)
89-
if err != nil {
88+
89+
ns := &v1.Namespace{}
90+
if err := c.MultiClusterController.Get(request.ClusterName, request.Namespace, request.Name, ns); err != nil {
9091
if !errors.IsNotFound(err) {
9192
return reconciler.Result{Requeue: true}, err
9293
}
@@ -99,15 +100,15 @@ func (c *controller) Reconcile(request reconciler.Request) (reconciler.Result, e
99100
return reconciler.Result{}, nil
100101
}
101102
var slices []*internalcache.Slice
102-
slices, err = util.GetProvisionedSlices(ns, request.ClusterName, key)
103+
slices, err := util.GetProvisionedSlices(ns, request.ClusterName, key)
103104
if err != nil {
104105
return reconciler.Result{Requeue: true}, fmt.Errorf("fail to reconcile %s/%s: %v", request.ClusterName, request.Name, err)
105106
}
106-
if err = c.SchedulerCache.AddProvision(request.ClusterName, key, slices); err != nil {
107+
if err := c.SchedulerCache.AddProvision(request.ClusterName, key, slices); err != nil {
107108
return reconciler.Result{Requeue: true}, err
108109
}
109110
} else {
110-
if err = c.SchedulerCache.RemoveProvision(request.ClusterName, key); err != nil {
111+
if err := c.SchedulerCache.RemoveProvision(request.ClusterName, key); err != nil {
111112
return reconciler.Result{Requeue: true}, err
112113
}
113114
}

‎virtualcluster/experiment/pkg/scheduler/resource/virtualcluster/namespace/controller.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ func (c *controller) Reconcile(request reconciler.Request) (reconciler.Result, e
102102
return reconciler.Result{RequeueAfter: 5 * time.Second}, nil
103103
}
104104

105-
nsObj, err := c.MultiClusterController.Get(request.ClusterName, "", request.Name)
106-
if err != nil {
105+
namespace := &v1.Namespace{}
106+
if err := c.MultiClusterController.Get(request.ClusterName, "", request.Name, namespace); err != nil {
107107
if !errors.IsNotFound(err) {
108108
return reconciler.Result{}, err
109109
}
@@ -116,21 +116,18 @@ func (c *controller) Reconcile(request reconciler.Request) (reconciler.Result, e
116116
}
117117

118118
var quota v1.ResourceList
119-
quotaListObj, err := c.MultiClusterController.ListByObjectType(request.ClusterName, &v1.ResourceQuota{}, client.InNamespace(request.Name))
120-
if err != nil {
119+
quotaList := &v1.ResourceQuotaList{}
120+
if err := c.MultiClusterController.List(request.ClusterName, quotaList, client.InNamespace(request.Name)); err != nil {
121121
if !errors.IsNotFound(err) {
122122
return reconciler.Result{}, fmt.Errorf("failed to get resource quota in %s/%s: %v", request.ClusterName, request.Name, err)
123123
}
124124
quota = v1.ResourceList{
125125
v1.ResourceCPU: resource.MustParse("0"),
126126
v1.ResourceMemory: resource.MustParse("0"),
127127
}
128-
} else {
129-
quotaList := quotaListObj.(*v1.ResourceQuotaList)
130-
quota = util.GetMaxQuota(quotaList)
131128
}
129+
quota = util.GetMaxQuota(quotaList)
132130

133-
namespace := nsObj.(*v1.Namespace)
134131
placements, quotaSlice, err := util.GetSchedulingInfo(namespace)
135132
if err != nil {
136133
return reconciler.Result{}, fmt.Errorf("failed to get scheduling info in %s: %v", request.Name, err)

‎virtualcluster/experiment/pkg/scheduler/resource/virtualcluster/pod/controller.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ func (c *controller) Reconcile(request reconciler.Request) (reconciler.Result, e
9999
return reconciler.Result{RequeueAfter: 5 * time.Second}, nil
100100
}
101101

102+
pod := &v1.Pod{}
102103
podKey := fmt.Sprintf("%s/%s/%s", request.ClusterName, request.Namespace, request.Name)
103-
podObj, err := c.MultiClusterController.Get(request.ClusterName, request.Namespace, request.Name)
104-
if err != nil {
104+
if err := c.MultiClusterController.Get(request.ClusterName, request.Namespace, request.Name, pod); err != nil {
105105
if !errors.IsNotFound(err) {
106106
return reconciler.Result{}, err
107107
}
@@ -112,7 +112,6 @@ func (c *controller) Reconcile(request reconciler.Request) (reconciler.Result, e
112112
return reconciler.Result{}, nil
113113
}
114114

115-
pod := podObj.(*v1.Pod)
116115
if c.skipPodSchedule(pod) {
117116
// skip irrelevant pod update event
118117
// we assume pod's scheduling info won't be manually mutated during pod running by now.

‎virtualcluster/experiment/pkg/scheduler/resource/virtualcluster/resourcequota/controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ func (c *controller) Reconcile(request reconciler.Request) (reconciler.Result, e
8888
panic("namespace mccontroller is necessary")
8989
}
9090

91-
nsObj, err := c.MultiClusterController.GetByObjectType(request.ClusterName, "", request.Namespace, &v1.Namespace{})
92-
if err != nil {
91+
namespace := &v1.Namespace{}
92+
if err := c.MultiClusterController.Get(request.ClusterName, "", request.Namespace, namespace); err != nil {
9393
return reconciler.Result{Requeue: true}, fmt.Errorf("failed to get namespace %s in %s: %v", request.Namespace, request.ClusterName, err)
9494
}
95-
namespace := nsObj.(*v1.Namespace)
95+
9696
if err := nsWatcher.GetMCController().RequeueObject(request.ClusterName, namespace); err != nil {
9797
return reconciler.Result{Requeue: true}, fmt.Errorf("failed to requeue namespace %s in %s: %v", request.Namespace, request.ClusterName, err)
9898
}

‎virtualcluster/pkg/apis/tenancy/v1alpha1/clusterversion_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ type ClusterVersionStatus struct {
5454

5555
// +kubebuilder:object:root=true
5656
// +genclient
57-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
57+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
5858
// +genclient:nonNamespaced
5959
// +kubebuilder:resource:scope=Cluster,shortName=cv
6060

@@ -69,7 +69,7 @@ type ClusterVersion struct {
6969
}
7070

7171
// +kubebuilder:object:root=true
72-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
72+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
7373
// +genclient:nonNamespaced
7474

7575
// ClusterVersionList contains a list of ClusterVersion

‎virtualcluster/pkg/apis/tenancy/v1alpha1/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v1alpha1
1818

1919
import (
2020
"k8s.io/apimachinery/pkg/runtime/schema"
21-
"sigs.k8s.io/controller-runtime/pkg/runtime/scheme"
21+
"sigs.k8s.io/controller-runtime/pkg/scheme"
2222
)
2323

2424
var (

‎virtualcluster/pkg/apis/tenancy/v1alpha1/virtualcluster_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ type ClusterCondition struct {
114114
}
115115

116116
// +genclient
117-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
117+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
118118
// +kubebuilder:object:root=true
119119
// +kubebuilder:resource:shortName=vc
120120
// +k8s:openapi-gen=true
@@ -130,7 +130,7 @@ type VirtualCluster struct {
130130
}
131131

132132
// +kubebuilder:object:root=true
133-
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
133+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/client.Object
134134

135135
// VirtualClusterList contains a list of VirtualCluster
136136
type VirtualClusterList struct {

‎virtualcluster/pkg/apis/tenancy/v1alpha1/virtualcluster_webhook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime/schema"
2525
"k8s.io/apimachinery/pkg/util/validation/field"
2626
ctrl "sigs.k8s.io/controller-runtime"
27-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
27+
logf "sigs.k8s.io/controller-runtime/pkg/log"
2828
"sigs.k8s.io/controller-runtime/pkg/webhook"
2929
)
3030

@@ -63,7 +63,7 @@ func (vc *VirtualCluster) validateVirtualClusterUpdate(old runtime.Object) error
6363
var allErrs field.ErrorList
6464
oldVC, ok := old.(*VirtualCluster)
6565
if !ok {
66-
return errors.New("fail to assert runtime.Object to tenancyv1alpha1.VirtualCluster")
66+
return errors.New("fail to assert client.Object to tenancyv1alpha1.VirtualCluster")
6767
}
6868
// once the VC.Status.Phase is set, it can't be set to empty again
6969
if oldVC.Status.Phase != "" && vc.Status.Phase == "" {

‎virtualcluster/pkg/controller/clusterversion/clusterversion_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/client"
2525
"sigs.k8s.io/controller-runtime/pkg/controller"
2626
"sigs.k8s.io/controller-runtime/pkg/handler"
27+
logf "sigs.k8s.io/controller-runtime/pkg/log"
2728
"sigs.k8s.io/controller-runtime/pkg/manager"
2829
"sigs.k8s.io/controller-runtime/pkg/reconcile"
29-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
3030
"sigs.k8s.io/controller-runtime/pkg/source"
3131

3232
tenancyv1alpha1 "sigs.k8s.io/cluster-api-provider-nested/virtualcluster/pkg/apis/tenancy/v1alpha1"
@@ -76,7 +76,7 @@ type ReconcileClusterVersion struct {
7676
// and what is in the ClusterVersion.Spec
7777
// +kubebuilder:rbac:groups=tenancy.x-k8s.io,resources=clusterversions,verbs=get;list;watch;create;update;patch;delete
7878
// +kubebuilder:rbac:groups=tenancy.x-k8s.io,resources=clusterversions/status,verbs=get;update;patch
79-
func (r *ReconcileClusterVersion) Reconcile(request reconcile.Request) (reconcile.Result, error) {
79+
func (r *ReconcileClusterVersion) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
8080

8181
// Fetch the ClusterVersion instance
8282
log.Info("reconciling ClusterVersion...")

0 commit comments

Comments
 (0)