chore: wip: fix render to deploy - DON'T Merge

cmd/skaffold/app/cmd/deploy.go

@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
@@ -47,9 +46,6 @@ func NewCmdDeploy() *cobra.Command {
 
 func doDeploy(ctx context.Context, out io.Writer) error {
 	return withRunner(ctx, out, func(r runner.Runner, configs []util.VersionedConfig) error {
-		if opts.SkipRender {
-			return r.DeployAndLog(ctx, out, []graph.Artifact{})
-		}
 		var artifacts []*latest.Artifact
 		for _, cfg := range configs {
 			artifacts = append(artifacts, cfg.(*latest.SkaffoldConfig).Build.Artifacts...)
@@ -59,7 +55,11 @@ func doDeploy(ctx context.Context, out io.Writer) error {
 			tips.PrintUseRunVsDeploy(out)
 			return err
 		}
-
-		return r.DeployAndLog(ctx, out, buildArtifacts)
+		// Render
+		manifests, errR := r.Render(ctx, out, buildArtifacts, true, opts.RenderOutput)
+		if errR != nil {
+			return errR
+		}
+		return r.DeployAndLog(ctx, out, buildArtifacts, manifests)
 	})
 }

cmd/skaffold/app/cmd/flags.go

@@ -495,7 +495,7 @@ var flagRegistry = []Flag{
 		Value:         &opts.Muted.Phases,
 		DefValue:      []string{},
 		FlagAddMethod: "StringSliceVar",
-		DefinedOn:     []string{"dev", "run", "debug", "build", "deploy"},
+		DefinedOn:     []string{"dev", "run", "debug", "build", "render", "deploy"},
 		IsEnum:        true,
 	},
 	{

cmd/skaffold/app/cmd/render.go

@@ -74,8 +74,8 @@ func doRender(ctx context.Context, out io.Writer) error {
 			}
 		}
 
-		if err := r.Render(ctx, out, bRes, offline, opts.RenderOutput); err != nil {
-			return fmt.Errorf("rendering manifests: %w", err)
+		if _, errR := r.Render(ctx, out, bRes, offline, opts.RenderOutput); errR != nil {
+			return fmt.Errorf("rendering manifests: %w", errR)
 		}
 		return nil
 	})

cmd/skaffold/app/cmd/run.go

@@ -54,7 +54,13 @@ func doRun(ctx context.Context, out io.Writer) error {
 			}
 		}
 
-		err = r.DeployAndLog(ctx, out, bRes)
+		// Render
+		manifestList, err := r.Render(ctx, out, bRes, true, opts.RenderOutput)
+		if err != nil {
+			return err
+		}
+
+		err = r.DeployAndLog(ctx, out, bRes, manifestList)
 		if err != nil {
 			return fmt.Errorf("failed to deploy: %w", err)
 		}

cmd/skaffold/app/cmd/run_test.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
 	runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
@@ -50,6 +51,7 @@ type mockRunRunner struct {
 	runner.Runner
 	testRan            bool
 	deployRan          bool
+	renderRan          bool
 	artifactImageNames []string
 }
 
@@ -71,11 +73,16 @@ func (r *mockRunRunner) Test(context.Context, io.Writer, []graph.Artifact) error
 	return nil
 }
 
