Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GoogleContainerTools/skaffold
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cd198c66e0ee89cb692719800b16000594b7300e
Choose a base ref
..
head repository: GoogleContainerTools/skaffold
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa09298fde43eebee22d088fb63ef9de3746aa4e
Choose a head ref
Showing with 9 additions and 9 deletions.
  1. +1 −2 pkg/skaffold/render/renderer/kpt/kpt_test.go
  2. +8 −7 pkg/skaffold/runner/v2/runner_test.go
3 changes: 1 addition & 2 deletions pkg/skaffold/render/renderer/kpt/kpt_test.go
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/kptfile"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/renderer"
rUtil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/renderer/util"
latestV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v2"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
@@ -233,7 +232,7 @@ inventory:
tmpDirObj.Write("pod.yaml", podYaml).
Write(filepath.Join(constants.DefaultHydrationDir, kptfile.KptFileName), test.originalKptfile).
Chdir()
r, err := renderer.New(&latestV2.RenderConfig{
r, err := New(&latestV2.RenderConfig{
Generate: latestV2.Generate{RawK8s: []string{"pod.yaml"}},
Validate: &[]latestV2.Validator{{Name: "kubeval"}}}, tmpDirObj.Root(),
filepath.Join(tmpDirObj.Root(), constants.DefaultHydrationDir), map[string]string{})
15 changes: 8 additions & 7 deletions pkg/skaffold/runner/v2/runner_test.go
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ import (
"io"
"testing"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/renderer"
"github.com/blang/semver"
"k8s.io/client-go/tools/clientcmd/api"

@@ -39,7 +40,7 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/log"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/generate"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/renderer"
kRenderer "github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/renderer/kubectl"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
v2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/defaults"
@@ -367,7 +368,7 @@ func TestNewForConfig(t *testing.T) {
},
},
expectedTester: &test.FullTester{},
expectedRenderer: &renderer.SkaffoldRenderer{},
expectedRenderer: &kRenderer.Kubectl{},
expectedDeployer: &kubectl.Deployer{},
},
{
@@ -386,7 +387,7 @@ func TestNewForConfig(t *testing.T) {
},
},
expectedTester: &test.FullTester{},
expectedRenderer: &renderer.SkaffoldRenderer{},
expectedRenderer: &kRenderer.Kubectl{},
expectedDeployer: &kubectl.Deployer{},
},
{
@@ -405,7 +406,7 @@ func TestNewForConfig(t *testing.T) {
},
},
expectedTester: &test.FullTester{},
expectedRenderer: &renderer.SkaffoldRenderer{},
expectedRenderer: &kRenderer.Kubectl{},
expectedDeployer: &kubectl.Deployer{},
},
{
@@ -430,7 +431,7 @@ func TestNewForConfig(t *testing.T) {
pipeline: latestV2.Pipeline{},
shouldErr: true,
expectedTester: &test.FullTester{},
expectedRenderer: &renderer.SkaffoldRenderer{},
expectedRenderer: &kRenderer.Kubectl{},
expectedDeployer: &kubectl.Deployer{},
},
{
@@ -449,7 +450,7 @@ func TestNewForConfig(t *testing.T) {
},
},
expectedTester: &test.FullTester{},
expectedRenderer: &renderer.SkaffoldRenderer{},
expectedRenderer: &kRenderer.Kubectl{},
expectedDeployer: &kubectl.Deployer{},
cacheArtifacts: true,
},
@@ -472,7 +473,7 @@ func TestNewForConfig(t *testing.T) {
},
},
expectedTester: &test.FullTester{},
expectedRenderer: &renderer.SkaffoldRenderer{
expectedRenderer: &kRenderer.Kubectl{
Generator: generate.Generator{},
},
expectedDeployer: &kubectl.Deployer{},