Skip to content

Commit fb0b075

Browse files
committed
Rename CeilometerStatus back to Status
CeilometerStatus was created for the sake of consistency with KSMStatus, which is now deprecated and unused because of the functionality issues. Keeping the name makes for Ceilometer does not make sense any more.
1 parent 8cf8a0c commit fb0b075

File tree

5 files changed

+117
-117
lines changed

5 files changed

+117
-117
lines changed

api/v1beta1/ceilometer_types.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ type Ceilometer struct {
219219
metav1.TypeMeta `json:",inline"`
220220
metav1.ObjectMeta `json:"metadata,omitempty"`
221221

222-
Spec CeilometerSpec `json:"spec,omitempty"`
223-
CeilometerStatus CeilometerStatus `json:"status,omitempty"`
224-
KSMStatus KSMStatus `json:"ksmStatus,omitempty"`
222+
Spec CeilometerSpec `json:"spec,omitempty"`
223+
Status CeilometerStatus `json:"status,omitempty"`
224+
KSMStatus KSMStatus `json:"ksmStatus,omitempty"`
225225
}
226226

227227
//+kubebuilder:object:root=true
@@ -235,7 +235,7 @@ type CeilometerList struct {
235235

236236
// IsReady - returns true if Ceilometer is reconciled successfully
237237
func (instance Ceilometer) IsReady() bool {
238-
return instance.CeilometerStatus.Conditions.IsTrue(condition.ReadyCondition)
238+
return instance.Status.Conditions.IsTrue(condition.ReadyCondition)
239239
}
240240

241241
func init() {
@@ -244,7 +244,7 @@ func init() {
244244

245245
// RbacConditionsSet - set the conditions for the rbac object
246246
func (instance Ceilometer) RbacConditionsSet(c *condition.Condition) {
247-
instance.CeilometerStatus.Conditions.Set(c)
247+
instance.Status.Conditions.Set(c)
248248
}
249249

250250
// RbacNamespace - return the namespace

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)