Skip to content

Commit 0bb70d8

Browse files
vr4mantavr4manta
committed
Updated IPAM references to use v1beta2
1 parent 1e243fb commit 0bb70d8

4 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎cmd/vsphere/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"k8s.io/apiserver/pkg/util/feature"
1212
"k8s.io/component-base/featuregate"
1313
"k8s.io/klog/v2"
14-
ipamv1beta1 "sigs.k8s.io/cluster-api/api/ipam/v1beta1" //nolint:staticcheck
14+
ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
1515
ctrl "sigs.k8s.io/controller-runtime"
1616
"sigs.k8s.io/controller-runtime/pkg/cache"
1717
"sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -188,8 +188,8 @@ func main() {
188188
klog.Fatal(err)
189189
}
190190

191-
if err := ipamv1beta1.AddToScheme(mgr.GetScheme()); err != nil {
192-
klog.Fatalf("unable to add ipamv1beta1 to scheme: %v", err)
191+
if err := ipamv1.AddToScheme(mgr.GetScheme()); err != nil {
192+
klog.Fatalf("unable to add ipamv1 to scheme: %v", err)
193193
}
194194

195195
if err := capimachine.AddWithActuator(mgr, machineActuator, defaultMutableGate); err != nil {

‎pkg/controller/vsphere/actuator_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"k8s.io/apimachinery/pkg/runtime"
2020
"k8s.io/apimachinery/pkg/types"
2121
"k8s.io/client-go/kubernetes/scheme"
22-
ipamv1beta1 "sigs.k8s.io/cluster-api/api/ipam/v1beta1" //nolint:staticcheck
22+
ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
2323
"sigs.k8s.io/controller-runtime/pkg/client"
2424
"sigs.k8s.io/controller-runtime/pkg/envtest"
2525
"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -36,7 +36,7 @@ func init() {
3636
panic(err)
3737
}
3838

39-
if err := ipamv1beta1.AddToScheme(scheme.Scheme); err != nil {
39+
if err := ipamv1.AddToScheme(scheme.Scheme); err != nil {
4040
panic(err)
4141
}
4242
}

‎pkg/controller/vsphere/reconciler_test.go‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,15 @@ import (
4141
apimachinerytypes "k8s.io/apimachinery/pkg/types"
4242
"k8s.io/client-go/kubernetes/scheme"
4343
vsphere "k8s.io/cloud-provider-vsphere/pkg/common/config"
44+
"k8s.io/utils/ptr"
4445
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
4546
"sigs.k8s.io/controller-runtime/pkg/client/fake"
4647

4748
configv1 "github.com/openshift/api/config/v1"
4849
"github.com/openshift/api/features"
4950
machinev1 "github.com/openshift/api/machine/v1beta1"
5051

51-
ipamv1beta1 "sigs.k8s.io/cluster-api/api/ipam/v1beta1" //nolint:staticcheck
52+
ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
5253

5354
machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
5455
"github.com/openshift/machine-api-operator/pkg/controller/vsphere/session"
@@ -913,39 +914,39 @@ func testStaticIPsWithSimulator(t *testing.T, model *simulator.Model, server *si
913914
},
914915
}
915916

916-
ipAddressClaim := ipamv1beta1.IPAddressClaim{
917+
ipAddressClaim := ipamv1.IPAddressClaim{
917918
ObjectMeta: metav1.ObjectMeta{
918919
Name: "test-claim-0-0",
919920
Namespace: "openshift-machine-api",
920921
},
921-
Spec: ipamv1beta1.IPAddressClaimSpec{
922-
PoolRef: corev1.TypedLocalObjectReference{
922+
Spec: ipamv1.IPAddressClaimSpec{
923+
PoolRef: ipamv1.IPPoolReference{
923924
Name: "test-pool",
924-
APIGroup: &poolGroup,
925+
APIGroup: poolGroup,
925926
Kind: "ippools",
926927
},
927928
},
928-
Status: ipamv1beta1.IPAddressClaimStatus{
929-
AddressRef: corev1.LocalObjectReference{
929+
Status: ipamv1.IPAddressClaimStatus{
930+
AddressRef: ipamv1.IPAddressReference{
930931
Name: "test-test-0",
931932
},
932933
},
933934
}
934935

935-
ipAddress := ipamv1beta1.IPAddress{
936+
ipAddress := ipamv1.IPAddress{
936937
ObjectMeta: metav1.ObjectMeta{
937938
Name: "test-test-0",
938939
Namespace: "openshift-machine-api",
939940
},
940-
Spec: ipamv1beta1.IPAddressSpec{
941-
ClaimRef: corev1.LocalObjectReference{
941+
Spec: ipamv1.IPAddressSpec{
942+
ClaimRef: ipamv1.IPAddressClaimReference{
942943
Name: "test-test-0",
943944
},
944-
PoolRef: corev1.TypedLocalObjectReference{
945+
PoolRef: ipamv1.IPPoolReference{
945946
Name: "test-pool",
946947
},
947948
Address: "192.168.1.11",
948-
Prefix: 24,
949+
Prefix: ptr.To(int32(24)),
949950
Gateway: "192.168.1.1",
950951
},
951952
}
@@ -2156,7 +2157,7 @@ func TestDelete(t *testing.T) {
21562157
t.Fatalf("cannot add scheme: %v", err)
21572158
}
21582159

2159-
if err := ipamv1beta1.AddToScheme(scheme.Scheme); err != nil {
2160+
if err := ipamv1.AddToScheme(scheme.Scheme); err != nil {
21602161
t.Fatalf("cannot add scheme: %v", err)
21612162
}
21622163

@@ -2601,53 +2602,53 @@ func TestCreate(t *testing.T) {
26012602
},
26022603
}
26032604

2604-
ipAddressClaimTest3 := &ipamv1beta1.IPAddressClaim{
2605+
ipAddressClaimTest3 := &ipamv1.IPAddressClaim{
26052606
ObjectMeta: metav1.ObjectMeta{
26062607
Name: "test-3-claim-0-0",
26072608
Namespace: namespace,
26082609
},
2609-
Spec: ipamv1beta1.IPAddressClaimSpec{
2610-
PoolRef: corev1.TypedLocalObjectReference{
2610+
Spec: ipamv1.IPAddressClaimSpec{
2611+
PoolRef: ipamv1.IPPoolReference{
26112612
Name: "test-3-pool",
2612-
APIGroup: &poolGroup,
2613+
APIGroup: poolGroup,
26132614
Kind: "ippools",
26142615
},
26152616
},
2616-
Status: ipamv1beta1.IPAddressClaimStatus{
2617-
AddressRef: corev1.LocalObjectReference{
2617+
Status: ipamv1.IPAddressClaimStatus{
2618+
AddressRef: ipamv1.IPAddressReference{
26182619
Name: "test-test-0",
26192620
},
26202621
},
26212622
}
26222623

2623-
ipAddressClaimNoAddress := &ipamv1beta1.IPAddressClaim{
2624+
ipAddressClaimNoAddress := &ipamv1.IPAddressClaim{
26242625
ObjectMeta: metav1.ObjectMeta{
26252626
Name: "test-claim-0-0",
26262627
Namespace: namespace,
26272628
},
2628-
Spec: ipamv1beta1.IPAddressClaimSpec{
2629-
PoolRef: corev1.TypedLocalObjectReference{
2629+
Spec: ipamv1.IPAddressClaimSpec{
2630+
PoolRef: ipamv1.IPPoolReference{
26302631
Name: "test-pool",
2631-
APIGroup: &poolGroup,
2632+
APIGroup: poolGroup,
26322633
Kind: "ippools",
26332634
},
26342635
},
26352636
}
26362637

2637-
ipAddress := &ipamv1beta1.IPAddress{
2638+
ipAddress := &ipamv1.IPAddress{
26382639
ObjectMeta: metav1.ObjectMeta{
26392640
Name: "test-test-0",
26402641
Namespace: namespace,
26412642
},
2642-
Spec: ipamv1beta1.IPAddressSpec{
2643-
ClaimRef: corev1.LocalObjectReference{
2643+
Spec: ipamv1.IPAddressSpec{
2644+
ClaimRef: ipamv1.IPAddressClaimReference{
26442645
Name: "test-test-0",
26452646
},
2646-
PoolRef: corev1.TypedLocalObjectReference{
2647+
PoolRef: ipamv1.IPPoolReference{
26472648
Name: "test-pool",
26482649
},
26492650
Address: "192.168.1.11",
2650-
Prefix: 24,
2651+
Prefix: ptr.To(int32(24)),
26512652
Gateway: "192.168.1.1",
26522653
},
26532654
}
@@ -2659,8 +2660,8 @@ func TestCreate(t *testing.T) {
26592660
providerSpec machinev1.VSphereMachineProviderSpec
26602661
labels map[string]string
26612662
notConnectedToVCenter bool
2662-
ipAddressClaim *ipamv1beta1.IPAddressClaim
2663-
ipAddress *ipamv1beta1.IPAddress
2663+
ipAddressClaim *ipamv1.IPAddressClaim
2664+
ipAddress *ipamv1.IPAddress
26642665
featureGatesEnabled map[string]bool
26652666
}{
26662667
{
@@ -2957,7 +2958,7 @@ func TestCreate(t *testing.T) {
29572958
Namespace: machine.Namespace,
29582959
Name: tc.ipAddressClaim.Name,
29592960
}
2960-
ipAddressClaim := &ipamv1beta1.IPAddressClaim{}
2961+
ipAddressClaim := &ipamv1.IPAddressClaim{}
29612962
err = client.Get(context.Background(), claimKey, ipAddressClaim)
29622963
if err != nil {
29632964
t.Fatal(err)

‎pkg/util/ipam/util.go‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import (
55
"fmt"
66

77
machinev1 "github.com/openshift/api/machine/v1beta1"
8-
ipamv1beta1 "sigs.k8s.io/cluster-api/api/ipam/v1beta1" //nolint:staticcheck
8+
ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
99

10-
corev1 "k8s.io/api/core/v1"
1110
apierrors "k8s.io/apimachinery/pkg/api/errors"
1211
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1312
"k8s.io/apimachinery/pkg/util/sets"
@@ -21,12 +20,12 @@ func EnsureIPAddressClaim(
2120
runtimeClient client.Client,
2221
claimName string,
2322
machine *machinev1.Machine,
24-
pool machinev1.AddressesFromPool) (*ipamv1beta1.IPAddressClaim, error) {
23+
pool machinev1.AddressesFromPool) (*ipamv1.IPAddressClaim, error) {
2524
claimKey := client.ObjectKey{
2625
Namespace: machine.Namespace,
2726
Name: claimName,
2827
}
29-
ipAddressClaim := &ipamv1beta1.IPAddressClaim{}
28+
ipAddressClaim := &ipamv1.IPAddressClaim{}
3029
if err := runtimeClient.Get(ctx, claimKey, ipAddressClaim); err == nil {
3130
// If we found a claim, make sure it has owner field set.
3231
if len(ipAddressClaim.OwnerReferences) == 0 {
@@ -41,7 +40,7 @@ func EnsureIPAddressClaim(
4140
klog.Infof("creating IPAddressClaim %s", claimName)
4241
gv := machinev1.SchemeGroupVersion
4342
machineRef := metav1.NewControllerRef(machine, gv.WithKind("Machine"))
44-
ipAddressClaim = &ipamv1beta1.IPAddressClaim{
43+
ipAddressClaim = &ipamv1.IPAddressClaim{
4544
ObjectMeta: metav1.ObjectMeta{
4645
OwnerReferences: []metav1.OwnerReference{
4746
*machineRef,
@@ -52,9 +51,9 @@ func EnsureIPAddressClaim(
5251
Name: claimName,
5352
Namespace: machine.Namespace,
5453
},
55-
Spec: ipamv1beta1.IPAddressClaimSpec{
56-
PoolRef: corev1.TypedLocalObjectReference{
57-
APIGroup: &pool.Group,
54+
Spec: ipamv1.IPAddressClaimSpec{
55+
PoolRef: ipamv1.IPPoolReference{
56+
APIGroup: pool.Group,
5857
Kind: pool.Resource,
5958
Name: pool.Name,
6059
},
@@ -72,7 +71,7 @@ func AdoptOrphanClaim(
7271
runtimeClient client.Client,
7372
claimName string,
7473
machine *machinev1.Machine,
75-
ipAddressClaim *ipamv1beta1.IPAddressClaim) error {
74+
ipAddressClaim *ipamv1.IPAddressClaim) error {
7675
gv := machinev1.SchemeGroupVersion
7776
machineRef := metav1.NewControllerRef(machine, gv.WithKind("Machine"))
7877
ipAddressClaim.OwnerReferences = []metav1.OwnerReference{
@@ -90,7 +89,7 @@ func AdoptOrphanClaim(
9089
func CountOutstandingIPAddressClaimsForMachine(
9190
ctx context.Context,
9291
runtimeClient client.Client,
93-
ipAddressClaims []ipamv1beta1.IPAddressClaim) int {
92+
ipAddressClaims []ipamv1.IPAddressClaim) int {
9493
fulfilledClaimCount := 0
9594

9695
for _, claim := range ipAddressClaims {
@@ -107,13 +106,13 @@ func RetrieveBoundIPAddress(
107106
ctx context.Context,
108107
runtimeClient client.Client,
109108
machine *machinev1.Machine,
110-
claimName string) (*ipamv1beta1.IPAddress, error) {
109+
claimName string) (*ipamv1.IPAddress, error) {
111110

112111
claimKey := client.ObjectKey{
113112
Namespace: machine.Namespace,
114113
Name: claimName,
115114
}
116-
ipAddressClaim := &ipamv1beta1.IPAddressClaim{}
115+
ipAddressClaim := &ipamv1.IPAddressClaim{}
117116
if err := runtimeClient.Get(ctx, claimKey, ipAddressClaim); err != nil {
118117
return nil, fmt.Errorf("unable to get IPAddressClaim: %w", err)
119118
}
@@ -122,7 +121,7 @@ func RetrieveBoundIPAddress(
122121
return nil, fmt.Errorf("no IPAddress is bound to claim %s", claimName)
123122
}
124123

125-
ipAddress := &ipamv1beta1.IPAddress{}
124+
ipAddress := &ipamv1.IPAddress{}
126125
addressKey := client.ObjectKey{
127126
Namespace: machine.Namespace,
128127
Name: ipAddressClaim.Status.AddressRef.Name,
@@ -137,7 +136,7 @@ func RemoveFinalizersForIPAddressClaims(
137136
ctx context.Context,
138137
runtimeClient client.Client,
139138
machine machinev1.Machine) error {
140-
ipAddressClaimList := &ipamv1beta1.IPAddressClaimList{}
139+
ipAddressClaimList := &ipamv1.IPAddressClaimList{}
141140
if err := runtimeClient.List(ctx, ipAddressClaimList, client.InNamespace(machine.Namespace)); err != nil {
142141
return fmt.Errorf("unable to list IPAddressClaims: %w", err)
143142
}
@@ -183,7 +182,7 @@ func HasOutstandingIPAddressClaims(
183182
machine *machinev1.Machine,
184183
networkDevices []machinev1.NetworkDeviceSpec,
185184
) (int, error) {
186-
var associatedClaims []ipamv1beta1.IPAddressClaim
185+
var associatedClaims []ipamv1.IPAddressClaim
187186
for deviceIdx, networkDevice := range networkDevices {
188187
for poolIdx, addressPool := range networkDevice.AddressesFromPools {
189188
claimName := GetIPAddressClaimName(machine, deviceIdx, poolIdx)

0 commit comments

Comments
 (0)