From 97d3d3dc09f33c58fa1f5f8a4ffae8f70f41e555 Mon Sep 17 00:00:00 2001 From: tejal29 Date: Wed, 3 Aug 2022 08:54:28 -0700 Subject: [PATCH] fix integration test --- pkg/skaffold/runner/deployer.go | 2 -- pkg/skaffold/schema/defaults/defaults.go | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/skaffold/runner/deployer.go b/pkg/skaffold/runner/deployer.go index cba190ec274..828a72aba2f 100644 --- a/pkg/skaffold/runner/deployer.go +++ b/pkg/skaffold/runner/deployer.go @@ -202,8 +202,6 @@ The default deployer will honor a select set of deploy configuration from an exi - deploy.Logs.Prefix - deploy.Kubectl.Flags - deploy.Kubectl.DefaultNamespace - - deploy.Kustomize.Flags - - deploy.Kustomize.DefaultNamespace For a multi-config project, we do not currently support resolving conflicts between differing sets of this deploy configuration. Therefore, in this function we do implicit validation of the provided configuration, and fail if any conflict cannot be resolved. diff --git a/pkg/skaffold/schema/defaults/defaults.go b/pkg/skaffold/schema/defaults/defaults.go index 86be8c73fe4..d61829058cd 100644 --- a/pkg/skaffold/schema/defaults/defaults.go +++ b/pkg/skaffold/schema/defaults/defaults.go @@ -19,7 +19,7 @@ package defaults import ( "context" "fmt" - + "github.com/google/uuid" "github.com/mitchellh/go-homedir" @@ -135,7 +135,6 @@ func SetDefaultRenderer(c *latest.SkaffoldConfig) { } // Set default manifests to "k8s/*.yaml", same as v1. c.Render.Generate.RawK8s = constants.DefaultKubectlManifests - c.Deploy.KubectlDeploy = &latest.KubectlDeploy{} } // SetDefaultDeployer adds a default kubectl deploy configuration.