Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fix render and deploy when using kustomize and helm deployer. #7723

Merged
merged 14 commits into from
Aug 3, 2022

Conversation

tejal29
Copy link
Contributor

@tejal29 tejal29 commented Aug 2, 2022

In this PR,

Completely addressing the issue #7675 to support backward compatibility.

Changes in this PR

  • If Raw manifests are defined, even if kubectl deployer is not set add it. e.g.
manifests:
  rawYaml:
  - frontend/k8s/*.yaml
deploy:
      helm:
        releases:
        - name: backend
          chartPath: backend

In the above example, skaffold was configured to deploy helm charts. The frontend k8s manifests were rendered but never deployed.

  • When running skaffold render with legacy helm deploy stanza, force helm rendering.
    In the above same config, only kubectl manifests were rendered with skaffold render. This behavior is backward incompatible.

=== TODO

  1. follow up if removing duplicates render.helm.releases and deploy.helm.release makes sense. @marlon-gamez discussed before it could be confusing to remove these duplicated fields.

@codecov
Copy link

codecov bot commented Aug 2, 2022

Codecov Report

Merging #7723 (20c382e) into main (290280e) will decrease coverage by 3.87%.
The diff coverage is 53.59%.

@@            Coverage Diff             @@
##             main    #7723      +/-   ##
==========================================
- Coverage   70.48%   66.61%   -3.88%     
==========================================
  Files         515      587      +72     
  Lines       23150    28239    +5089     
==========================================
+ Hits        16317    18811    +2494     
- Misses       5776     8051    +2275     
- Partials     1057     1377     +320     
Impacted Files Coverage Δ
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/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%) ⬇️
cmd/skaffold/app/cmd/fix.go 56.41% <37.50%> (-20.07%) ⬇️
cmd/skaffold/app/cmd/verify.go 41.17% <41.17%> (ø)
... and 344 more

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@aaron-prindle
Copy link
Contributor

Seems there is a test error atm:

    --- FAIL: TestRun/multiple_renderers_mixed_in#01 (3.37s)

also a small lint error related to a newline

@tejal29
Copy link
Contributor Author

tejal29 commented Aug 3, 2022

fixed it. Some bad rebasing.

Copy link
Contributor

@aaron-prindle aaron-prindle left a comment

Choose a reason for hiding this comment

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

LGTM!

@tejal29 tejal29 enabled auto-merge (squash) August 3, 2022 16:16
@tejal29 tejal29 merged commit 06ded12 into GoogleContainerTools:main Aug 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants