Rewrite image update step to be a simple loop and fix small Helm bug #1711
Conversation
This file contains hidden or 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
# Conflicts: # source/Calamari.Tests/ArgoCD/Commands/Conventions/UpdateArgoCDAppImagesInstallConventionHelmTests.cs # source/Calamari.Tests/ArgoCD/Commands/Conventions/UpdateArgoCDAppImagesInstallConventionTest.cs # source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
flin-8
changed the title
rain-on
reviewed
Jan 14, 2026
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Show resolved
Hide resolved
|
|
||
| var sourceResults = applicationFromYaml.GetSourcesWithMetadata() | ||
| .Select(applicationSource => | ||
| ProcessSource(applicationSource, |
Contributor
There was a problem hiding this comment.
it feels like a smell that we need to pass in application and applicationFromYaml - are these not related under and umbrella type?
Note: this could be done as a separate refactoring.
It alsmost feels like Appllication/AppliactionFromYaml/GitCredentials/RepositoryFactory is a 'Context' - i.e. they're all either providers or factories.
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Outdated
Show resolved
Hide resolved
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Outdated
Show resolved
Hide resolved
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Outdated
Show resolved
Hide resolved
|
|
||
| using (var repository = CreateRepository(gitCredentials, applicationSource, repositoryFactory)) | ||
| { | ||
| foreach (var valuesFileSource in helmTargetsForRefSource.Targets) |
Contributor
There was a problem hiding this comment.
will this include the default values.yaml? (i.e. if no values files exist, I think helm always looks at the default.
Contributor
Author
There was a problem hiding this comment.
This is the ref source. I know we need to include the default values.yml where the chart is, but we do need to do that for the ref?
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Outdated
Show resolved
Hide resolved
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Outdated
Show resolved
Hide resolved
rain-on
reviewed
Jan 14, 2026
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Outdated
Show resolved
Hide resolved
# Conflicts: # source/Calamari.Tests/ArgoCD/Helm/HelmValuesFileUpdateTargetParserTests.cs
rain-on
reviewed
Jan 15, 2026
Contributor
rain-on
left a comment
rain-on
left a comment
There was a problem hiding this comment.
I've only reviewed the files with comments - so will come back around to the rest later.
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Outdated
Show resolved
Hide resolved
source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Show resolved
Hide resolved
rain-on
reviewed
Jan 15, 2026
source/Calamari/ArgoCD/Conventions/UpdateArgoCDApplicationManifestsInstallConvention.cs
Show resolved
Hide resolved
source/Calamari/ArgoCD/Conventions/UpdateArgoCDApplicationManifestsInstallConvention.cs
Outdated
Show resolved
Hide resolved
source/Calamari/ArgoCD/Conventions/UpdateArgoCDApplicationManifestsInstallConvention.cs
Outdated
Show resolved
Hide resolved
source/Calamari/ArgoCD/Conventions/UpdateArgoCDApplicationManifestsInstallConvention.cs
Outdated
Show resolved
Hide resolved
source/Calamari/ArgoCD/Helm/HelmValuesFileUpdateTargetParser.cs
Outdated
Show resolved
Hide resolved
# Conflicts: # source/Calamari.Tests/ArgoCD/Commands/Conventions/ArgoCDApplicationBuilder.cs # source/Calamari.Tests/ArgoCD/Commands/Conventions/UpdateArgoCDAppImagesInstallConventionHelmTests.cs # source/Calamari.Tests/ArgoCD/Commands/Conventions/UpdateArgoCDAppImagesInstallConventionTest.cs # source/Calamari/ArgoCD/Conventions/UpdateArgoCDAppImagesInstallConvention.cs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Refactor the Argo CD image update step to be a simple loop that iterates over the sources.
Also fixes a small bug where the default
values.yamlisn't updated if it's not in the HelmvalueFileslist - OctopusDeploy/Issues#9825Diagram: https://whimsical.com/argocd-step-process-flows-WgXQKEM27ouNoJA4H4Gcer