Merge pull request #2335 from tejal29/refactor

Move default labeller to deploy since it used in deployer.
GoogleContainerTools · Jun 26, 2019 · 970e278 · 970e278
2 parents c40a02b + 6fd1d7a
commit 970e278
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/skaffold/runner/labeller.go → pkg/skaffold/deploy/labeller.go b/pkg/skaffold/runner/labeller.go → pkg/skaffold/deploy/labeller.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package runner
+package deploy
 
 import (
 	"fmt"

diff --git a/pkg/skaffold/runner/labeller_test.go → pkg/skaffold/deploy/labeller_test.go b/pkg/skaffold/runner/labeller_test.go → pkg/skaffold/deploy/labeller_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package runner
+package deploy
 
 import (
 	"testing"

diff --git a/pkg/skaffold/runner/runner.go b/pkg/skaffold/runner/runner.go
@@ -71,7 +71,7 @@ type SkaffoldRunner struct {
 	cache             *cache.Cache
 	runCtx            *runcontext.RunContext
 	labellers         []deploy.Labeller
-	defaultLabeller   *DefaultLabeller
+	defaultLabeller   *deploy.DefaultLabeller
 	builds            []build.Artifact
 	hasBuilt          bool
 	hasDeployed       bool
@@ -104,7 +104,7 @@ func NewForConfig(opts *config.SkaffoldOptions, cfg *latest.SkaffoldConfig) (*Sk
 		return nil, errors.Wrap(err, "parsing deploy config")
 	}
 
-	defaultLabeller := NewLabeller("")
+	defaultLabeller := deploy.NewLabeller("")
 	labellers := []deploy.Labeller{opts, builder, deployer, tagger, defaultLabeller}
 
 	builder, tester, deployer = WithTimings(builder, tester, deployer, opts.CacheArtifacts)