From dc62a84e2eeb58c86f07f287b64859af63e29283 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Mon, 30 Mar 2026 07:57:13 -0300 Subject: [PATCH] flux: keep feature branch tracking until main push is available --- .../flux-system/applications/atlasbot/image-automation.yaml | 4 ++-- .../applications/bstein-dev-home/image-automation.yaml | 4 ++-- .../flux-system/applications/comms/image-automation.yaml | 4 ++-- .../flux-system/applications/harbor/image-automation.yaml | 4 ++-- .../flux-system/applications/pegasus/image-automation.yaml | 4 ++-- clusters/atlas/flux-system/gotk-sync.yaml | 2 +- .../flux-system/platform/maintenance/image-automation.yaml | 4 ++-- services/atlasbot/image-automation.yaml | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/clusters/atlas/flux-system/applications/atlasbot/image-automation.yaml b/clusters/atlas/flux-system/applications/atlasbot/image-automation.yaml index efc99243..ec8672cd 100644 --- a/clusters/atlas/flux-system/applications/atlasbot/image-automation.yaml +++ b/clusters/atlas/flux-system/applications/atlasbot/image-automation.yaml @@ -13,14 +13,14 @@ spec: git: checkout: ref: - branch: main + branch: feature/atlasbot commit: author: email: ops@bstein.dev name: flux-bot messageTemplate: "chore(atlasbot): automated image update" push: - branch: main + branch: feature/atlasbot update: strategy: Setters path: services/atlasbot diff --git a/clusters/atlas/flux-system/applications/bstein-dev-home/image-automation.yaml b/clusters/atlas/flux-system/applications/bstein-dev-home/image-automation.yaml index ff4cc5ba..da773572 100644 --- a/clusters/atlas/flux-system/applications/bstein-dev-home/image-automation.yaml +++ b/clusters/atlas/flux-system/applications/bstein-dev-home/image-automation.yaml @@ -13,14 +13,14 @@ spec: git: checkout: ref: - branch: main + branch: feature/atlasbot commit: author: email: ops@bstein.dev name: flux-bot messageTemplate: "chore(bstein-dev-home): automated image update" push: - branch: main + branch: feature/atlasbot update: strategy: Setters path: services/bstein-dev-home diff --git a/clusters/atlas/flux-system/applications/comms/image-automation.yaml b/clusters/atlas/flux-system/applications/comms/image-automation.yaml index 7c1e94ae..4134337b 100644 --- a/clusters/atlas/flux-system/applications/comms/image-automation.yaml +++ b/clusters/atlas/flux-system/applications/comms/image-automation.yaml @@ -13,14 +13,14 @@ spec: git: checkout: ref: - branch: main + branch: feature/atlasbot commit: author: email: ops@bstein.dev name: flux-bot messageTemplate: "chore(comms): automated image update" push: - branch: main + branch: feature/atlasbot update: strategy: Setters path: services/comms diff --git a/clusters/atlas/flux-system/applications/harbor/image-automation.yaml b/clusters/atlas/flux-system/applications/harbor/image-automation.yaml index dc54aa27..c1e867be 100644 --- a/clusters/atlas/flux-system/applications/harbor/image-automation.yaml +++ b/clusters/atlas/flux-system/applications/harbor/image-automation.yaml @@ -14,14 +14,14 @@ spec: git: checkout: ref: - branch: main + branch: feature/ci-gitops commit: author: email: ops@bstein.dev name: flux-bot messageTemplate: "chore(harbor): apply image updates" push: - branch: main + branch: feature/ci-gitops update: strategy: Setters path: ./services/harbor diff --git a/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml b/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml index 4905c32a..d11422a8 100644 --- a/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml +++ b/clusters/atlas/flux-system/applications/pegasus/image-automation.yaml @@ -13,14 +13,14 @@ spec: git: checkout: ref: - branch: main + branch: feature/ci-gitops commit: author: email: ops@bstein.dev name: flux-bot messageTemplate: "chore(pegasus): apply image updates" push: - branch: main + branch: feature/ci-gitops update: strategy: Setters path: services/pegasus diff --git a/clusters/atlas/flux-system/gotk-sync.yaml b/clusters/atlas/flux-system/gotk-sync.yaml index a793e031..7593064c 100644 --- a/clusters/atlas/flux-system/gotk-sync.yaml +++ b/clusters/atlas/flux-system/gotk-sync.yaml @@ -9,7 +9,7 @@ metadata: spec: interval: 1m0s ref: - branch: main + branch: feature/atlasbot secretRef: name: flux-system-gitea url: ssh://git@scm.bstein.dev:2242/bstein/titan-iac.git diff --git a/clusters/atlas/flux-system/platform/maintenance/image-automation.yaml b/clusters/atlas/flux-system/platform/maintenance/image-automation.yaml index f84a9812..de1377f3 100644 --- a/clusters/atlas/flux-system/platform/maintenance/image-automation.yaml +++ b/clusters/atlas/flux-system/platform/maintenance/image-automation.yaml @@ -13,14 +13,14 @@ spec: git: checkout: ref: - branch: main + branch: feature/atlasbot commit: author: email: ops@bstein.dev name: flux-bot messageTemplate: "chore(maintenance): automated image update" push: - branch: main + branch: feature/atlasbot update: strategy: Setters path: services/maintenance diff --git a/services/atlasbot/image-automation.yaml b/services/atlasbot/image-automation.yaml index 73f71a2a..fdd75475 100644 --- a/services/atlasbot/image-automation.yaml +++ b/services/atlasbot/image-automation.yaml @@ -13,14 +13,14 @@ spec: git: checkout: ref: - branch: main + branch: feature/atlasbot commit: author: name: flux-bot email: ops@bstein.dev messageTemplate: "chore(atlasbot): automated image update" push: - branch: main + branch: feature/atlasbot update: path: services/atlasbot strategy: Setters