Skip to content

Commit 7530969

Browse files
XudongLiuHaroldXudongLiuHarold
committed
remove controller-runtime package since kubernetes-sigs/controller-runtime#922 is already merged
Signed-off-by: Xudong Liu <[email protected]>
1 parent fb9348b commit 7530969

17 files changed

+20
-43
lines changed

‎controllers/akodeploymentconfig/akodeploymentconfig_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ package akodeploymentconfig
55

66
import (
77
"context"
8+
89
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/controllers/akodeploymentconfig/cluster"
910
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/controllers/akodeploymentconfig/phases"
1011
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/controllers/akodeploymentconfig/user"
1112
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/netprovider"
1213
corev1 "k8s.io/api/core/v1"
1314

14-
controllerruntime "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime"
1515
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1616

1717
"github.com/go-logr/logr"
@@ -28,7 +28,7 @@ import (
2828

2929
akoov1alpha1 "github.com/vmware-samples/load-balancer-operator-for-kubernetes/api/v1alpha1"
3030
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/aviclient"
31-
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime/handlers"
31+
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/handlers"
3232
apierrors "k8s.io/apimachinery/pkg/api/errors"
3333
)
3434

@@ -122,7 +122,7 @@ func (r *AKODeploymentConfigReconciler) reconcileNormal(
122122
log logr.Logger,
123123
obj *akoov1alpha1.AKODeploymentConfig,
124124
) (ctrl.Result, error) {
125-
if !controllerruntime.ContainsFinalizer(obj, akoov1alpha1.AkoDeploymentConfigFinalizer) {
125+
if !ctrlutil.ContainsFinalizer(obj, akoov1alpha1.AkoDeploymentConfigFinalizer) {
126126
log.Info("Add finalizer", "finalizer", akoov1alpha1.AkoDeploymentConfigFinalizer)
127127
// The finalizer must be present before proceeding in order to ensure that all avi user account
128128
// resources are released when the interface is destroyed. Return immediately after here to let the
@@ -139,7 +139,7 @@ func (r *AKODeploymentConfigReconciler) reconcileDelete(
139139
obj *akoov1alpha1.AKODeploymentConfig,
140140
) (res ctrl.Result, reterr error) {
141141
// Directly return if there is no finalizer
142-
if !controllerruntime.ContainsFinalizer(obj, akoov1alpha1.AkoDeploymentConfigFinalizer) {
142+
if !ctrlutil.ContainsFinalizer(obj, akoov1alpha1.AkoDeploymentConfigFinalizer) {
143143
return res, nil
144144
}
145145

‎controllers/akodeploymentconfig/akodeploymentconfig_controller_cluster_phase.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/go-logr/logr"
1010
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/controllers/akodeploymentconfig/cluster"
1111
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/controllers/akodeploymentconfig/phases"
12-
controllerruntime "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime"
1312

1413
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1514
ctrl "sigs.k8s.io/controller-runtime"
@@ -126,7 +125,7 @@ func (r *AKODeploymentConfigReconciler) addClusterFinalizer(
126125
cluster *clusterv1.Cluster,
127126
_ *akoov1alpha1.AKODeploymentConfig,
128127
) (ctrl.Result, error) {
129-
if !controllerruntime.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) &&
128+
if !ctrlutil.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) &&
130129
cluster.Namespace != akoov1alpha1.TKGSystemNamespace {
131130
log.Info("Add finalizer to cluster", "finalizer", akoov1alpha1.ClusterFinalizer)
132131
ctrlutil.AddFinalizer(cluster, akoov1alpha1.ClusterFinalizer)
@@ -143,7 +142,7 @@ func (r *AKODeploymentConfigReconciler) removeClusterFinalizer(
143142
cluster *clusterv1.Cluster,
144143
_ *akoov1alpha1.AKODeploymentConfig,
145144
) (ctrl.Result, error) {
146-
if controllerruntime.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) {
145+
if ctrlutil.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) {
147146
log.Info("Removing finalizer from cluster", "finalizer", akoov1alpha1.ClusterFinalizer)
148147
}
149148
ctrlutil.RemoveFinalizer(cluster, akoov1alpha1.ClusterFinalizer)

‎controllers/akodeploymentconfig/akodeploymentconfig_controller_intg_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
package akodeploymentconfig_test
55

66
import (
7+
"os"
8+
79
. "github.com/onsi/ginkgo"
810
. "github.com/onsi/gomega"
911
"github.com/pkg/errors"
1012
akoov1alpha1 "github.com/vmware-samples/load-balancer-operator-for-kubernetes/api/v1alpha1"
1113
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/ako"
12-
controllerruntime "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime"
14+
ako_operator "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/ako-operator"
1315
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/test/builder"
1416
"github.com/vmware/alb-sdk/go/models"
1517
"github.com/vmware/alb-sdk/go/session"
1618
akov1alpha1 "github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/pkg/apis/ako/v1alpha1"
17-
"os"
18-
19-
ako_operator "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/ako-operator"
2019
corev1 "k8s.io/api/core/v1"
2120
apierrors "k8s.io/apimachinery/pkg/api/errors"
2221
"sigs.k8s.io/cluster-api/util/conditions"
2322
kcfg "sigs.k8s.io/cluster-api/util/kubeconfig"
23+
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2424

2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/utils/pointer"
@@ -160,11 +160,11 @@ func intgTestAkoDeploymentConfigController() {
160160
}
161161
finalizer := akoov1alpha1.AkoDeploymentConfigFinalizer
162162
if expectReconciled {
163-
if !controllerruntime.ContainsFinalizer(obj, finalizer) {
163+
if !ctrlutil.ContainsFinalizer(obj, finalizer) {
164164
return false
165165
}
166166
} else {
167-
if controllerruntime.ContainsFinalizer(obj, finalizer) {
167+
if ctrlutil.ContainsFinalizer(obj, finalizer) {
168168
return false
169169
}
170170
}
@@ -179,7 +179,7 @@ func intgTestAkoDeploymentConfigController() {
179179
return false
180180
}
181181
finalizer := akoov1alpha1.ClusterFinalizer
182-
return controllerruntime.ContainsFinalizer(obj, finalizer) == expect
182+
return ctrlutil.ContainsFinalizer(obj, finalizer) == expect
183183
}).Should(BeTrue())
184184
}
185185
ensureRuntimeObjectMatchExpectation := func(key client.ObjectKey, obj client.Object, expect bool) {

‎controllers/akodeploymentconfig/cluster/cluster_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1818

1919
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/ako"
20-
controllerruntime "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime"
2120
apierrors "k8s.io/apimachinery/pkg/api/errors"
2221
"k8s.io/apimachinery/pkg/runtime"
2322
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -63,7 +62,7 @@ func (r *ClusterReconciler) ReconcileDelete(
6362
) (ctrl.Result, error) {
6463
res := ctrl.Result{}
6564

66-
if controllerruntime.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) {
65+
if ctrlutil.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) {
6766
log.Info("Handling deleted Cluster")
6867

6968
finished, err := r.cleanup(ctx, log, cluster)

‎controllers/akodeploymentconfig/phases/phases.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"sigs.k8s.io/controller-runtime/pkg/client"
1919

2020
akoov1alpha1 "github.com/vmware-samples/load-balancer-operator-for-kubernetes/api/v1alpha1"
21-
handlers "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime/handlers"
21+
handlers "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/handlers"
2222
)
2323

2424
// ReconcilePhase defines a function that reconciles one aspect of

‎controllers/cluster/cluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/pkg/errors"
1010
ako_operator "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/ako-operator"
11-
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime/handlers"
11+
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/handlers"
1212
corev1 "k8s.io/api/core/v1"
1313
"sigs.k8s.io/cluster-api/util/patch"
1414
"sigs.k8s.io/controller-runtime/pkg/handler"

‎controllers/machine/machine_controller.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ import (
1111
"github.com/go-logr/logr"
1212
"github.com/pkg/errors"
1313
akoov1alpha1 "github.com/vmware-samples/load-balancer-operator-for-kubernetes/api/v1alpha1"
14+
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/handlers"
1415
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/haprovider"
15-
16-
controllerruntime "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime"
17-
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime/handlers"
1816
apierrors "k8s.io/apimachinery/pkg/api/errors"
1917
"k8s.io/apimachinery/pkg/runtime"
2018
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2119
"sigs.k8s.io/cluster-api/util/annotations"
2220
"sigs.k8s.io/cluster-api/util/patch"
2321
ctrl "sigs.k8s.io/controller-runtime"
2422
"sigs.k8s.io/controller-runtime/pkg/client"
23+
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
2524
"sigs.k8s.io/controller-runtime/pkg/handler"
2625
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2726
"sigs.k8s.io/controller-runtime/pkg/source"
@@ -181,7 +180,7 @@ func (r *MachineReconciler) reconcileMachineDeletionHook(
181180

182181
res := ctrl.Result{}
183182

184-
if controllerruntime.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) {
183+
if ctrlutil.ContainsFinalizer(cluster, akoov1alpha1.ClusterFinalizer) {
185184
log.Info("Cluster has finalizer set. Clean up has not finished. Will skip reconciling", "finalizer", akoov1alpha1.ClusterFinalizer)
186185
return res, nil
187186
}

‎pkg/controller-runtime/finalizer.go

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎pkg/controller-runtime/handlers/cluster.go renamed to ‎pkg/handlers/cluster.go

File renamed without changes.

‎pkg/controller-runtime/handlers/cluster_for_akodeploymentconfig_handler.go renamed to ‎pkg/handlers/cluster_for_akodeploymentconfig_handler.go

File renamed without changes.

‎pkg/controller-runtime/handlers/cluster_for_akodeploymentconfig_handler_test.go renamed to ‎pkg/handlers/cluster_for_akodeploymentconfig_handler_test.go

File renamed without changes.

‎pkg/controller-runtime/handlers/cluster_for_machine_handler.go renamed to ‎pkg/handlers/cluster_for_machine_handler.go

File renamed without changes.

‎pkg/controller-runtime/handlers/cluster_for_machine_handler_test.go renamed to ‎pkg/handlers/cluster_for_machine_handler_test.go

File renamed without changes.

‎pkg/controller-runtime/handlers/secret_for_akodeploymentconfig_handler.go renamed to ‎pkg/handlers/secret_for_akodeploymentconfig_handler.go

File renamed without changes.

‎pkg/controller-runtime/handlers/service_for_cluster_handler.go renamed to ‎pkg/handlers/service_for_cluster_handler.go

File renamed without changes.

‎pkg/controller-runtime/handlers/suite_test.go renamed to ‎pkg/handlers/suite_test.go

File renamed without changes.

‎pkg/haprovider/haprovider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"sync"
1111

1212
ako_operator "github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/ako-operator"
13-
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/controller-runtime/handlers"
13+
"github.com/vmware-samples/load-balancer-operator-for-kubernetes/pkg/handlers"
1414
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1515

1616
"github.com/go-logr/logr"

0 commit comments

Comments
 (0)