Skip to content

Commit eb0efe6

Browse files
chrischdichrischdi
committed
Replace usage of pkg/capiutils with upstream packages
1 parent 7b87bfa commit eb0efe6

File tree

9 files changed

+21
-257
lines changed

9 files changed

+21
-257
lines changed

‎cloud/scope/cluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func (s *ClusterScope) ControlPlaneEndpoint() clusterv1.APIEndpoint {
200200
// FailureDomains returns the cluster failure domains.
201201
func (s *ClusterScope) FailureDomains() []string {
202202
failureDomains := []string{}
203-
for failureDomainName, _ := range s.GCPCluster.Status.FailureDomains {
203+
for failureDomainName := range s.GCPCluster.Status.FailureDomains {
204204
failureDomains = append(failureDomains, failureDomainName)
205205
}
206206
return failureDomains

‎cloud/scope/managedcluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func (s *ManagedClusterScope) ControlPlaneEndpoint() clusterv1.APIEndpoint {
187187
// FailureDomains returns the cluster failure domains.
188188
func (s *ManagedClusterScope) FailureDomains() []string {
189189
failureDomains := []string{}
190-
for failureDomainName, _ := range s.GCPManagedCluster.Status.FailureDomains {
190+
for failureDomainName := range s.GCPManagedCluster.Status.FailureDomains {
191191
failureDomains = append(failureDomains, failureDomainName)
192192
}
193193
return failureDomains

‎controllers/gcpcluster_controller.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/loadbalancers"
3232
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/networks"
3333
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/subnets"
34-
"sigs.k8s.io/cluster-api-provider-gcp/pkg/capiutils"
3534
"sigs.k8s.io/cluster-api-provider-gcp/util/reconciler"
3635
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
3736
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -131,7 +130,7 @@ func (r *GCPClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
131130
return ctrl.Result{}, nil
132131
}
133132

134-
if capiutils.IsPaused(cluster, gcpCluster) {
133+
if annotations.IsPaused(cluster, gcpCluster) {
135134
log.Info("GCPCluster of linked Cluster is marked as paused. Won't reconcile")
136135
return ctrl.Result{}, nil
137136
}

‎controllers/gcpmachine_controller.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
2727
"sigs.k8s.io/cluster-api-provider-gcp/cloud/scope"
2828
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/instances"
29-
"sigs.k8s.io/cluster-api-provider-gcp/pkg/capiutils"
3029
"sigs.k8s.io/cluster-api-provider-gcp/util/reconciler"
3130
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3231
"sigs.k8s.io/cluster-api/util"
32+
"sigs.k8s.io/cluster-api/util/annotations"
3333
"sigs.k8s.io/cluster-api/util/predicates"
3434
"sigs.k8s.io/cluster-api/util/record"
3535
ctrl "sigs.k8s.io/controller-runtime"
@@ -82,7 +82,7 @@ func (r *GCPMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Ma
8282
if err := c.Watch(
8383
source.Kind[client.Object](mgr.GetCache(), &clusterv1.Cluster{},
8484
handler.EnqueueRequestsFromMapFunc(clusterToObjectFunc),
85-
capiutils.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), log),
85+
predicates.ClusterPausedTransitionsOrInfrastructureProvisioned(mgr.GetScheme(), log),
8686
)); err != nil {
8787
return errors.Wrap(err, "failed adding a watch for ready clusters")
8888
}
@@ -103,7 +103,7 @@ func (r *GCPMachineReconciler) GCPClusterToGCPMachines(ctx context.Context) hand
103103
return nil
104104
}
105105

106-
cluster, err := capiutils.GetOwnerCluster(mapCtx, r.Client, c.ObjectMeta)
106+
cluster, err := util.GetOwnerCluster(mapCtx, r.Client, c.ObjectMeta)
107107
switch {
108108
case apierrors.IsNotFound(err) || cluster == nil:
109109
return result
@@ -145,7 +145,7 @@ func (r *GCPMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request)
145145
return ctrl.Result{}, err
146146
}
147147

148-
machine, err := capiutils.GetOwnerMachine(ctx, r.Client, gcpMachine.ObjectMeta)
148+
machine, err := util.GetOwnerMachine(ctx, r.Client, gcpMachine.ObjectMeta)
149149
if err != nil {
150150
return ctrl.Result{}, err
151151
}
@@ -155,14 +155,14 @@ func (r *GCPMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request)
155155
}
156156

157157
log = log.WithValues("machine", machine.Name)
158-
cluster, err := capiutils.GetClusterFromMetadata(ctx, r.Client, machine.ObjectMeta)
158+
cluster, err := util.GetClusterFromMetadata(ctx, r.Client, machine.ObjectMeta)
159159
if err != nil {
160160
log.Info("Machine is missing cluster label or cluster does not exist")
161161

162162
return ctrl.Result{}, nil
163163
}
164164

165-
if capiutils.IsPaused(cluster, gcpMachine) {
165+
if annotations.IsPaused(cluster, gcpMachine) {
166166
log.Info("GCPMachine or linked Cluster is marked as paused. Won't reconcile")
167167
return ctrl.Result{}, nil
168168
}

‎exp/controllers/gcpmanagedcluster_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import (
3232
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/networks"
3333
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/subnets"
3434
infrav1exp "sigs.k8s.io/cluster-api-provider-gcp/exp/api/v1beta1"
35-
"sigs.k8s.io/cluster-api-provider-gcp/pkg/capiutils"
3635
"sigs.k8s.io/cluster-api-provider-gcp/util/reconciler"
3736
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
3837
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3938
"sigs.k8s.io/cluster-api/util"
39+
"sigs.k8s.io/cluster-api/util/annotations"
4040
"sigs.k8s.io/cluster-api/util/predicates"
4141
"sigs.k8s.io/cluster-api/util/record"
4242
ctrl "sigs.k8s.io/controller-runtime"
@@ -82,7 +82,7 @@ func (r *GCPManagedClusterReconciler) Reconcile(ctx context.Context, req ctrl.Re
8282
}
8383

8484
// Fetch the Cluster.
85-
cluster, err := capiutils.GetOwnerCluster(ctx, r.Client, gcpCluster.ObjectMeta)
85+
cluster, err := util.GetOwnerCluster(ctx, r.Client, gcpCluster.ObjectMeta)
8686
if err != nil {
8787
log.Error(err, "Failed to get owner cluster")
8888
return ctrl.Result{}, err
@@ -92,7 +92,7 @@ func (r *GCPManagedClusterReconciler) Reconcile(ctx context.Context, req ctrl.Re
9292
return ctrl.Result{}, nil
9393
}
9494

95-
if capiutils.IsPaused(cluster, gcpCluster) {
95+
if annotations.IsPaused(cluster, gcpCluster) {
9696
log.Info("GCPManagedCluster or linked Cluster is marked as paused. Won't reconcile")
9797
return ctrl.Result{}, nil
9898
}
@@ -284,7 +284,7 @@ func (r *GCPManagedClusterReconciler) managedControlPlaneMapper() handler.MapFun
284284
return nil
285285
}
286286

287-
cluster, err := capiutils.GetOwnerCluster(ctx, r.Client, gcpManagedControlPlane.ObjectMeta)
287+
cluster, err := util.GetOwnerCluster(ctx, r.Client, gcpManagedControlPlane.ObjectMeta)
288288
if err != nil {
289289
log.Error(err, "failed to get owning cluster")
290290
return nil

‎exp/controllers/gcpmanagedcontrolplane_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"sigs.k8s.io/cluster-api-provider-gcp/cloud/scope"
2828
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/container/clusters"
2929
infrav1exp "sigs.k8s.io/cluster-api-provider-gcp/exp/api/v1beta1"
30-
"sigs.k8s.io/cluster-api-provider-gcp/pkg/capiutils"
3130
"sigs.k8s.io/cluster-api-provider-gcp/util/reconciler"
3231
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3332
"sigs.k8s.io/cluster-api/util"
33+
"sigs.k8s.io/cluster-api/util/annotations"
3434
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
3535
"sigs.k8s.io/cluster-api/util/predicates"
3636
"sigs.k8s.io/cluster-api/util/record"
@@ -75,7 +75,7 @@ func (r *GCPManagedControlPlaneReconciler) SetupWithManager(ctx context.Context,
7575
if err = c.Watch(
7676
source.Kind[client.Object](mgr.GetCache(), &clusterv1.Cluster{},
7777
handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, gcpManagedControlPlane.GroupVersionKind(), mgr.GetClient(), &infrav1exp.GCPManagedControlPlane{})),
78-
capiutils.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), log),
78+
predicates.ClusterPausedTransitionsOrInfrastructureProvisioned(mgr.GetScheme(), log),
7979
)); err != nil {
8080
return fmt.Errorf("failed adding a watch for ready clusters: %w", err)
8181
}
@@ -99,7 +99,7 @@ func (r *GCPManagedControlPlaneReconciler) Reconcile(ctx context.Context, req ct
9999
}
100100

101101
// Get the cluster
102-
cluster, err := capiutils.GetOwnerCluster(ctx, r.Client, gcpManagedControlPlane.ObjectMeta)
102+
cluster, err := util.GetOwnerCluster(ctx, r.Client, gcpManagedControlPlane.ObjectMeta)
103103
if err != nil {
104104
log.Error(err, "Failed to retrieve owner Cluster from the API Server")
105105
return ctrl.Result{}, err
@@ -109,7 +109,7 @@ func (r *GCPManagedControlPlaneReconciler) Reconcile(ctx context.Context, req ct
109109
return ctrl.Result{}, nil
110110
}
111111

112-
if capiutils.IsPaused(cluster, gcpManagedControlPlane) {
112+
if annotations.IsPaused(cluster, gcpManagedControlPlane) {
113113
log.Info("Reconciliation is paused for this object")
114114
return ctrl.Result{}, nil
115115
}

‎exp/controllers/gcpmanagedmachinepool_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/runtime/schema"
3131
"sigs.k8s.io/cluster-api-provider-gcp/cloud"
3232
"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/container/nodepools"
33-
"sigs.k8s.io/cluster-api-provider-gcp/pkg/capiutils"
33+
"sigs.k8s.io/cluster-api/util/annotations"
3434
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
3535
"sigs.k8s.io/cluster-api/util/record"
3636
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -181,7 +181,7 @@ func (r *GCPManagedMachinePoolReconciler) SetupWithManager(ctx context.Context,
181181
if err := c.Watch(
182182
source.Kind[client.Object](mgr.GetCache(), &clusterv1.Cluster{},
183183
handler.EnqueueRequestsFromMapFunc(clusterToObjectFunc),
184-
capiutils.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), log),
184+
predicates.ClusterPausedTransitionsOrInfrastructureProvisioned(mgr.GetScheme(), log),
185185
)); err != nil {
186186
return errors.Wrap(err, "failed adding a watch for ready clusters")
187187
}
@@ -252,12 +252,12 @@ func (r *GCPManagedMachinePoolReconciler) Reconcile(ctx context.Context, req ctr
252252
}
253253

254254
// Get the cluster
255-
cluster, err := capiutils.GetClusterFromMetadata(ctx, r.Client, machinePool.ObjectMeta)
255+
cluster, err := util.GetClusterFromMetadata(ctx, r.Client, machinePool.ObjectMeta)
256256
if err != nil {
257257
log.Info("Failed to retrieve Cluster from MachinePool")
258258
return ctrl.Result{}, err
259259
}
260-
if capiutils.IsPaused(cluster, gcpManagedMachinePool) {
260+
if annotations.IsPaused(cluster, gcpManagedMachinePool) {
261261
log.Info("Reconciliation is paused for this object")
262262
return ctrl.Result{}, nil
263263
}

‎pkg/capiutils/predicates.go‎

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

0 commit comments

Comments
 (0)