Implement #343

examples/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+.devspace

examples/minikube/devspace.yaml

@@ -4,26 +4,26 @@ images:
     image: devspace
     skipPush: true
 deployments:
-- name: devspace-app
-  helm:
-    chart:
-      name: ./chart
+  - name: devspace-app
+    helm:
+      chart:
+        name: ./chart
 dev:
   overrideImages:
-  - name: default
-    entrypoint:
-    - sleep
-    - "999999999999"
+    - name: default
+      entrypoint:
+        - sleep
+        - "999999999999"
   ports:
-  - labelSelector:
-      app.kubernetes.io/component: default
-    forward:
-    - port: 3000
+    - labelSelector:
+        app.kubernetes.io/component: default
+      forward:
+        - port: 3000
   sync:
-  - labelSelector:
-      app.kubernetes.io/component: default
-    excludePaths:
-    - node_modules
+    - labelSelector:
+        app.kubernetes.io/component: default
+      excludePaths:
+        - node_modules
 cluster:
   kubeContext: minikube
   namespace: devspace

pkg/devspace/builder/kaniko/build_pod.go

@@ -82,8 +82,8 @@ func (b *Builder) getBuildPod(options *types.ImageBuildOptions, dockerfilePath s
 	}
 
 	// Extra flags
-	if b.kanikoOptions.ExtraFlags != nil {
-		for _, flag := range *b.kanikoOptions.ExtraFlags {
+	if b.kanikoOptions.Flags != nil {
+		for _, flag := range *b.kanikoOptions.Flags {
 			kanikoArgs = append(kanikoArgs, *flag)
 		}
 	}

pkg/devspace/builder/kaniko/kaniko_test.go

@@ -9,6 +9,6 @@ func TestKanikoBuildWithEntrypointOverride(t *testing.T) {
 	// 1. Write test dockerfile and context to a temp folder
 	// 2. Create kubectl client
 	// 3. Create test namespace test-kaniko-build
-	// 4. Build image with kaniko, but don't push it (In kaniko options use "--no-push" as extra flag)
+	// 4. Build image with kaniko, but don't push it (In kaniko options use "--no-push" as flag)
 	// 5. Delete temp files & test namespace
 }

pkg/devspace/config/versions/latest/schema.go

@@ -67,7 +67,7 @@ type DockerConfig struct {
 type KanikoConfig struct {
 	Cache        *bool      `yaml:"cache"`
 	SnapshotMode *string    `yaml:"snapshotMode,omitempty"`
-	ExtraFlags   *[]*string `yaml:"extraFlags,omitempty"`
+	Flags        *[]*string `yaml:"flags,omitempty"`
 	Namespace    *string    `yaml:"namespace,omitempty"`
 	PullSecret   *string    `yaml:"pullSecret,omitempty"`
 }
@@ -251,6 +251,7 @@ type SyncConfig struct {
 	LocalSubPath         *string             `yaml:"localSubPath,omitempty"`
 	ContainerPath        *string             `yaml:"containerPath,omitempty"`
 	ExcludePaths         *[]string           `yaml:"excludePaths,omitempty"`
+	WaitInitialSync      *bool               `yaml:"waitInitialSync,omitempty"`
 	DownloadExcludePaths *[]string           `yaml:"downloadExcludePaths,omitempty"`
 	UploadExcludePaths   *[]string           `yaml:"uploadExcludePaths,omitempty"`
 	BandwidthLimits      *BandwidthLimits    `yaml:"bandwidthLimits,omitempty"`

pkg/devspace/services/sync.go

@@ -40,6 +40,7 @@ func StartSyncFromCmd(client *kubernetes.Clientset, cmdParameter targetselector.
 		containerPath = "."
 	}
 
+	syncDone := make(chan bool)
 	syncConfig := &sync.SyncConfig{
 		Kubectl:      client,
 		Pod:          pod,
@@ -48,15 +49,20 @@ func StartSyncFromCmd(client *kubernetes.Clientset, cmdParameter targetselector.
 		DestPath:     containerPath,
 		ExcludePaths: exclude,
 		CustomLog:    log,
+		SyncDone:     syncDone,
 		Verbose:      false,
 	}
 
 	log.Donef("Sync started on %s <-> %s (Pod: %s/%s)", absLocalPath, containerPath, pod.Namespace, pod.Name)
-	err = syncConfig.Start(true)
+
+	err = syncConfig.Start()
 	if err != nil {
 		log.Fatalf("Sync error: %s", err.Error())
 	}
 
+	// Wait till sync is finished
+	<-syncDone
+
 	return nil
 }
 
@@ -103,13 +109,23 @@ func StartSync(client *kubernetes.Clientset, verboseSync bool, log log.Logger) (
 			containerPath = *syncPath.ContainerPath
 		}
 
+		var upstreamInitialSyncDone chan bool
+		var downstreamInitialSyncDone chan bool
+
+		if syncPath.WaitInitialSync != nil && *syncPath.WaitInitialSync == true {
+			upstreamInitialSyncDone = make(chan bool)
+			downstreamInitialSyncDone = make(chan bool)
+		}
+
 		syncConfig := &sync.SyncConfig{
-			Kubectl:   client,
-			Pod:       pod,
-			Container: container,
-			WatchPath: absLocalPath,
-			DestPath:  containerPath,
-			Verbose:   verboseSync,
+			Kubectl:                   client,
+			Pod:                       pod,
+			Container:                 container,
+			WatchPath:                 absLocalPath,
+			DestPath:                  containerPath,
+			Verbose:                   verboseSync,
+			UpstreamInitialSyncDone:   upstreamInitialSyncDone,
+			DownstreamInitialSyncDone: downstreamInitialSyncDone,
 		}
 
 		if syncPath.ExcludePaths != nil {
@@ -134,12 +150,20 @@ func StartSync(client *kubernetes.Clientset, verboseSync bool, log log.Logger) (
 			}
 		}
 
-		err = syncConfig.Start(false)
+		err = syncConfig.Start()
 		if err != nil {
 			log.Fatalf("Sync error: %s", err.Error())
 		}
 
 		log.Donef("Sync started on %s <-> %s (Pod: %s/%s)", absLocalPath, containerPath, pod.Namespace, pod.Name)
+
+		if syncPath.WaitInitialSync != nil && *syncPath.WaitInitialSync == true {
+			log.StartWait("Sync: waiting for intial sync to complete")
+			<-syncConfig.UpstreamInitialSyncDone
+			<-syncConfig.DownstreamInitialSyncDone
+			log.StopWait()
+		}
+
 		syncConfigs = append(syncConfigs, syncConfig)
 	}
 

pkg/devspace/sync/sync_config.go

@@ -42,7 +42,13 @@ type SyncConfig struct {
 	UpstreamLimit        int64
 	DownstreamLimit      int64
 	Verbose              bool
-	CustomLog            log.Logger
+
+	// These channels can be used to listen for certain sync events
+	DownstreamInitialSyncDone chan bool
+	UpstreamInitialSyncDone   chan bool
+	SyncDone                  chan bool
+
+	CustomLog log.Logger
 
 	fileIndex *fileIndex
 
@@ -158,7 +164,7 @@ func (s *SyncConfig) setup() error {
 }
 
 // Start starts a new sync instance
-func (s *SyncConfig) Start(wait bool) error {
+func (s *SyncConfig) Start() error {
 	err := s.setup()
 	if err != nil {
 		return errors.Trace(err)
@@ -175,11 +181,7 @@ func (s *SyncConfig) Start(wait bool) error {
 		return errors.Trace(err)
 	}
 
-	if wait {
-		s.mainLoop()
-	} else {
-		go s.mainLoop()
-	}
+	go s.mainLoop()
 
 	return nil
 }
@@ -222,7 +224,7 @@ func (s *SyncConfig) mainLoop() {
 	go s.startUpstream()
 
 	// Start downstream and do initial sync
-	func() {
+	go func() {
 		defer s.Stop(nil)
 
 		err := s.initialSync()
@@ -234,6 +236,7 @@ func (s *SyncConfig) mainLoop() {
 		s.Logf("[Sync] Initial sync completed")
 		s.startDownstream()
 	}()
+
 }
 
 func (s *SyncConfig) startUpstream() {
@@ -291,9 +294,14 @@ func (s *SyncConfig) initialSync() error {
 		return errors.Trace(err)
 	}
 
-	if len(localChanges) > 0 {
-		go s.sendChangesToUpstream(localChanges)
-	}
+	// Upstream initial sync
+	go func() {
+		s.sendChangesToUpstream(localChanges)
+
+		if s.UpstreamInitialSyncDone != nil {
+			close(s.UpstreamInitialSyncDone)
+		}
+	}()
 
 	if len(fileMapClone) > 0 {
 		remoteChanges := make([]*fileInformation, 0, len(fileMapClone))
@@ -307,6 +315,10 @@ func (s *SyncConfig) initialSync() error {
 		}
 	}
 
+	if s.DownstreamInitialSyncDone != nil {
+		close(s.DownstreamInitialSyncDone)
+	}
+
 	return nil
 }
 
@@ -485,6 +497,9 @@ func (s *SyncConfig) Stop(fatalError error) {
 		}
 
 		s.Logln("[Sync] Sync stopped")
+		if s.SyncDone != nil {
+			close(s.SyncDone)
+		}
 
 		if fatalError != nil {
 			s.Error(fatalError)