Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 49 additions & 22 deletions pkg/remote/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,43 @@ import (
"bunnyshell.com/dev/pkg/util"
)

func (r *RemoteDevelopment) CanUp() error {
resource, err := r.getResource()
if err != nil {
return err
}

labels := resource.GetLabels()
if active, found := labels[DebugMetadataActive]; found {
if active == "true" {
return fmt.Errorf("cannot start remote-development session, Pod already in a debug session")
}
}

return nil
func (r *RemoteDevelopment) CanUp(forceRecreateResource bool) error {
resource, err := r.getResource()
if err != nil {
return err
}

labels := resource.GetLabels()
if active, found := labels[DebugMetadataActive]; found {
if active == "true" {
return fmt.Errorf("cannot start remote-development session, Pod already in a debug session")
}
}

if active, found := labels[MetadataActive]; found {
if active == "true" {
annotations := resource.GetAnnotations()
if containerName, found := annotations[MetadataContainer]; found {
if containerName == r.container.Name {
r.shouldPrepareResource = forceRecreateResource

return nil
}

if forceRecreateResource {
r.shouldPrepareResource = true

return nil
} else {
return fmt.Errorf("cannot start remote-development session, Pod already in another remote-development session on container %s.\nRun \"bns remote-development down\" command then try again", containerName)
}
}
}
}

r.shouldPrepareResource = true

return nil
}

func (r *RemoteDevelopment) Up() error {
Expand All @@ -33,16 +56,20 @@ func (r *RemoteDevelopment) Up() error {
return err
}

if err := r.ensureSecret(); err != nil {
return err
}
if r.shouldPrepareResource {
if err := r.ensureSecret(); err != nil {
return err
}

if err := r.ensurePVC(); err != nil {
return err
}
if err := r.ensurePVC(); err != nil {
return err
}

if err := r.prepareResource(); err != nil {
return err
if err := r.prepareResource(); err != nil {
return err
}
} else {
fmt.Print("Skip re-preparing Pod\n")
}

if err := r.waitPodReady(); err != nil {
Expand Down
4 changes: 4 additions & 0 deletions pkg/remote/remote_development.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ type RemoteDevelopment struct {
localSyncPath string
remoteSyncPath string

shouldPrepareResource bool

stopChannel chan bool

startedAt int64
Expand All @@ -67,6 +69,8 @@ func NewRemoteDevelopment() *RemoteDevelopment {

AutoSelectSingleResource: true,

shouldPrepareResource: true,

stopChannel: make(chan bool),
spinner: util.MakeSpinner(" Remote Development"),
syncMode: mutagenConfig.TwoWayResolved,
Expand Down
Loading