Skip to content

Commit

Permalink
fix integration test
Browse files Browse the repository at this point in the history
  • Loading branch information
tejal29 committed Aug 3, 2022
1 parent 693610c commit 97d3d3d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 0 additions & 2 deletions pkg/skaffold/runner/deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions pkg/skaffold/schema/defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package defaults
import (
"context"
"fmt"

"github.com/google/uuid"
"github.com/mitchellh/go-homedir"

Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 97d3d3d

Please sign in to comment.