-func (r *mockRunRunner) DeployAndLog(context.Context, io.Writer, []graph.Artifact) error {
+func (r *mockRunRunner) DeployAndLog(context.Context, io.Writer, []graph.Artifact, manifest.ManifestList) error {
 	r.deployRan = true
 	return nil
 }
 
+func (r *mockRunRunner) Render(context.Context, io.Writer, []graph.Artifact, bool, string) (manifest.ManifestList, error) {
+	r.renderRan = true
+	return manifest.ManifestList{}, nil
+}
+
 func TestDoRun(t *testing.T) {
 	tests := []struct {
 		description string

docs/content/en/docs/references/cli/_index.md

@@ -955,6 +955,7 @@ Options:
   -l, --label=[]: Add custom labels to deployed objects. Set multiple times for multiple labels
       --loud=false: Show the build logs and output
   -m, --module=[]: Filter Skaffold configs to only the provided named modules
+      --mute-logs=[]: mute logs for specified stages in pipeline (build, deploy, status-check, none, all)
   -n, --namespace='': Run deployments in the specified namespace
       --offline=false: Do not connect to Kubernetes API server for manifest creation and validation. This is helpful when no Kubernetes cluster is available (e.g. GitOps model). No metadata.namespace attribute is injected in this case - the manifest content does not get changed.
   -o, --output='': File to write rendered manifests to
@@ -986,6 +987,7 @@ Env vars:
 * `SKAFFOLD_LABEL` (same as `--label`)
 * `SKAFFOLD_LOUD` (same as `--loud`)
 * `SKAFFOLD_MODULE` (same as `--module`)
+* `SKAFFOLD_MUTE_LOGS` (same as `--mute-logs`)
 * `SKAFFOLD_NAMESPACE` (same as `--namespace`)
 * `SKAFFOLD_OFFLINE` (same as `--offline`)
 * `SKAFFOLD_OUTPUT` (same as `--output`)

examples/microservices/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta28
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   artifacts:
@@ -14,11 +14,10 @@ build:
           alias: BASE
     - image: base
       context: base
-deploy:
-  kubectl:
-    manifests:
-      - leeroy-web/kubernetes/*
-      - leeroy-app/kubernetes/*
+manifests:
+  rawYaml:
+  - leeroy-web/kubernetes/*
+  - leeroy-app/kubernetes/*
 portForward:
   - resourceType: deployment
     resourceName: leeroy-web

integration/render_test.go

@@ -22,18 +22,16 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
-	"path/filepath"
 	"regexp"
 	"testing"
 
 	yaml "gopkg.in/yaml.v2"
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/helm"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/label"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/renderer/kubectl"
 	runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
 	"github.com/GoogleContainerTools/skaffold/testutil"
@@ -78,26 +76,21 @@ spec:
 		tmpDir := t.NewTempDir()
 		tmpDir.Write("deployment.yaml", test.input).Chdir()
 
-		deployer, err := kubectl.NewDeployer(&runcontext.RunContext{
-			WorkingDir: ".",
-			Pipelines: runcontext.NewPipelines([]latest.Pipeline{{
-				Render: latest.RenderConfig{
-					Generate: latest.Generate{
-						RawK8s: []string{"deployment.yaml"}},
-				},
-			}}),
-		}, &label.DefaultLabeller{}, &latest.KubectlDeploy{
-			Manifests: []string{"deployment.yaml"},
-		}, filepath.Join(tmpDir.Root(), test.renderPath))
+		mockCfg := mockConfig{
+			renderConfig: &latest.RenderConfig{
+				Generate: latest.Generate{
+					RawK8s: []string{"deployment.yaml"}},
+			},
+			workingDir: tmpDir.Root(),
+		}
+		r, err := kubectl.New(mockCfg, map[string]string{})
 		t.RequireNoError(err)
 		var b bytes.Buffer
-		err = deployer.Render(context.Background(), &b, test.builds, false, test.renderPath)
+		l, err := r.Render(context.Background(), &b, test.builds, false, test.renderPath)
 
-		t.CheckNoError(err)
-		dat, err := ioutil.ReadFile(test.renderPath)
 		t.CheckNoError(err)
 
-		t.CheckDeepEqual(test.expectedOut, string(dat))
+		t.CheckDeepEqual(test.expectedOut, l.String())
 	})
 }
 
@@ -228,28 +221,24 @@ spec:
 	}
 	for _, test := range tests {
 		testutil.Run(t, test.description, func(t *testutil.T) {
-			t.NewTempDir().
-				Write("deployment.yaml", test.input).
+			tmpDir := t.NewTempDir()
+			tmpDir.Write("deployment.yaml", test.input).
 				Chdir()
 
-			deployer, err := kubectl.NewDeployer(&runcontext.RunContext{
-				WorkingDir: ".",
-				Pipelines: runcontext.NewPipelines([]latest.Pipeline{{
-					Render: latest.RenderConfig{
-						Generate: latest.Generate{
-							RawK8s: []string{"deployment.yaml"}},
-					},
-				}}),
-				Opts: config.SkaffoldOptions{},
-			}, &label.DefaultLabeller{}, &latest.KubectlDeploy{
-				Manifests: []string{"deployment.yaml"},
-			}, "")
+			mockCfg := mockConfig{
+				renderConfig: &latest.RenderConfig{
+					Generate: latest.Generate{
+						RawK8s: []string{"deployment.yaml"}},
+				},
+				workingDir: tmpDir.Root(),
+			}
+			r, err := kubectl.New(mockCfg, map[string]string{})
 			t.RequireNoError(err)
 			var b bytes.Buffer
-			err = deployer.Render(context.Background(), &b, test.builds, false, "")
+			l, err := r.Render(context.Background(), &b, test.builds, false, "")
 
 			t.CheckNoError(err)
-			t.CheckDeepEqual(test.expectedOut, b.String())
+			t.CheckDeepEqual(test.expectedOut, l.String())
 		})
 	}
 }
@@ -772,3 +761,14 @@ spec:
 		})
 	}
 }
+
+type mockConfig struct {
+	renderConfig *latest.RenderConfig
+	workingDir   string
+}
+
+func (mc mockConfig) GetRenderConfig() *latest.RenderConfig       { return mc.renderConfig }
+func (mc mockConfig) GetWorkingDir() string                       { return mc.workingDir }
+func (mc mockConfig) TransformAllowList() []latest.ResourceFilter { return nil }
+func (mc mockConfig) TransformDenyList() []latest.ResourceFilter  { return nil }
+func (mc mockConfig) TransformRulesFile() string                  { return "" }

pkg/skaffold/config/types.go

@@ -163,6 +163,7 @@ func NewIntOrUndefined(v *int) IntOrUndefined {
 }
 
 func (m Muted) MuteBuild() bool       { return m.mute("build") }
+func (m Muted) MuteRender() bool      { return m.mute("render") }
 func (m Muted) MuteTest() bool        { return m.mute("test") }
 func (m Muted) MuteStatusCheck() bool { return m.mute("status-check") }
 func (m Muted) MuteDeploy() bool      { return m.mute("deploy") }

pkg/skaffold/deploy/deploy.go

@@ -23,6 +23,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/access"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/debug"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/log"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/status"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/sync"
@@ -33,7 +34,7 @@ import (
 type Deployer interface {
 	// Deploy should ensure that the build results are deployed to the Kubernetes
 	// cluster.
-	Deploy(context.Context, io.Writer, []graph.Artifact) error
+	Deploy(context.Context, io.Writer, []graph.Artifact, manifest.ManifestList) error
 
 	// Dependencies returns a list of files that the deployer depends on.
 	// In dev mode, a redeploy will be triggered
@@ -42,10 +43,6 @@ type Deployer interface {
 	// Cleanup deletes what was deployed by calling Deploy.
 	Cleanup(context.Context, io.Writer, bool) error
 
-	// Render generates the Kubernetes manifests replacing the build results and
-	// writes them to the given file path
-	Render(context.Context, io.Writer, []graph.Artifact, bool, string) error
-
 	// GetDebugger returns a Deployer's implementation of a Debugger
 	GetDebugger() debug.Debugger
 

pkg/skaffold/deploy/deploy_mux.go

@@ -17,11 +17,9 @@ limitations under the License.
 package deploy
 
 import (
-	"bytes"
 	"context"
 	"io"
 	"strconv"
-	"strings"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/access"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
@@ -105,7 +103,7 @@ func (m DeployerMux) RegisterLocalImages(images []graph.Artifact) {
 	}
 }
 
-func (m DeployerMux) Deploy(ctx context.Context, w io.Writer, as []graph.Artifact) error {
+func (m DeployerMux) Deploy(ctx context.Context, w io.Writer, as []graph.Artifact, l manifest.ManifestList) error {
 	for i, deployer := range m.deployers {
 		eventV2.DeployInProgress(i)
 		w, ctx = output.WithEventContext(ctx, w, constants.Deploy, strconv.Itoa(i))
@@ -120,7 +118,7 @@ func (m DeployerMux) Deploy(ctx context.Context, w io.Writer, as []graph.Artifac
 				return err
 			}
 		}
-		if err := deployer.Deploy(ctx, w, as); err != nil {
+		if err := deployer.Deploy(ctx, w, as, l); err != nil {
 			eventV2.DeployFailed(i, err)
 			endTrace(instrumentation.TraceEndError(err))
 			return err
@@ -172,22 +170,22 @@ func (m DeployerMux) Cleanup(ctx context.Context, w io.Writer, dryRun bool) erro
 	return nil
 }
 
-func (m DeployerMux) Render(ctx context.Context, w io.Writer, as []graph.Artifact, offline bool, filepath string) error {
-	resources, buf := []string{}, &bytes.Buffer{}
-	for _, deployer := range m.deployers {
-		ctx, endTrace := instrumentation.StartTrace(ctx, "Render")
-		buf.Reset()
-		if err := deployer.Render(ctx, buf, as, offline, "" /* never write to files */); err != nil {
-			endTrace(instrumentation.TraceEndError(err))
-			return err
-		}
-		resources = append(resources, buf.String())
-		endTrace()
-	}
-
-	allResources := strings.Join(resources, "\n---\n")
-	return manifest.Write(strings.TrimSpace(allResources), filepath, w)
-}
+//func (m DeployerMux) Render(ctx context.Context, w io.Writer, as []graph.Artifact, offline bool, filepath string) error {
+//	resources, buf := []string{}, &bytes.Buffer{}
+//	for _, deployer := range m.deployers {
+//		ctx, endTrace := instrumentation.StartTrace(ctx, "Render")
+//		buf.Reset()
+//		if err := deployer.Render(ctx, buf, as, offline, "" /* never write to files */); err != nil {
+//			endTrace(instrumentation.TraceEndError(err))
+//			return err
+//		}
+//		resources = append(resources, buf.String())
+//		endTrace()
+//	}
+//
+//	allResources := strings.Join(resources, "\n---\n")
+//	return manifest.Write(strings.TrimSpace(allResources), filepath, w)
+//}
 
 // TrackBuildArtifacts should *only* be called on individual deployers. This is a noop.
 func (m DeployerMux) TrackBuildArtifacts(_ []graph.Artifact) {}