[V3] (part 1) Change runner/v3 to runner/v2. Update v3 flag to v2

GoogleContainerTools · May 5, 2021 · e489532 · e489532
1 parent b1fa526
commit e489532
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/cmd/skaffold/app/cmd/flags.go b/cmd/skaffold/app/cmd/flags.go
@@ -528,8 +528,8 @@ var flagRegistry = []Flag{
 		DefinedOn:     []string{"dev", "build", "run", "debug", "deploy"},
 	},
 	{
-		Name:          "v3",
-		Usage:         "Next skaffold config (v3). Use kpt to render/hydrate and deploy manifests.",
+		Name:          "v2",
+		Usage:         "Next skaffold config (v2). Use kpt to render/hydrate and deploy manifests.",
 		Value:         &opts.Experimental,
 		DefValue:      false,
 		FlagAddMethod: "BoolVar",

diff --git a/pkg/skaffold/runner/v3/apply.go → pkg/skaffold/runner/v2/apply.go b/pkg/skaffold/runner/v3/apply.go → pkg/skaffold/runner/v2/apply.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package v3
+package v2
 
 import (
 	"context"
@@ -22,5 +22,5 @@ import (
 )
 
 func (r *SkaffoldRunner) Apply(ctx context.Context, out io.Writer) error {
-	return fmt.Errorf("not implemented error: SkaffoldRunner(v3).Apply")
+	return fmt.Errorf("not implemented error: SkaffoldRunner(v2).Apply")
 }
diff --git a/pkg/skaffold/runner/v3/cleanup.go → pkg/skaffold/runner/v2/cleanup.go b/pkg/skaffold/runner/v3/cleanup.go → pkg/skaffold/runner/v2/cleanup.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package v3
+package v2
 
 import (
 	"context"
@@ -22,5 +22,5 @@ import (
 )
 
 func (r *SkaffoldRunner) Cleanup(ctx context.Context, out io.Writer) error {
-	return fmt.Errorf("not implemented error: SkaffoldRunner(v3).Cleanup")
+	return fmt.Errorf("not implemented error: SkaffoldRunner(v2).Cleanup")
 }
diff --git a/pkg/skaffold/runner/v3/deploy.go → pkg/skaffold/runner/v2/deploy.go b/pkg/skaffold/runner/v3/deploy.go → pkg/skaffold/runner/v2/deploy.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package v3
+package v2
 
 import (
 	"context"
@@ -24,5 +24,5 @@ import (
 )
 
 func (r *SkaffoldRunner) Deploy(ctx context.Context, out io.Writer, artifacts []graph.Artifact) error {
-	return fmt.Errorf("not implemented error: SkaffoldRunner(v3).Deploy")
+	return fmt.Errorf("not implemented error: SkaffoldRunner(v2).Deploy")
 }
diff --git a/pkg/skaffold/runner/v3/dev.go → pkg/skaffold/runner/v2/dev.go b/pkg/skaffold/runner/v3/dev.go → pkg/skaffold/runner/v2/dev.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package v3
+package v2
 
 import (
 	"context"
@@ -24,5 +24,5 @@ import (
 )
 
 func (r *SkaffoldRunner) Dev(ctx context.Context, out io.Writer, artifacts []*latest_v1.Artifact) error {
-	return fmt.Errorf("not implemented error: SkaffoldRunner(v3).Dev")
+	return fmt.Errorf("not implemented error: SkaffoldRunner(v2).Dev")
 }
diff --git a/pkg/skaffold/runner/v3/generate_pipeline.go → pkg/skaffold/runner/v2/generate_pipeline.go b/pkg/skaffold/runner/v3/generate_pipeline.go → pkg/skaffold/runner/v2/generate_pipeline.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package v3
+package v2
 
 import (
 	"context"
@@ -24,5 +24,5 @@ import (
 )
 
 func (r *SkaffoldRunner) GeneratePipeline(ctx context.Context, out io.Writer, configs []*latest_v1.SkaffoldConfig, configPaths []string, fileOut string) error {
-	return fmt.Errorf("not implemented error: SkaffoldRunner(v3).GeneratePipeline")
+	return fmt.Errorf("not implemented error: SkaffoldRunner(v2).GeneratePipeline")
 }
diff --git a/pkg/skaffold/runner/v3/render.go → pkg/skaffold/runner/v2/render.go b/pkg/skaffold/runner/v3/render.go → pkg/skaffold/runner/v2/render.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package v3
+package v2
 
 import (
 	"context"
@@ -24,5 +24,5 @@ import (
 )
 
 func (r *SkaffoldRunner) Render(ctx context.Context, out io.Writer, builds []graph.Artifact, offline bool, filepath string) error {
-	return fmt.Errorf("not implemented error: SkaffoldRunner(v3).Dev")
+	return fmt.Errorf("not implemented error: SkaffoldRunner(v2).Dev")
 }
diff --git a/pkg/skaffold/runner/v3/runner.go → pkg/skaffold/runner/v2/runner.go b/pkg/skaffold/runner/v3/runner.go → pkg/skaffold/runner/v2/runner.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package v3
+package v2
 
 import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"