Skip to content

fix: new condition to create hydrate-dir only if a kpt renderer or deployer#8117

Merged
aaron-prindle merged 6 commits into
GoogleContainerTools:mainfrom
renzodavid9:issue-8041
Nov 28, 2022
Merged

fix: new condition to create hydrate-dir only if a kpt renderer or deployer#8117
aaron-prindle merged 6 commits into
GoogleContainerTools:mainfrom
renzodavid9:issue-8041

Conversation

@renzodavid9

@renzodavid9 renzodavid9 commented Nov 18, 2022

Copy link
Copy Markdown
Contributor

Fixes: #8041

Description
This PR adds an extra condition before creating the hydration-dir, so it is created only when kpt is used (as renderer, deployer, or both).

@codecov

codecov Bot commented Nov 18, 2022

Copy link
Copy Markdown

Codecov Report

Merging #8117 (02bd220) into main (290280e) will decrease coverage by 4.26%.
The diff coverage is 53.26%.

❗ Current head 02bd220 differs from pull request most recent head de94ba1. Consider uploading reports for the commit de94ba1 to get more accurate results

@@            Coverage Diff             @@
##             main    #8117      +/-   ##
==========================================
- Coverage   70.48%   66.22%   -4.27%     
==========================================
  Files         515      599      +84     
  Lines       23150    29339    +6189     
==========================================
+ Hits        16317    19429    +3112     
- Misses       5776     8453    +2677     
- Partials     1057     1457     +400     
Impacted Files Coverage Δ
cmd/skaffold/app/cmd/completion.go 13.04% <0.00%> (-1.25%) ⬇️
cmd/skaffold/app/cmd/credits/export.go 0.00% <0.00%> (ø)
cmd/skaffold/app/cmd/deploy.go 40.90% <0.00%> (-12.94%) ⬇️
cmd/skaffold/app/cmd/test.go 44.44% <0.00%> (ø)
cmd/skaffold/app/exitcode.go 100.00% <ø> (+6.66%) ⬆️
cmd/skaffold/skaffold.go 0.00% <0.00%> (ø)
cmd/skaffold/app/cmd/inspect_tests.go 62.50% <14.28%> (-1.14%) ⬇️
cmd/skaffold/app/cmd/render.go 35.48% <18.18%> (-5.90%) ⬇️
cmd/skaffold/app/cmd/lsp.go 28.12% <28.12%> (ø)
cmd/skaffold/app/cmd/run.go 64.28% <33.33%> (-9.63%) ⬇️
... and 394 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@pull-request-size pull-request-size Bot added size/L and removed size/M labels Nov 18, 2022
@renzodavid9 renzodavid9 force-pushed the issue-8041 branch 5 times, most recently from 89793c4 to b08ed24 Compare November 22, 2022 20:39
@renzodavid9 renzodavid9 requested review from a team and tejal29 and removed request for a team November 23, 2022 14:45
@renzodavid9 renzodavid9 marked this pull request as ready for review November 23, 2022 16:29
return false, schema.GroupVersionResource{}, fmt.Errorf("could not find resource for %s", gvk.String())
}

func GetManifestsFromHydrationDir(ctx context.Context, opts config.SkaffoldOptions) (manifest.ManifestList, error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@aaron-prindle aaron-prindle left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@aaron-prindle aaron-prindle merged commit 97b1c48 into GoogleContainerTools:main Nov 28, 2022
aaron-prindle pushed a commit to aaron-prindle/skaffold that referenced this pull request Dec 20, 2022
…ployer (GoogleContainerTools#8117)

* fix: new condition to create hydrate-dir only if a kpt renderer or deployer is used + remove not used function

* test: add integration test for new condition about hydration directory creation

* test: mark integration test to run on GCP

* feat: install kpt for linux integration tests

* fix: making kpt hydration folder tests to run without GCP again

* fix: integration-linux.yaml template for kpt installation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants