fix: configurable gitops branch for argocd-image-updater#3049
Merged
Conversation
Contributor
|
Comparison of Helm chart templating output: @@ data.branch @@
! ± value change
- main
+ test-branch
@@ data.GIT_BRANCH @@
! ± value change
- main
+ test-branch
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-admin-crossplane-custom-namespace
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-admin-crossplane-team-namespace
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-admin-wa1
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-admin-wa2
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources.env/teams/admin/sealedsecrets.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/admin/knowledgebases.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/admin/databases.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/admin/agents.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-demo-wd
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-demo-wd1
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-demo-wd2
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources @@
# argoproj.io/v1alpha1/Application/argocd/team-demo-wd3
! - one list entry removed:
- - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
- targetRevision: main
- ref: values
! + one list entry added:
+ - repoURL: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ targetRevision: test-branch
+ ref: values
@@ spec.sources.env/teams/demo/sealedsecrets.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/demo/knowledgebases.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/demo/databases.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/demo/agents.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.applicationRefs @@
! - two list entries removed:
- - namePattern: team-demo-wd1
- images:
- - alias: team-demo-wd1
- commonUpdateSettings:
- updateStrategy: digest
- imageName: "harbor.try-otomi.net/team-orange/blue:latest"
- manifestTargets:
- helm:
- name: v2.image.name
- tag: v2.image.tag
- writeBackConfig:
- method: git
- gitConfig:
- branch: main
- repository: "https://gitea.dev.linode-apl.net/otomi/values.git"
- writeBackTarget: "helmvalues:/env/teams/demo/workloadValues/wd1.managed.yaml"
- - namePattern: team-demo-wd2
- images:
- - alias: team-demo-wd2
- commonUpdateSettings:
- updateStrategy: semver
- imageName: "harbor.try-otomi.net/team-orange/green:1.12"
- manifestTargets:
- helm:
- name: image.name
- tag: image.tag
- writeBackConfig:
- method: git
- gitConfig:
- branch: main
- repository: "https://gitea.dev.linode-apl.net/otomi/values.git"
- writeBackTarget: "helmvalues:/env/teams/demo/workloadValues/wd2.managed.yaml"
! + two list entries added:
+ - namePattern: team-demo-wd1
+ images:
+ - alias: team-demo-wd1
+ commonUpdateSettings:
+ updateStrategy: digest
+ imageName: "harbor.try-otomi.net/team-orange/blue:latest"
+ manifestTargets:
+ helm:
+ name: v2.image.name
+ tag: v2.image.tag
+ writeBackConfig:
+ method: git
+ gitConfig:
+ branch: test-branch
+ repository: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ writeBackTarget: "helmvalues:/env/teams/demo/workloadValues/wd1.managed.yaml"
+ - namePattern: team-demo-wd2
+ images:
+ - alias: team-demo-wd2
+ commonUpdateSettings:
+ updateStrategy: semver
+ imageName: "harbor.try-otomi.net/team-orange/green:1.12"
+ manifestTargets:
+ helm:
+ name: image.name
+ tag: image.tag
+ writeBackConfig:
+ method: git
+ gitConfig:
+ branch: test-branch
+ repository: "https://gitea.dev.linode-apl.net/otomi/values.git"
+ writeBackTarget: "helmvalues:/env/teams/demo/workloadValues/wd2.managed.yaml"
@@ spec.sources.env/teams/dev/sealedsecrets.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/dev/knowledgebases.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/dev/databases.targetRevision @@
! ± value change
- main
+ test-branch
@@ spec.sources.env/teams/dev/agents.targetRevision @@
! ± value change
- main
+ test-branch
@@ otomi.git.branch @@
! ± value change
- main
+ test-branch
|
ElderMatt
approved these changes
Mar 16, 2026
ferruhcihan
approved these changes
Mar 16, 2026
Ani1357
pushed a commit
that referenced
this pull request
Mar 19, 2026
(cherry picked from commit a15ca00)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
📌 Summary
🔍 Reviewer Notes
🧹 Checklist