Skip to content

feat(argocd): expose --force-conflicts, --values, and --repo flags with OCI support#455

Merged
schrodit merged 2 commits into
mainfrom
argo-value-files
May 28, 2026
Merged

feat(argocd): expose --force-conflicts, --values, and --repo flags with OCI support#455
schrodit merged 2 commits into
mainfrom
argo-value-files

Conversation

@schrodit

Copy link
Copy Markdown
Member
  • Add InstallChartOptions struct with ForceConflicts field to the HelmClient interface
  • Replace hardcoded ForceConflicts=true in UpgradeChart with a configurable option
  • Propagate ForceConflicts through install and upgrade paths in the ArgoCD installer
  • Add --force-conflicts and --values/-f flags to the argocd CLI command
  • Add --repo flag to configure the Helm chart repository (HTTP or OCI)
  • Auto-detect OCI repos (oci:// prefix) and build the full chart reference accordingly

@schrodit schrodit self-assigned this May 27, 2026
…th OCI support

- Add InstallChartOptions struct with ForceConflicts field to the HelmClient interface
- Replace hardcoded ForceConflicts=true in UpgradeChart with a configurable option
- Propagate ForceConflicts through install and upgrade paths in the ArgoCD installer
- Add --force-conflicts and --values/-f flags to the argocd CLI command
- Add --repo flag to configure the Helm chart repository (HTTP or OCI)
- Auto-detect OCI repos (oci:// prefix) and build the full chart reference accordingly

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Tim Schrodi <tim@codesphere.com>
@schrodit schrodit force-pushed the argo-value-files branch from fc9b987 to 0282c3e Compare May 27, 2026 17:26

@OliverTrautvetter OliverTrautvetter left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Some comments, looks good in general 👍

Comment thread internal/installer/helm_client.go
Comment thread internal/installer/argocd.go
Comment thread internal/installer/argocd.go Outdated
Comment thread cli/cmd/argocd.go
Comment thread internal/installer/argocd_test.go
Signed-off-by: Tim Schrodi <tim@codesphere.com>

@OliverTrautvetter OliverTrautvetter left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lgtm 🚀

@schrodit schrodit merged commit 1d38314 into main May 28, 2026
6 checks passed
@schrodit schrodit deleted the argo-value-files branch May 28, 2026 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants