Skip to content

Commit 924ef97

Browse files
vishesh92vishesh92
committed
Rename cluster to unmanaged cluster
1 parent dbadbcd commit 924ef97

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎controllers/cloudstackcluster_controller.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ func (r *CloudStackClusterReconciliationRunner) Reconcile() (res ctrl.Result, re
9494
r.GetFailureDomains(r.FailureDomains),
9595
r.RemoveExtraneousFailureDomains(r.FailureDomains),
9696
r.VerifyFailureDomainCRDs,
97-
r.GetOrCreateCluster,
97+
r.GetOrCreateUnmanagedCluster,
9898
r.SetReady)
9999
}
100100

101-
// GetOrCreateCluster checks if an unmanaged cluster is present in Cloudstack else creates one.
102-
func (r *CloudStackClusterReconciliationRunner) GetOrCreateCluster() (ctrl.Result, error) {
101+
// GetOrCreateUnmanagedCluster checks if an unmanaged cluster is present in Cloudstack else creates one.
102+
func (r *CloudStackClusterReconciliationRunner) GetOrCreateUnmanagedCluster() (ctrl.Result, error) {
103103
res, err := r.AsFailureDomainUser(&r.CSCluster.Spec.FailureDomains[0])()
104104
if r.ShouldReturn(res, err) {
105105
return res, err
106106
}
107-
err = r.CSUser.GetOrCreateCluster(r.CAPICluster, r.ReconciliationSubject, &r.FailureDomains.Items[0].Spec)
107+
err = r.CSUser.GetOrCreateUnmanagedCluster(r.CAPICluster, r.ReconciliationSubject, &r.FailureDomains.Items[0].Spec)
108108
if err != nil {
109109
if strings.Contains(err.Error(), "Kubernetes Service plugin is disabled") {
110110
r.Log.Info("Kubernetes Service plugin is disabled on CloudStack. Skipping ExternalManaged kubernetes cluster creation")
@@ -170,21 +170,21 @@ func (r *CloudStackClusterReconciliationRunner) ReconcileDelete() (ctrl.Result,
170170
}
171171
return r.RequeueWithMessage("Child FailureDomains still present, requeueing.")
172172
}
173-
if res, err := r.DeleteCluster(); r.ShouldReturn(res, err) {
173+
if res, err := r.DeleteUnmanagedCluster(); r.ShouldReturn(res, err) {
174174
return res, err
175175
}
176176
controllerutil.RemoveFinalizer(r.ReconciliationSubject, infrav1.ClusterFinalizer)
177177
return ctrl.Result{}, nil
178178
}
179179

180-
// DeleteCluster checks if an unmanaged cluster is present in Cloudstack and then deletes it.
181-
func (r *CloudStackClusterReconciliationRunner) DeleteCluster() (ctrl.Result, error) {
180+
// DeleteUnmanagedCluster checks if an unmanaged cluster is present in Cloudstack and then deletes it.
181+
func (r *CloudStackClusterReconciliationRunner) DeleteUnmanagedCluster() (ctrl.Result, error) {
182182
// If field is present and delete fails, then requeue
183183
res, err := r.AsFailureDomainUser(&r.CSCluster.Spec.FailureDomains[0])()
184184
if r.ShouldReturn(res, err) {
185185
return res, err
186186
}
187-
err = r.CSUser.DeleteCluster(r.ReconciliationSubject)
187+
err = r.CSUser.DeleteUnmanagedCluster(r.ReconciliationSubject)
188188
if err != nil {
189189
if strings.Contains(err.Error(), " not found") {
190190
return ctrl.Result{}, nil

‎controllers/cloudstackmachine_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@ func (r *CloudStackMachineReconciliationRunner) DeleteMachineIfFailuredomainNotE
217217
// AttachVM adds the VM to CloudStack Unmanaged kubernetes.
218218
// No action taken if it fails
219219
func (r *CloudStackMachineReconciliationRunner) AttachVM() (retRes ctrl.Result, reterr error) {
220-
_ = r.CSUser.AddVMToCluster(r.CSCluster, r.ReconciliationSubject)
220+
_ = r.CSUser.AddVMToUnmanagedCluster(r.CSCluster, r.ReconciliationSubject)
221221
return ctrl.Result{}, nil
222222
}
223223

224224
// RemoveVM removes the VM from CloudStack Unmanaged kubernetes.
225225
// No action taken if it fails
226226
func (r *CloudStackMachineReconciliationRunner) RemoveVM() (retRes ctrl.Result, reterr error) {
227-
_ = r.CSUser.RemoveVMFromCluster(r.CSCluster, r.ReconciliationSubject)
227+
_ = r.CSUser.RemoveVMFromUnmanagedCluster(r.CSCluster, r.ReconciliationSubject)
228228
return ctrl.Result{}, nil
229229
}
230230

‎controllers/cloudstackmachine_controller_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ var _ = Describe("CloudStackMachineReconciler", func() {
5555
Ω(k8sClient.Create(ctx, dummies.CSFailureDomain1)).Should(Succeed())
5656
setClusterReady(k8sClient)
5757

58-
mockCloudClient.EXPECT().GetOrCreateCluster(gomock.Any(), gomock.Any(), gomock.Any()).Do(
58+
mockCloudClient.EXPECT().GetOrCreateUnmanagedCluster(gomock.Any(), gomock.Any(), gomock.Any()).Do(
5959
func(arg1, _, _ interface{}) {
6060
arg1.(*infrav1.CloudStackCluster).Status.CloudStackClusterID = "cluster-id-123"
6161
}).AnyTimes().Return(nil)
6262

63-
mockCloudClient.EXPECT().AddVMToCluster(
63+
mockCloudClient.EXPECT().AddVMToUnmanagedCluster(
6464
gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
6565

66-
mockCloudClient.EXPECT().RemoveVMFromCluster(
66+
mockCloudClient.EXPECT().RemoveVMFromUnmanagedCluster(
6767
gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
6868
})
6969

@@ -251,7 +251,7 @@ var _ = Describe("CloudStackMachineReconciler", func() {
251251
func(arg1, _, _, _, _, _ interface{}) {
252252
arg1.(*infrav1.CloudStackMachine).Status.InstanceState = "Running"
253253
}).AnyTimes()
254-
mockCloudClient.EXPECT().AddVMToCluster(
254+
mockCloudClient.EXPECT().AddVMToUnmanagedCluster(
255255
gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
256256
Ω(fakeCtrlClient.Get(ctx, key, dummies.CSCluster)).Should(Succeed())
257257
Ω(fakeCtrlClient.Create(ctx, dummies.CAPIMachine)).Should(Succeed())

‎pkg/cloud/cluster.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
)
2828

2929
type ClusterIface interface {
30-
GetOrCreateCluster(*clusterv1.Cluster, *infrav1.CloudStackCluster, *infrav1.CloudStackFailureDomainSpec) error
31-
DeleteCluster(*infrav1.CloudStackCluster) error
32-
AddVMToCluster(*infrav1.CloudStackCluster, *infrav1.CloudStackMachine) error
33-
RemoveVMFromCluster(*infrav1.CloudStackCluster, *infrav1.CloudStackMachine) error
30+
GetOrCreateUnmanagedCluster(*clusterv1.Cluster, *infrav1.CloudStackCluster, *infrav1.CloudStackFailureDomainSpec) error
31+
DeleteUnmanagedCluster(*infrav1.CloudStackCluster) error
32+
AddVMToUnmanagedCluster(*infrav1.CloudStackCluster, *infrav1.CloudStackMachine) error
33+
RemoveVMFromUnmanagedCluster(*infrav1.CloudStackCluster, *infrav1.CloudStackMachine) error
3434
}
3535

3636
type ClustertypeSetter interface {
@@ -48,7 +48,7 @@ func withExternalManaged() cloudstack.OptionFunc {
4848
}
4949
}
5050

51-
func (c *client) GetOrCreateCluster(cluster *clusterv1.Cluster, csCluster *infrav1.CloudStackCluster, fd *infrav1.CloudStackFailureDomainSpec) error {
51+
func (c *client) GetOrCreateUnmanagedCluster(cluster *clusterv1.Cluster, csCluster *infrav1.CloudStackCluster, fd *infrav1.CloudStackFailureDomainSpec) error {
5252
// Get cluster
5353
if csCluster.Status.CloudStackClusterID != "" {
5454
externalManagedCluster, count, err := c.cs.Kubernetes.GetKubernetesClusterByID(csCluster.Status.CloudStackClusterID, withExternalManaged())
@@ -102,7 +102,7 @@ func (c *client) GetOrCreateCluster(cluster *clusterv1.Cluster, csCluster *infra
102102
return nil
103103
}
104104

105-
func (c *client) DeleteCluster(csCluster *infrav1.CloudStackCluster) error {
105+
func (c *client) DeleteUnmanagedCluster(csCluster *infrav1.CloudStackCluster) error {
106106
if csCluster.Status.CloudStackClusterID != "" {
107107
csUnmanagedCluster, count, err := c.cs.Kubernetes.GetKubernetesClusterByID(csCluster.Status.CloudStackClusterID, withExternalManaged())
108108
if err != nil && strings.Contains(err.Error(), " not found") {
@@ -120,7 +120,7 @@ func (c *client) DeleteCluster(csCluster *infrav1.CloudStackCluster) error {
120120
return nil
121121
}
122122

123-
func (c *client) AddVMToCluster(csCluster *infrav1.CloudStackCluster, csMachine *infrav1.CloudStackMachine) error {
123+
func (c *client) AddVMToUnmanagedCluster(csCluster *infrav1.CloudStackCluster, csMachine *infrav1.CloudStackMachine) error {
124124
if csCluster.Status.CloudStackClusterID != "" {
125125
params := c.cs.Kubernetes.NewAddVirtualMachinesToKubernetesClusterParams(csCluster.Status.CloudStackClusterID, []string{*csMachine.Spec.InstanceID})
126126
_, err := c.cs.Kubernetes.AddVirtualMachinesToKubernetesCluster(params)
@@ -129,7 +129,7 @@ func (c *client) AddVMToCluster(csCluster *infrav1.CloudStackCluster, csMachine
129129
return nil
130130
}
131131

132-
func (c *client) RemoveVMFromCluster(csCluster *infrav1.CloudStackCluster, csMachine *infrav1.CloudStackMachine) error {
132+
func (c *client) RemoveVMFromUnmanagedCluster(csCluster *infrav1.CloudStackCluster, csMachine *infrav1.CloudStackMachine) error {
133133
if csCluster.Status.CloudStackClusterID != "" {
134134
params := c.cs.Kubernetes.NewRemoveVirtualMachinesFromKubernetesClusterParams(csCluster.Status.CloudStackClusterID, []string{*csMachine.Spec.InstanceID})
135135
_, err := c.cs.Kubernetes.RemoveVirtualMachinesFromKubernetesCluster(params)

0 commit comments

Comments
 (0)