fix(controller): always pass credentials to kargo render #1696
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Kent Rancourt <[email protected]>
krancour
changed the title
✅ Deploy Preview for docs-kargo-akuity-io canceled.
|
krancour
commented
Mar 27, 2024
| @@ -103,7 +103,7 @@ CMD ["pnpm", "dev"] | |||
| # - the official image we publish | |||
| # - purposefully last so that it is the default target when building | |||
| #################################################################################################### | |||
| FROM ghcr.io/akuity/kargo-render:v0.1.0-rc.38 as final | |||
| FROM ghcr.io/akuity/kargo-render:v0.1.0-rc.39 as final | |||
There was a problem hiding this comment.
This fixes a bug where Kargo render sometimes pushed a new, empty target branch to the remote even when instructed not to commit anything.
krancour
commented
Mar 27, 2024
Comment on lines
+65
to
+77
| "--repo-username", | ||
| req.RepoCreds.Username, | ||
| "--output", | ||
| "json", | ||
| } | ||
| for _, image := range req.Images { | ||
| cmdTokens = append(cmdTokens, "--image", image) | ||
| } | ||
| cmd := exec.Command(cmdTokens[0], cmdTokens[1:]...) // nolint: gosec | ||
| cmd.Env = append( | ||
| os.Environ(), | ||
| fmt.Sprintf("KARGO_RENDER_REPO_PASSWORD=%s", req.RepoCreds.Password), | ||
| ) |
There was a problem hiding this comment.
One of two key changes. Most everything else is just updates to function signatures to get these creds down to here.
krancour
commented
Mar 27, 2024
| @@ -97,6 +99,7 @@ func (r *renderer) apply( | |||
| Images: images, | |||
| LocalInPath: workingDir, | |||
| LocalOutPath: writeDir, | |||
| RepoCreds: repoCreds, | |||
There was a problem hiding this comment.
One of two key changes. Most everything else is just updates to function signatures to get these creds down to here.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1696 +/- ##
==========================================
- Coverage 43.93% 43.92% -0.02%
==========================================
Files 203 203
Lines 13061 13070 +9
==========================================
+ Hits 5739 5741 +2
- Misses 7075 7082 +7
Partials 247 247 ☔ View full report in Codecov by Sentry. |
hiddeco
approved these changes
Mar 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prior to #1674 we did always pass credentials to Kargo Render. We stopped because Kargo proper now handles all the checking out and committing -- or so I thought...
I had forgotten that Kargo Render will, even if given a local repo that is already checked out to the correct source commit, check if the target branch exists remotely and attempt to pull from it. It does this because it wants up-to-date metadata from the target branch, if it exists.