update VirtualMachineRestoreStatus object to include timestamp and error

Signed-off-by: Michael Henriksen <[email protected]>
bk201 · Sep 10, 2020 · 422648d · 422648d
1 parent 15f0b8d
commit 422648d
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 4 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -10925,6 +10925,18 @@
      }
     }
    },
+   "v1alpha1.VirtualMachineRestoreError": {
+    "description": "VirtualMachineRestoreError is the last error encountered while performing the restore",
+    "type": "object",
+    "properties": {
+     "message": {
+      "type": "string"
+     },
+     "time": {
+      "$ref": "#/definitions/v1.Time"
+     }
+    }
+   },
    "v1alpha1.VirtualMachineRestoreList": {
     "description": "VirtualMachineRestoreList is a list of VirtualMachineRestore resources",
     "type": "object",
@@ -10995,6 +11007,12 @@
       "items": {
        "$ref": "#/definitions/v1alpha1.VirtualMachineRestoreCondition"
       }
+     },
+     "error": {
+      "$ref": "#/definitions/v1alpha1.VirtualMachineRestoreError"
+     },
+     "restoreTime": {
+      "$ref": "#/definitions/v1.Time"
      }
     }
    },

diff --git a/pkg/virt-operator/creation/components/crds.go b/pkg/virt-operator/creation/components/crds.go
@@ -352,6 +352,8 @@ func NewVirtualMachineRestoreCrd() *extv1beta1.CustomResourceDefinition {
 			{Name: "TargetKind", Type: "string", JSONPath: ".spec.target.kind"},
 			{Name: "TargetName", Type: "string", JSONPath: ".spec.target.name"},
 			{Name: "Complete", Type: "boolean", JSONPath: ".status.complete"},
+			{Name: "RestoreTime", Type: "date", JSONPath: ".status.restoreTime"},
+			{Name: "Error", Type: "string", JSONPath: ".status.error.message"},
 		},
 	}
 

diff --git a/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/deepcopy_generated.go b/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/deepcopy_generated.go
diff --git a/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/openapi_generated.go b/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/openapi_generated.go
diff --git a/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/types.go b/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/types.go
@@ -234,13 +234,28 @@ type VirtualMachineRestoreSpec struct {
 
 // VirtualMachineRestoreStatus is the spec for a VirtualMachineRestoreresource
 type VirtualMachineRestoreStatus struct {
+	// +optional
+	RestoreTime *metav1.Time `json:"restoreTime,omitempty"`
+
 	// +optional
 	Complete *bool `json:"complete,omitempty"`
 
+	// +optional
+	Error *VirtualMachineRestoreError `json:"error,omitempty"`
+
 	// +optional
 	Conditions []VirtualMachineRestoreCondition `json:"conditions,omitempty"`
 }
 
+// VirtualMachineRestoreError is the last error encountered while performing the restore
+type VirtualMachineRestoreError struct {
+	// +optional
+	Time *metav1.Time `json:"time,omitempty"`
+
+	// +optional
+	Message *string `json:"message,omitempty"`
+}
+
 // VirtualMachineRestoreConditionType is the type of VirtualMachineRestoreCondition
 type VirtualMachineRestoreConditionType string
 

diff --git a/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/types_swagger_generated.go b/staging/src/kubevirt.io/client-go/apis/snapshot/v1alpha1/types_swagger_generated.go