Skip to content

Commit ae199bb

Browse files
committed
Rename receivers for consistency in package api/
1 parent b44f0aa commit ae199bb

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

api/v1beta1/rabbitmqcluster_types.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,13 @@ func (cluster *RabbitmqCluster) AdditionalPluginEnabled(plugin Plugin) bool {
325325
return false
326326
}
327327

328-
func (rmqStatus *RabbitmqClusterStatus) SetConditions(resources []runtime.Object) {
328+
func (clusterStatus *RabbitmqClusterStatus) SetConditions(resources []runtime.Object) {
329329
var oldAllPodsReadyCondition *status.RabbitmqClusterCondition
330330
var oldClusterAvailableCondition *status.RabbitmqClusterCondition
331331
var oldNoWarningsCondition *status.RabbitmqClusterCondition
332332
var oldReconcileCondition *status.RabbitmqClusterCondition
333333

334-
for _, condition := range rmqStatus.Conditions {
334+
for _, condition := range clusterStatus.Conditions {
335335
switch condition.Type {
336336
case status.AllReplicasReady:
337337
oldAllPodsReadyCondition = condition.DeepCopy()
@@ -355,20 +355,20 @@ func (rmqStatus *RabbitmqClusterStatus) SetConditions(resources []runtime.Object
355355
reconciledCondition = status.ReconcileSuccessCondition(corev1.ConditionUnknown, "Initialising", "")
356356
}
357357

358-
rmqStatus.Conditions = []status.RabbitmqClusterCondition{
358+
clusterStatus.Conditions = []status.RabbitmqClusterCondition{
359359
allReplicasReadyCond,
360360
clusterAvailableCond,
361361
noWarningsCond,
362362
reconciledCondition,
363363
}
364364
}
365365

366-
func (rmqStatus *RabbitmqClusterStatus) SetCondition(condType status.RabbitmqClusterConditionType,
366+
func (clusterStatus *RabbitmqClusterStatus) SetCondition(condType status.RabbitmqClusterConditionType,
367367
condStatus corev1.ConditionStatus, reason string, messages ...string) {
368-
for i := range rmqStatus.Conditions {
369-
if rmqStatus.Conditions[i].Type == condType {
370-
rmqStatus.Conditions[i].UpdateState(condStatus)
371-
rmqStatus.Conditions[i].UpdateReason(reason, messages...)
368+
for i := range clusterStatus.Conditions {
369+
if clusterStatus.Conditions[i].Type == condType {
370+
clusterStatus.Conditions[i].UpdateState(condStatus)
371+
clusterStatus.Conditions[i].UpdateReason(reason, messages...)
372372
break
373373
}
374374
}
@@ -383,8 +383,8 @@ type RabbitmqClusterList struct {
383383
Items []RabbitmqCluster `json:"items"`
384384
}
385385

386-
func (r RabbitmqCluster) ChildResourceName(name string) string {
387-
return strings.Join([]string{r.Name, "rabbitmq", name}, "-")
386+
func (cluster RabbitmqCluster) ChildResourceName(name string) string {
387+
return strings.Join([]string{cluster.Name, "rabbitmq", name}, "-")
388388
}
389389

390390
func init() {

0 commit comments

Comments
 (0)