Skip to content

Commit 89b8611

Browse files
sagor999sagor999
committed
address PR feedback
1 parent ea130aa commit 89b8611

File tree

7 files changed

+45
-46
lines changed

7 files changed

+45
-46
lines changed

‎components/ws-daemon/pkg/internal/session/workspace.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ func (s *Workspace) UpdateGitSafeDirectory(ctx context.Context) (err error) {
280280
}
281281

282282
// UpdateGitStatus attempts to update the LastGitStatus from the workspace's local working copy.
283-
func (s *Workspace) UpdateGitStatus(ctx context.Context, persistent_volume_claim bool) (res *csapi.GitStatus, err error) {
283+
func (s *Workspace) UpdateGitStatus(ctx context.Context, persistentVolumeClaim bool) (res *csapi.GitStatus, err error) {
284284
var loc string
285-
if persistent_volume_claim {
285+
if persistentVolumeClaim {
286286
loc = filepath.Join(s.ServiceLocDaemon, "prestophookdata")
287287
stat, err := git.GitStatusFromFiles(ctx, loc)
288288
if err != nil {

‎components/ws-manager/cmd/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
imgbldr "github.com/gitpod-io/gitpod/image-builder/api"
3333
"github.com/gitpod-io/gitpod/ws-manager/pkg/manager"
3434
"github.com/gitpod-io/gitpod/ws-manager/pkg/proxy"
35-
volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
35+
volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
3636
)
3737

3838
// serveCmd represents the serve command

‎components/ws-manager/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ require (
2020
github.com/google/uuid v1.3.0
2121
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2222
github.com/imdario/mergo v0.3.12
23+
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
2324
github.com/opentracing/opentracing-go v1.2.0
2425
github.com/prometheus/client_golang v1.12.1
2526
github.com/sirupsen/logrus v1.8.1
@@ -73,8 +74,6 @@ require (
7374
github.com/inconshreveable/mousetrap v1.0.0 // indirect
7475
github.com/json-iterator/go v1.1.12 // indirect
7576
github.com/klauspost/cpuid v1.3.1 // indirect
76-
github.com/klauspost/pgzip v1.2.5 // indirect
77-
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.0.0-rc4 // indirect
7877
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
7978
github.com/minio/md5-simd v1.1.0 // indirect
8079
github.com/minio/minio-go/v7 v7.0.11 // indirect

‎components/ws-manager/go.sum

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
406406
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
407407
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
408408
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
409-
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
410-
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.0.0-rc4 h1:uspy64y8fTrwchSk4dKx/CAndt0y2V70BFM2C9/jTIE=
411-
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.0.0-rc4/go.mod h1:tnHiLn3P10N95fjn7O40QH5ovN0EFGAxqdTpUMrX6bU=
412-
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
409+
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyPlUHk/ofpgvBcNcawJLtf4PYHORLjAA=
410+
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
413411
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
414412
github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
415413
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -855,6 +853,7 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
855853
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
856854
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
857855
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
856+
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
858857
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
859858
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
860859
golang.org/x/time v0.0.0-20220411224347-583f2d630306 h1:+gHMid33q6pen7kv9xvT+JRinntgeXO2AeZVd0AWD3w=

‎components/ws-manager/pkg/manager/create.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
regapi "github.com/gitpod-io/gitpod/registry-facade/api"
3434
"github.com/gitpod-io/gitpod/ws-manager/api"
3535
config "github.com/gitpod-io/gitpod/ws-manager/api/config"
36+
volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
3637
)
3738

3839
// Protobuf structures often require pointer to boolean values (as that's Go's best means of expression optionallity).
@@ -255,8 +256,8 @@ func (m *Manager) createPVCForWorkspacePod(startContext *startWorkspaceContext)
255256
},
256257
}
257258

258-
if startContext.VolumeSnapshot.VolumeSnapshotName != "" {
259-
snapshotApiGroup := "snapshot.storage.k8s.io"
259+
if startContext.VolumeSnapshot != nil {
260+
snapshotApiGroup := volumesnapshotv1.GroupName
260261
PVC.Spec.DataSource = &corev1.TypedLocalObjectReference{
261262
APIGroup: &snapshotApiGroup,
262263
Kind: "VolumeSnapshot",
@@ -903,10 +904,12 @@ func (m *Manager) newStartWorkspaceContext(ctx context.Context, req *api.StartWo
903904
workspaceClassLabel: clsName,
904905
}
905906

906-
var volumeSnapshot workspaceVolumeSnapshotStatus
907+
var volumeSnapshot *workspaceVolumeSnapshotStatus
907908
if req.Spec.VolumeSnapshot != nil {
908-
volumeSnapshot.VolumeSnapshotName = req.Spec.VolumeSnapshot.VolumeSnapshotName
909-
volumeSnapshot.VolumeSnapshotHandle = req.Spec.VolumeSnapshot.VolumeSnapshotHandle
909+
volumeSnapshot = &workspaceVolumeSnapshotStatus{
910+
VolumeSnapshotName: req.Spec.VolumeSnapshot.VolumeSnapshotName,
911+
VolumeSnapshotHandle: req.Spec.VolumeSnapshot.VolumeSnapshotHandle,
912+
}
910913
}
911914

912915
return &startWorkspaceContext{

‎components/ws-manager/pkg/manager/manager.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ type Manager struct {
6868
}
6969

7070
type startWorkspaceContext struct {
71-
Request *api.StartWorkspaceRequest `json:"request"`
72-
Labels map[string]string `json:"labels"`
73-
CLIAPIKey string `json:"cliApiKey"`
74-
OwnerToken string `json:"ownerToken"`
75-
IDEPort int32 `json:"idePort"`
76-
SupervisorPort int32 `json:"supervisorPort"`
77-
WorkspaceURL string `json:"workspaceURL"`
78-
TraceID string `json:"traceID"`
79-
Headless bool `json:"headless"`
80-
Class *config.WorkspaceClass `json:"class"`
81-
VolumeSnapshot workspaceVolumeSnapshotStatus `json:"volumeSnapshot"`
71+
Request *api.StartWorkspaceRequest `json:"request"`
72+
Labels map[string]string `json:"labels"`
73+
CLIAPIKey string `json:"cliApiKey"`
74+
OwnerToken string `json:"ownerToken"`
75+
IDEPort int32 `json:"idePort"`
76+
SupervisorPort int32 `json:"supervisorPort"`
77+
WorkspaceURL string `json:"workspaceURL"`
78+
TraceID string `json:"traceID"`
79+
Headless bool `json:"headless"`
80+
Class *config.WorkspaceClass `json:"class"`
81+
VolumeSnapshot *workspaceVolumeSnapshotStatus `json:"volumeSnapshot"`
8282
}
8383

8484
func (swctx *startWorkspaceContext) ContainerConfiguration() config.ContainerConfiguration {

‎components/ws-manager/pkg/manager/monitor.go

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"github.com/gitpod-io/gitpod/ws-manager/api"
4040
"github.com/gitpod-io/gitpod/ws-manager/pkg/manager/internal/workpool"
4141

42-
volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
42+
volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
4343
)
4444

4545
const (
@@ -1043,33 +1043,31 @@ func (m *Monitor) finalizeWorkspaceContent(ctx context.Context, wso *workspaceOb
10431043
}
10441044
deletedPVC = true
10451045
}
1046-
} else {
1047-
if doSnapshot {
1048-
// if this is a prebuild take a snapshot and mark the workspace
1049-
var res *wsdaemon.TakeSnapshotResponse
1050-
res, err = snc.TakeSnapshot(ctx, &wsdaemon.TakeSnapshotRequest{Id: workspaceID})
1046+
} else if doSnapshot {
1047+
// if this is a prebuild take a snapshot and mark the workspace
1048+
var res *wsdaemon.TakeSnapshotResponse
1049+
res, err = snc.TakeSnapshot(ctx, &wsdaemon.TakeSnapshotRequest{Id: workspaceID})
1050+
if err != nil {
1051+
tracing.LogError(span, err)
1052+
log.WithError(err).Warn("cannot take snapshot")
1053+
err = xerrors.Errorf("cannot take snapshot: %v", err)
1054+
err = m.manager.markWorkspace(ctx, workspaceID, addMark(workspaceExplicitFailAnnotation, err.Error()))
1055+
if err != nil {
1056+
log.WithError(err).Warn("was unable to mark workspace as failed")
1057+
}
1058+
}
1059+
1060+
if res != nil {
1061+
err = m.manager.markWorkspace(context.Background(), workspaceID, addMark(workspaceSnapshotAnnotation, res.Url))
10511062
if err != nil {
10521063
tracing.LogError(span, err)
1053-
log.WithError(err).Warn("cannot take snapshot")
1054-
err = xerrors.Errorf("cannot take snapshot: %v", err)
1064+
log.WithError(err).Warn("cannot mark headless workspace with snapshot - that's one prebuild lost")
1065+
err = xerrors.Errorf("cannot remember snapshot: %v", err)
10551066
err = m.manager.markWorkspace(ctx, workspaceID, addMark(workspaceExplicitFailAnnotation, err.Error()))
10561067
if err != nil {
10571068
log.WithError(err).Warn("was unable to mark workspace as failed")
10581069
}
10591070
}
1060-
1061-
if res != nil {
1062-
err = m.manager.markWorkspace(context.Background(), workspaceID, addMark(workspaceSnapshotAnnotation, res.Url))
1063-
if err != nil {
1064-
tracing.LogError(span, err)
1065-
log.WithError(err).Warn("cannot mark headless workspace with snapshot - that's one prebuild lost")
1066-
err = xerrors.Errorf("cannot remember snapshot: %v", err)
1067-
err = m.manager.markWorkspace(ctx, workspaceID, addMark(workspaceExplicitFailAnnotation, err.Error()))
1068-
if err != nil {
1069-
log.WithError(err).Warn("was unable to mark workspace as failed")
1070-
}
1071-
}
1072-
}
10731071
}
10741072
}
10751073

0 commit comments

Comments
 (0)