wip

Author: sagor999

components/content-service/pkg/layer/provider.go

@@ -264,8 +264,12 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 		if err != nil {
 			return nil, nil, err
 		}
+		layerReady, err := workspaceReadyLayerPVC(csapi.WorkspaceInitFromBackup)
+		if err != nil {
+			return nil, nil, err
+		}
 
-		l = []Layer{*layer}
+		l = []Layer{*layer, *layerReady}
 		return l, manifest, nil
 	}
 
@@ -274,8 +278,12 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 		if err != nil {
 			return nil, nil, err
 		}
+		layerReady, err := workspaceReadyLayerPVC(csapi.WorkspaceInitFromBackup)
+		if err != nil {
+			return nil, nil, err
+		}
 
-		l = []Layer{*layer}
+		l = []Layer{*layer, *layerReady}
 		return l, manifest, nil
 	}
 
@@ -288,7 +296,6 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 			if err != nil {
 				return nil, nil, err
 			}
-			// we also need to place ready file
 			layerReady, err := workspaceReadyLayerPVC(csapi.WorkspaceInitFromOther)
 			if err != nil {
 				return nil, nil, err
@@ -306,7 +313,6 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 			if err != nil {
 				return nil, nil, err
 			}
-			// we also need to place ready file
 			layerReady, err := workspaceReadyLayerPVC(csapi.WorkspaceInitFromPrebuild)
 			if err != nil {
 				return nil, nil, err
@@ -354,7 +360,11 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 		if err != nil {
 			return nil, nil, err
 		}
-		return []Layer{*layer}, nil, nil
+		layerReady, err := workspaceReadyLayerPVC(csapi.WorkspaceInitFromOther)
+		if err != nil {
+			return nil, nil, err
+		}
+		return []Layer{*layer, *layerReady}, nil, nil
 	}
 	if initializer.GetBackup() != nil {
 		// We were asked to restore a backup and have tried above. We've failed to restore the backup,