Skip to content

Commit 5c5a2a3

Browse files
committed
Add back Error field temporarily so that it does break VM op compatibility
1 parent 3ab4f85 commit 5c5a2a3

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

pkg/apis/cnsoperator/cnsnodevmbatchattachment/v1alpha1/cnsnodebatchvmattachment_types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ type CnsNodeVMBatchAttachmentStatus struct {
127127

128128
// Conditions describes any conditions associated with this CnsNodeVMBatchAttachment instance.
129129
Conditions []metav1.Condition `json:"conditions,omitempty"`
130+
131+
// TODO: remove this field once VM op changes are ready.
132+
// Error is the overall error status for the instance.
133+
Error string `json:"error,omitempty"`
130134
}
131135

132136
type VolumeStatus struct {
@@ -151,6 +155,10 @@ type PersistentVolumeClaimStatus struct {
151155

152156
// Conditions describes any conditions associated with this volume.
153157
Conditions []metav1.Condition `json:"conditions,omitempty"`
158+
159+
// TODO: remove this field once VM op changes are ready.
160+
// Error indicates the error which may have occurred during attach/detach.
161+
Error string `json:"error,omitempty"`
154162
}
155163

156164
// +genclient

pkg/apis/cnsoperator/config/cns.vmware.com_cnsnodevmbatchattachments.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ spec:
183183
- type
184184
type: object
185185
type: array
186+
error:
187+
description: |-
188+
TODO: remove this field once VM op changes are ready.
189+
Error is the overall error status for the instance.
190+
type: string
186191
volumes:
187192
description: VolumeStatus reflects the status for each volume.
188193
items:
@@ -278,6 +283,11 @@ spec:
278283
description: DiskUUID is the ID obtained when volume is
279284
attached to a VM.
280285
type: string
286+
error:
287+
description: |-
288+
TODO: remove this field once VM op changes are ready.
289+
Error indicates the error which may have occurred during attach/detach.
290+
type: string
281291
required:
282292
- claimName
283293
type: object
@@ -295,9 +305,3 @@ spec:
295305
storage: true
296306
subresources:
297307
status: {}
298-
status:
299-
acceptedNames:
300-
kind: ""
301-
plural: ""
302-
conditions: []
303-
storedVersions: []

0 commit comments

Comments
 (0)