Skip to content

Commit 2ad9041

Browse files
rohanKanojiarohanKanojia
committed
chore (deps) : bump controller-runtime to v0.18.7
Signed-off-by: Rohan Kumar <rohaan@redhat.com>
1 parent efb5ad6 commit 2ad9041

20 files changed

Lines changed: 888 additions & 698 deletions

File tree

‎controllers/cleanupcronjob/cleanupcronjob_controller.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ import (
2020
"fmt"
2121
"time"
2222

23+
"sigs.k8s.io/controller-runtime/pkg/reconcile"
24+
25+
dwv2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
26+
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
27+
"github.com/devfile/devworkspace-operator/pkg/conditions"
28+
"github.com/devfile/devworkspace-operator/pkg/config"
29+
"github.com/devfile/devworkspace-operator/pkg/infrastructure"
2330
"github.com/go-logr/logr"
2431
"k8s.io/apimachinery/pkg/runtime"
2532
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -28,13 +35,6 @@ import (
2835
"sigs.k8s.io/controller-runtime/pkg/event"
2936
"sigs.k8s.io/controller-runtime/pkg/handler"
3037
"sigs.k8s.io/controller-runtime/pkg/predicate"
31-
"sigs.k8s.io/controller-runtime/pkg/source"
32-
33-
dwv2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
34-
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
35-
"github.com/devfile/devworkspace-operator/pkg/conditions"
36-
"github.com/devfile/devworkspace-operator/pkg/config"
37-
"github.com/devfile/devworkspace-operator/pkg/infrastructure"
3838

3939
"github.com/operator-framework/operator-lib/prune"
4040
"github.com/robfig/cron/v3"
@@ -123,10 +123,9 @@ func (r *CleanupCronJobReconciler) SetupWithManager(mgr ctrl.Manager) error {
123123

124124
return ctrl.NewControllerManagedBy(mgr).
125125
Named("CleanupCronJob").
126-
Watches(&source.Kind{Type: &controllerv1alpha1.DevWorkspaceOperatorConfig{}},
127-
handler.EnqueueRequestsFromMapFunc(func(object client.Object) []ctrl.Request {
126+
Watches(&controllerv1alpha1.DevWorkspaceOperatorConfig{},
127+
handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
128128
operatorNamespace, err := infrastructure.GetNamespace()
129-
130129
// Ignore events from other namespaces
131130
if err != nil || object.GetNamespace() != operatorNamespace || object.GetName() != config.OperatorConfigName {
132131
log.Info("Received event from different namespace, ignoring", "namespace", object.GetNamespace())

‎controllers/controller/devworkspacerouting/suite_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
"path/filepath"
2121
"testing"
2222

23+
"sigs.k8s.io/controller-runtime/pkg/webhook"
24+
2325
dwv1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha1"
2426
dwv2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2527
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
@@ -115,10 +117,13 @@ var _ = BeforeSuite(func() {
115117

116118
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
117119
Scheme: scheme.Scheme,
118-
Port: 9443,
119120
NewCache: cacheFunc,
120121
})
121122
Expect(err).NotTo(HaveOccurred())
123+
err = mgr.Add(webhook.NewServer(webhook.Options{
124+
Port: 9443,
125+
}))
126+
Expect(err).NotTo(HaveOccurred())
122127

123128
nonCachingClient, err := client.New(mgr.GetConfig(), client.Options{Scheme: scheme.Scheme})
124129
Expect(err).NotTo(HaveOccurred())

‎controllers/workspace/devworkspace_controller.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
"github.com/devfile/devworkspace-operator/pkg/library/ssh"
2626

27+
dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2728
devfilevalidation "github.com/devfile/api/v2/pkg/validation"
2829
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
2930
"github.com/devfile/devworkspace-operator/controllers/workspace/metrics"
@@ -34,6 +35,7 @@ import (
3435
"github.com/devfile/devworkspace-operator/pkg/dwerrors"
3536
"github.com/devfile/devworkspace-operator/pkg/library/annotate"
3637
containerlib "github.com/devfile/devworkspace-operator/pkg/library/container"
38+
wsDefaults "github.com/devfile/devworkspace-operator/pkg/library/defaults"
3739
"github.com/devfile/devworkspace-operator/pkg/library/env"
3840
"github.com/devfile/devworkspace-operator/pkg/library/flatten"
3941
"github.com/devfile/devworkspace-operator/pkg/library/home"
@@ -63,10 +65,6 @@ import (
6365
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
6466
"sigs.k8s.io/controller-runtime/pkg/handler"
6567
"sigs.k8s.io/controller-runtime/pkg/reconcile"
66-
"sigs.k8s.io/controller-runtime/pkg/source"
67-
68-
dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
69-
wsDefaults "github.com/devfile/devworkspace-operator/pkg/library/defaults"
7068
)
7169

7270
const (
@@ -701,7 +699,7 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
701699
return err
702700
}
703701

704-
var emptyMapper = func(obj client.Object) []reconcile.Request {
702+
var emptyMapper = func(ctx context.Context, obj client.Object) []reconcile.Request {
705703
return []reconcile.Request{}
706704
}
707705

@@ -722,12 +720,12 @@ func (r *DevWorkspaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
722720
Owns(&corev1.ConfigMap{}).
723721
Owns(&corev1.Secret{}).
724722
Owns(&corev1.ServiceAccount{}).
725-
Watches(&source.Kind{Type: &corev1.Pod{}}, handler.EnqueueRequestsFromMapFunc(dwRelatedPodsHandler)).
726-
Watches(&source.Kind{Type: &corev1.PersistentVolumeClaim{}}, handler.EnqueueRequestsFromMapFunc(r.dwPVCHandler)).
727-
Watches(&source.Kind{Type: &corev1.Secret{}}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
728-
Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
729-
Watches(&source.Kind{Type: &corev1.PersistentVolumeClaim{}}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
730-
Watches(&source.Kind{Type: &controllerv1alpha1.DevWorkspaceOperatorConfig{}}, handler.EnqueueRequestsFromMapFunc(emptyMapper), configWatcher).
723+
Watches(&corev1.Pod{}, handler.EnqueueRequestsFromMapFunc(dwRelatedPodsHandler)).
724+
Watches(&corev1.PersistentVolumeClaim{}, handler.EnqueueRequestsFromMapFunc(r.dwPVCHandler)).
725+
Watches(&corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
726+
Watches(&corev1.ConfigMap{}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
727+
Watches(&corev1.PersistentVolumeClaim{}, handler.EnqueueRequestsFromMapFunc(r.runningWorkspacesHandler), automountWatcher).
728+
Watches(&controllerv1alpha1.DevWorkspaceOperatorConfig{}, handler.EnqueueRequestsFromMapFunc(emptyMapper), configWatcher).
731729
WithEventFilter(devworkspacePredicates).
732730
WithEventFilter(podPredicates).
733731
Complete(r)

‎controllers/workspace/eventhandlers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
// Mapping the pod to the devworkspace
29-
func dwRelatedPodsHandler(obj client.Object) []reconcile.Request {
29+
func dwRelatedPodsHandler(ctx context.Context, obj client.Object) []reconcile.Request {
3030
labels := obj.GetLabels()
3131
if _, ok := labels[constants.DevWorkspaceNameLabel]; !ok {
3232
return []reconcile.Request{}
@@ -47,7 +47,7 @@ func dwRelatedPodsHandler(obj client.Object) []reconcile.Request {
4747
}
4848
}
4949

50-
func (r *DevWorkspaceReconciler) dwPVCHandler(obj client.Object) []reconcile.Request {
50+
func (r *DevWorkspaceReconciler) dwPVCHandler(ctx context.Context, obj client.Object) []reconcile.Request {
5151
if obj.GetDeletionTimestamp() == nil {
5252
// Do not reconcile unless PVC is being deleted.
5353
return []reconcile.Request{}
@@ -118,7 +118,7 @@ func (r *DevWorkspaceReconciler) dwPVCHandler(obj client.Object) []reconcile.Req
118118
return reconciles
119119
}
120120

121-
func (r *DevWorkspaceReconciler) runningWorkspacesHandler(obj client.Object) []reconcile.Request {
121+
func (r *DevWorkspaceReconciler) runningWorkspacesHandler(ctx context.Context, obj client.Object) []reconcile.Request {
122122
dwList := &dw.DevWorkspaceList{}
123123
if err := r.Client.List(context.Background(), dwList, &client.ListOptions{Namespace: obj.GetNamespace()}); err != nil {
124124
return []reconcile.Request{}

‎controllers/workspace/suite_test.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"path/filepath"
2222
"testing"
2323

24+
"sigs.k8s.io/controller-runtime/pkg/webhook"
25+
2426
dwv1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha1"
2527
dwv2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2628
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
@@ -117,11 +119,15 @@ var _ = BeforeSuite(func() {
117119

118120
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
119121
Scheme: scheme.Scheme,
120-
Port: 9443,
121122
NewCache: cacheFunc,
122123
})
123124
Expect(err).NotTo(HaveOccurred())
124125

126+
err = mgr.Add(webhook.NewServer(webhook.Options{
127+
Port: 9443,
128+
}))
129+
Expect(err).NotTo(HaveOccurred())
130+
125131
nonCachingClient, err := client.New(mgr.GetConfig(), client.Options{Scheme: scheme.Scheme})
126132
Expect(err).NotTo(HaveOccurred())
127133

0 commit comments

Comments
 (0)