diff --git a/cloud/scope/machinepool.go b/cloud/scope/machinepool.go index 2dae902aa5..69fca7bbf4 100644 --- a/cloud/scope/machinepool.go +++ b/cloud/scope/machinepool.go @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + package scope import ( diff --git a/exp/controllers/gcpmanagedmachinepool_controller.go b/exp/controllers/gcpmanagedmachinepool_controller.go index 258c635ec9..d3c642ecb1 100644 --- a/exp/controllers/gcpmanagedmachinepool_controller.go +++ b/exp/controllers/gcpmanagedmachinepool_controller.go @@ -198,23 +198,6 @@ func getMachinePoolByName(ctx context.Context, c client.Client, namespace, name return m, nil } -//// getOwnerMachinePool returns the MachinePool object owning the current resource. -//func getOwnerMachinePool(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*expclusterv1.MachinePool, error) { -// for _, ref := range obj.OwnerReferences { -// if ref.Kind != "MachinePool" { -// continue -// } -// gv, err := schema.ParseGroupVersion(ref.APIVersion) -// if err != nil { -// return nil, errors.WithStack(err) -// } -// if gv.Group == expclusterv1.GroupVersion.Group { -// return getMachinePoolByName(ctx, c, obj.Namespace, ref.Name) -// } -// } -// return nil, nil -//} - //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=gcpmanagedmachinepools,verbs=get;list;watch;create;update;patch;delete //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=gcpmanagedmachinepools/status,verbs=get;update;patch //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=gcpmanagedmachinepools/finalizers,verbs=update diff --git a/exp/controllers/helpers.go b/exp/controllers/helpers.go index e12140f806..c289f40de6 100644 --- a/exp/controllers/helpers.go +++ b/exp/controllers/helpers.go @@ -55,7 +55,7 @@ func GetOwnerMachinePool(ctx context.Context, c client.Client, obj metav1.Object // KubeadmConfigToInfrastructureMapFunc returns a handler.ToRequestsFunc that watches for KubeadmConfig events and returns. func KubeadmConfigToInfrastructureMapFunc(ctx context.Context, c client.Client, log logr.Logger) handler.MapFunc { return func(ctx context.Context, o client.Object) []reconcile.Request { - ctx, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) + _, cancel := context.WithTimeout(ctx, reconciler.DefaultMappingTimeout) defer cancel() kc, ok := o.(*kubeadmv1.KubeadmConfig)