rebase on v1alpha4 config

GoogleContainerTools · Oct 3, 2018 · d344b05 · d344b05
1 parent 9df67bb
commit d344b05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/cmd/skaffold/app/cmd/fix.go b/cmd/skaffold/app/cmd/fix.go
@@ -22,12 +22,13 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	schemautil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
+
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	yaml "gopkg.in/yaml.v2"
-	"k8s.io/client-go/tools/clientcmd/api/latest"
 )
 
 func NewCmdFix(out io.Writer) *cobra.Command {

diff --git a/integration/examples/hot-reload/skaffold.yaml b/integration/examples/hot-reload/skaffold.yaml
@@ -2,12 +2,12 @@ apiVersion: skaffold/v1alpha4
 kind: Config
 build:
   artifacts:
-  - imageName: gcr.io/k8s-skaffold/node-example
-    workspace: node
+  - image: gcr.io/k8s-skaffold/node-example
+    context: node
     sync:
       '*.js': .
-  - imageName: gcr.io/k8s-skaffold/python-reload
-    workspace: python
+  - image: gcr.io/k8s-skaffold/python-reload
+    context: python
     sync:
       '*.py': .
 deploy:

diff --git a/pkg/skaffold/sync/sync.go b/pkg/skaffold/sync/sync.go
@@ -21,8 +21,8 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/watch"
 	"github.com/pkg/errors"