From 971cc4f8fe2b9107d93a7d40a9c85585635e5487 Mon Sep 17 00:00:00 2001 From: Richard Vanderpool <49568690+rvanderp3@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:27:37 -0500 Subject: [PATCH] bump IPAM API to v1beta1 --- cmd/mapi-static-ip-controller/mapi-static-ip-controller.go | 7 ++++--- pkg/mgmt/ipmgmt.go | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/mapi-static-ip-controller/mapi-static-ip-controller.go b/cmd/mapi-static-ip-controller/mapi-static-ip-controller.go index 74e8c594..a7f5ac7a 100644 --- a/cmd/mapi-static-ip-controller/mapi-static-ip-controller.go +++ b/cmd/mapi-static-ip-controller/mapi-static-ip-controller.go @@ -3,17 +3,18 @@ package main import ( "context" "fmt" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" "os" "strings" "sync" + "github.com/pkg/errors" + corev1 "k8s.io/api/core/v1" + osclientset "github.com/openshift/client-go/config/clientset/versioned" mapiclientset "github.com/openshift/client-go/machine/clientset/versioned" log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/types" - ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1alpha1" + ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" diff --git a/pkg/mgmt/ipmgmt.go b/pkg/mgmt/ipmgmt.go index f27db604..18a74201 100644 --- a/pkg/mgmt/ipmgmt.go +++ b/pkg/mgmt/ipmgmt.go @@ -5,7 +5,8 @@ import ( "errors" "fmt" "net/netip" - ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1alpha1" + + ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1" goipam "github.com/metal-stack/go-ipam" log "github.com/sirupsen/logrus"