[ws-manager] Check the pod contains a workspace class and exists

aledbf · roboquat · commit fe904f9571e6 · 2022-05-26T02:31:39.000+05:30
diff --git a/components/ws-manager/pkg/manager/monitor.go b/components/ws-manager/pkg/manager/monitor.go
@@ -894,11 +894,15 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
 	)
 	if wso.Pod != nil {
 		_, pvcFeatureEnabled = wso.Pod.Labels[pvcWorkspaceFeatureAnnotation]
-		wsClassName := ""
+
 		if _, ok := wso.Pod.Labels[workspaceClassLabel]; ok {
-			wsClassName = wso.Pod.Labels[workspaceClassLabel]
+			wsClassName := wso.Pod.Labels[workspaceClassLabel]
+
+			workspaceClass := m.manager.Config.WorkspaceClasses[wsClassName]
+			if workspaceClass != nil {
+				pvcVolumeSnapshotClassName = workspaceClass.PVC.SnapshotClass
+			}
 		}
-		pvcVolumeSnapshotClassName = m.manager.Config.WorkspaceClasses[wsClassName].PVC.SnapshotClass
 	}
 
 	doBackup := wso.WasEverReady() && !wso.IsWorkspaceHeadless()

Original file line number	Diff line number	Diff line change
`@@ -894,11 +894,15 @@ func (m Monitor) finalizeWorkspaceContent(ctx context.Context, wso workspaceOb`
`894`	`894`	`)`
`895`	`895`	`if wso.Pod != nil {`
`896`	`896`	`_, pvcFeatureEnabled = wso.Pod.Labels[pvcWorkspaceFeatureAnnotation]`
`897`		`- wsClassName := ""`
	`897`	`+`
`898`	`898`	`if _, ok := wso.Pod.Labels[workspaceClassLabel]; ok {`
`899`		`- wsClassName = wso.Pod.Labels[workspaceClassLabel]`
	`899`	`+ wsClassName := wso.Pod.Labels[workspaceClassLabel]`
	`900`	`+`
	`901`	`+ workspaceClass := m.manager.Config.WorkspaceClasses[wsClassName]`
	`902`	`+ if workspaceClass != nil {`
	`903`	`+ pvcVolumeSnapshotClassName = workspaceClass.PVC.SnapshotClass`
	`904`	`+ }`
`900`	`905`	`}`
`901`		`- pvcVolumeSnapshotClassName = m.manager.Config.WorkspaceClasses[wsClassName].PVC.SnapshotClass`
`902`	`906`	`}`
`903`	`907`
`904`	`908`	`doBackup := wso.WasEverReady() && !wso.IsWorkspaceHeadless()`