Skip to content

Commit 83956ab

Browse files
chrischdijustinsb
chrischdi
authored and
justinsb
committed
Reconcile and use CAPI v1beta2 instead of v1beta1
1 parent ce4e691 commit 83956ab

21 files changed

+106
-96
lines changed

‎cloud/interfaces.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type ClusterGetter interface {
6969

7070
// ClusterSetter is an interface which can set cluster information.
7171
type ClusterSetter interface {
72-
SetControlPlaneEndpoint(endpoint clusterv1beta1.APIEndpoint)
72+
SetControlPlaneEndpoint(endpoint clusterv1.APIEndpoint)
7373
}
7474

7575
// Cluster is an interface which can get and set cluster information.

‎cloud/scope/cluster.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
type ClusterScopeParams struct {
3838
GCPServices
3939
Client client.Client
40-
Cluster *clusterv1beta1.Cluster
40+
Cluster *clusterv1.Cluster
4141
GCPCluster *infrav1.GCPCluster
4242
}
4343

@@ -79,7 +79,7 @@ type ClusterScope struct {
7979
client client.Client
8080
patchHelper *patch.Helper
8181

82-
Cluster *clusterv1beta1.Cluster
82+
Cluster *clusterv1.Cluster
8383
GCPCluster *infrav1.GCPCluster
8484
GCPServices
8585
}

‎cloud/scope/machine.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const (
5151
type MachineScopeParams struct {
5252
Client client.Client
5353
ClusterGetter cloud.ClusterGetter
54-
Machine *clusterv1beta1.Machine
54+
Machine *clusterv1.Machine
5555
GCPMachine *infrav1.GCPMachine
5656
}
5757

@@ -87,7 +87,7 @@ type MachineScope struct {
8787
client client.Client
8888
patchHelper *patch.Helper
8989
ClusterGetter cloud.ClusterGetter
90-
Machine *clusterv1beta1.Machine
90+
Machine *clusterv1.Machine
9191
GCPMachine *infrav1.GCPMachine
9292
}
9393

@@ -152,8 +152,8 @@ func (m *MachineScope) Role() string {
152152
}
153153

154154
// IsControlPlaneMachine checks machine is a control plane node.
155-
func IsControlPlaneMachine(machine *clusterv1beta1.Machine) bool {
156-
_, ok := machine.Labels[clusterv1beta1.MachineControlPlaneLabel]
155+
func IsControlPlaneMachine(machine *clusterv1.Machine) bool {
156+
_, ok := machine.Labels[clusterv1.MachineControlPlaneLabel]
157157
return ok
158158
}
159159

‎cloud/scope/managedcluster.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
type ManagedClusterScopeParams struct {
3838
GCPServices
3939
Client client.Client
40-
Cluster *clusterv1beta1.Cluster
40+
Cluster *clusterv1.Cluster
4141
GCPManagedCluster *infrav1exp.GCPManagedCluster
4242
GCPManagedControlPlane *infrav1exp.GCPManagedControlPlane
4343
}
@@ -81,7 +81,7 @@ type ManagedClusterScope struct {
8181
client client.Client
8282
patchHelper *patch.Helper
8383

84-
Cluster *clusterv1beta1.Cluster
84+
Cluster *clusterv1.Cluster
8585
GCPManagedCluster *infrav1exp.GCPManagedCluster
8686
GCPManagedControlPlane *infrav1exp.GCPManagedControlPlane
8787
GCPServices

‎cloud/scope/managedcontrolplane.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"github.com/pkg/errors"
3131
infrav1exp "sigs.k8s.io/cluster-api-provider-gcp/exp/api/v1beta1"
3232
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
33+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3334
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
3435
"sigs.k8s.io/controller-runtime/pkg/client"
3536
)
@@ -45,7 +46,7 @@ type ManagedControlPlaneScopeParams struct {
4546
ManagedClusterClient *container.ClusterManagerClient
4647
TagBindingsClient *resourcemanager.TagBindingsClient
4748
Client client.Client
48-
Cluster *clusterv1beta1.Cluster
49+
Cluster *clusterv1.Cluster
4950
GCPManagedCluster *infrav1exp.GCPManagedCluster
5051
GCPManagedControlPlane *infrav1exp.GCPManagedControlPlane
5152
}
@@ -114,15 +115,15 @@ type ManagedControlPlaneScope struct {
114115
client client.Client
115116
patchHelper *v1beta1patch.Helper
116117

117-
Cluster *clusterv1beta1.Cluster
118+
Cluster *clusterv1.Cluster
118119
GCPManagedCluster *infrav1exp.GCPManagedCluster
119120
GCPManagedControlPlane *infrav1exp.GCPManagedControlPlane
120121
mcClient *container.ClusterManagerClient
121122
tagBindingsClient *resourcemanager.TagBindingsClient
122123
credentialsClient *credentials.IamCredentialsClient
123124
credential *Credential
124125

125-
AllMachinePools []clusterv1beta1.MachinePool
126+
AllMachinePools []clusterv1.MachinePool
126127
AllManagedMachinePools []infrav1exp.GCPManagedMachinePool
127128
}
128129

@@ -178,14 +179,14 @@ func (s *ManagedControlPlaneScope) GetCredential() *Credential {
178179
}
179180

180181
// GetAllNodePools gets all node pools for the control plane.
181-
func (s *ManagedControlPlaneScope) GetAllNodePools(ctx context.Context) ([]infrav1exp.GCPManagedMachinePool, []clusterv1beta1.MachinePool, error) {
182+
func (s *ManagedControlPlaneScope) GetAllNodePools(ctx context.Context) ([]infrav1exp.GCPManagedMachinePool, []clusterv1.MachinePool, error) {
182183
if len(s.AllManagedMachinePools) == 0 {
183184
listOptions := []client.ListOption{
184185
client.InNamespace(s.GCPManagedControlPlane.Namespace),
185-
client.MatchingLabels(map[string]string{clusterv1beta1.ClusterNameLabel: s.Cluster.Name}),
186+
client.MatchingLabels(map[string]string{clusterv1.ClusterNameLabel: s.Cluster.Name}),
186187
}
187188

188-
machinePoolList := &clusterv1beta1.MachinePoolList{}
189+
machinePoolList := &clusterv1.MachinePoolList{}
189190
if err := s.client.List(ctx, machinePoolList, listOptions...); err != nil {
190191
return nil, nil, err
191192
}

‎cloud/scope/managedmachinepool.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"github.com/pkg/errors"
3535
infrav1exp "sigs.k8s.io/cluster-api-provider-gcp/exp/api/v1beta1"
3636
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
37+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3738
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
3839
"sigs.k8s.io/controller-runtime/pkg/client"
3940
)
@@ -43,8 +44,8 @@ type ManagedMachinePoolScopeParams struct {
4344
ManagedClusterClient *container.ClusterManagerClient
4445
InstanceGroupManagersClient *compute.InstanceGroupManagersClient
4546
Client client.Client
46-
Cluster *clusterv1beta1.Cluster
47-
MachinePool *clusterv1beta1.MachinePool
47+
Cluster *clusterv1.Cluster
48+
MachinePool *clusterv1.MachinePool
4849
GCPManagedCluster *infrav1exp.GCPManagedCluster
4950
GCPManagedControlPlane *infrav1exp.GCPManagedControlPlane
5051
GCPManagedMachinePool *infrav1exp.GCPManagedMachinePool
@@ -106,8 +107,8 @@ type ManagedMachinePoolScope struct {
106107
client client.Client
107108
patchHelper *v1beta1patch.Helper
108109

109-
Cluster *clusterv1beta1.Cluster
110-
MachinePool *clusterv1beta1.MachinePool
110+
Cluster *clusterv1.Cluster
111+
MachinePool *clusterv1.MachinePool
111112
GCPManagedCluster *infrav1exp.GCPManagedCluster
112113
GCPManagedControlPlane *infrav1exp.GCPManagedControlPlane
113114
GCPManagedMachinePool *infrav1exp.GCPManagedMachinePool
@@ -166,7 +167,7 @@ func NodePoolResourceLabels(additionalLabels infrav1.Labels, clusterName string)
166167
}
167168

168169
// ConvertToSdkNodePool converts a node pool to format that is used by GCP SDK.
169-
func ConvertToSdkNodePool(nodePool infrav1exp.GCPManagedMachinePool, machinePool clusterv1beta1.MachinePool, regional bool, clusterName string) *containerpb.NodePool {
170+
func ConvertToSdkNodePool(nodePool infrav1exp.GCPManagedMachinePool, machinePool clusterv1.MachinePool, regional bool, clusterName string) *containerpb.NodePool {
170171
replicas := *machinePool.Spec.Replicas
171172
if regional {
172173
if len(nodePool.Spec.NodeLocations) != 0 {
@@ -275,7 +276,7 @@ func ConvertToSdkNodePool(nodePool infrav1exp.GCPManagedMachinePool, machinePool
275276
}
276277

277278
// ConvertToSdkNodePools converts node pools to format that is used by GCP SDK.
278-
func ConvertToSdkNodePools(nodePools []infrav1exp.GCPManagedMachinePool, machinePools []clusterv1beta1.MachinePool, regional bool, clusterName string) []*containerpb.NodePool {
279+
func ConvertToSdkNodePools(nodePools []infrav1exp.GCPManagedMachinePool, machinePools []clusterv1.MachinePool, regional bool, clusterName string) []*containerpb.NodePool {
279280
res := []*containerpb.NodePool{}
280281
for i := range nodePools {
281282
res = append(res, ConvertToSdkNodePool(nodePools[i], machinePools[i], regional, clusterName))

‎cloud/services/compute/firewalls/reconcile_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,21 @@ import (
3232
"k8s.io/utils/ptr"
3333
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
3434
"sigs.k8s.io/cluster-api-provider-gcp/cloud/scope"
35+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3536
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3637
)
3738

3839
func init() {
39-
_ = clusterv1beta1.AddToScheme(scheme.Scheme)
40+
_ = clusterv1.AddToScheme(scheme.Scheme)
4041
_ = infrav1.AddToScheme(scheme.Scheme)
4142
}
4243

43-
var fakeCluster = &clusterv1beta1.Cluster{
44+
var fakeCluster = &clusterv1.Cluster{
4445
ObjectMeta: metav1.ObjectMeta{
4546
Name: "my-cluster",
4647
Namespace: "default",
4748
},
48-
Spec: clusterv1beta1.ClusterSpec{},
49+
Spec: clusterv1.ClusterSpec{},
4950
}
5051

5152
var fakeGCPCluster = &infrav1.GCPCluster{

‎cloud/services/compute/instances/reconcile_test.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ import (
3636
infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
3737
"sigs.k8s.io/cluster-api-provider-gcp/cloud/scope"
3838
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
39+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3940
"sigs.k8s.io/controller-runtime/pkg/client/fake"
4041
)
4142

4243
func init() {
43-
_ = clusterv1beta1.AddToScheme(scheme.Scheme)
44+
_ = clusterv1.AddToScheme(scheme.Scheme)
4445
_ = infrav1.AddToScheme(scheme.Scheme)
4546
}
4647

@@ -54,35 +55,35 @@ var fakeBootstrapSecret = &corev1.Secret{
5455
},
5556
}
5657

57-
var fakeCluster = &clusterv1beta1.Cluster{
58+
var fakeCluster = &clusterv1.Cluster{
5859
ObjectMeta: metav1.ObjectMeta{
5960
Name: "my-cluster",
6061
Namespace: "default",
6162
},
62-
Spec: clusterv1beta1.ClusterSpec{},
63+
Spec: clusterv1.ClusterSpec{},
6364
}
6465

65-
var fakeMachine = &clusterv1beta1.Machine{
66+
var fakeMachine = &clusterv1.Machine{
6667
ObjectMeta: metav1.ObjectMeta{
6768
Name: "my-machine",
6869
Namespace: "default",
6970
},
70-
Spec: clusterv1beta1.MachineSpec{
71-
Bootstrap: clusterv1beta1.Bootstrap{
71+
Spec: clusterv1.MachineSpec{
72+
Bootstrap: clusterv1.Bootstrap{
7273
DataSecretName: ptr.To[string]("my-cluster-bootstrap"),
7374
},
7475
FailureDomain: "us-central1-c",
7576
Version: "v1.19.11",
7677
},
7778
}
7879

79-
var fakeMachineWithOutFailureDomain = &clusterv1beta1.Machine{
80+
var fakeMachineWithOutFailureDomain = &clusterv1.Machine{
8081
ObjectMeta: metav1.ObjectMeta{
8182
Name: "my-machine",
8283
Namespace: "default",
8384
},
84-
Spec: clusterv1beta1.MachineSpec{
85-
Bootstrap: clusterv1beta1.Bootstrap{
85+
Spec: clusterv1.MachineSpec{
86+
Bootstrap: clusterv1.Bootstrap{
8687
DataSecretName: ptr.To[string]("my-cluster-bootstrap"),
8788
},
8889
Version: "v1.19.11",

‎cloud/services/compute/loadbalancers/reconcile_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
var lbTypeInternal = infrav1.Internal
4040

4141
func init() {
42-
_ = clusterv1beta1.AddToScheme(scheme.Scheme)
42+
_ = clusterv1.AddToScheme(scheme.Scheme)
4343
_ = infrav1.AddToScheme(scheme.Scheme)
4444
}
4545

@@ -48,12 +48,12 @@ func getBaseClusterScope() (*scope.ClusterScope, error) {
4848
WithScheme(scheme.Scheme).
4949
Build()
5050

51-
fakeCluster := &clusterv1beta1.Cluster{
51+
fakeCluster := &clusterv1.Cluster{
5252
ObjectMeta: metav1.ObjectMeta{
5353
Name: "my-cluster",
5454
Namespace: "default",
5555
},
56-
Spec: clusterv1beta1.ClusterSpec{},
56+
Spec: clusterv1.ClusterSpec{},
5757
}
5858

5959
fakeGCPCluster := &infrav1.GCPCluster{

‎cloud/services/compute/networks/reconcile_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ import (
3636
)
3737

3838
func init() {
39-
_ = clusterv1beta1.AddToScheme(scheme.Scheme)
39+
_ = clusterv1.AddToScheme(scheme.Scheme)
4040
_ = infrav1.AddToScheme(scheme.Scheme)
4141
}
4242

43-
var fakeCluster = &clusterv1beta1.Cluster{
43+
var fakeCluster = &clusterv1.Cluster{
4444
ObjectMeta: metav1.ObjectMeta{
4545
Name: "my-cluster",
4646
Namespace: "default",
4747
},
48-
Spec: clusterv1beta1.ClusterSpec{},
48+
Spec: clusterv1.ClusterSpec{},
4949
}
5050

5151
var fakeGCPCluster = &infrav1.GCPCluster{

0 commit comments

Comments
 (0)