octopus merge by Q-Dub · Pull Request #620 · silogen/cluster-forge

Q-Dub · 2026-03-04T11:37:09Z

https://amd.atlassian.net/browse/EAI-1235 (no longer using yq for helm template on cluster-forge parent app)
only deploy CF parent app (child apps are populated by argocd)
https://amd.atlassian.net/browse/EAI-1622 (wiring for --target-revision)
https://amd.atlassian.net/browse/EAI-1668 (--target-revision fix)
Keycloak fix: new section extraEnvVars - https://amd.atlassian.net/browse/EAI-1685
added flag --template-only / -t : renders just the manifests without applying
added flag --apps=app1[,app2,...] : apply only set of apps listed (can be combined with -t flag)
update sbom: connected with removing enabledApps from values.yaml, now sbom generates based on all values_size.yaml files
https://amd.atlassian.net/browse/EAI-1635 (now supports modifying branch enabledApps on the --target-revision)

…a Argocd; rm openbao explicit bootstrap and allow argo to handle

…up function

removed from bootstrap.sh chore: rm script for validate-cluster-sizes (out of date) and unused chore: rm redundant values in values_large.yaml so diff vs. base is clearer

…mplify bootstrap logic)

…epent on root/values.yaml (allowing the top-level enabledApps to be removed as well)

…passed from bloom or just set inline)

… injection

…pplication

…m-image-repository support and app filtering

… kgateway

remove deprecated ENV var for AIRM IMAGE (implemented as --airm-image-repository

brownzebra

well tested, thank you!

brownzebra

Awesome, thank you

Q-Dub added 30 commits March 3, 2026 12:57

refactor: bootsrap without yq

844dc6f

feat: remove forceful bootstrap of cluster-forge child apps

8d84f71

qa: verify new bootstrap by removing component on branch (AIRM)

72cb3c8

fix: integrate Opoenbao and Gitea in to bootstrap_v2

a923235

fix: gitea bootstraping

7193db6

fix: openbao needed before Gitea

e3c1ba5

fix: openbao deployment

a983c6d

fix: argo crd ordering error

6a051a0

fix: add back AIRM as enabled app after successful test

b70834a

feat(bootstrap): only deploy cluster-forge Argo app, children sync vi…

e62f54d

…a Argocd; rm openbao explicit bootstrap and allow argo to handle

feat: rm yq dependency and check; fix: rm partially implemented clean…

509500c

…up function

feat: separate values for argo and gitea, so yq can completely be

7276dd5

removed from bootstrap.sh chore: rm script for validate-cluster-sizes (out of date) and unused chore: rm redundant values in values_large.yaml so diff vs. base is clearer

chore: rm bootstrap v2, as ideas have been merged into base bootstrap.sh

ebc4e11

chore: streamline openbao manifest applies

1868d4f

fix: openbao deployment flow

b43683f

chore: rm partial cleanup function

56bb57a

refactor: simplify bootstrap script

54b7a77

fix: ordering issue

0eac7a8

feat: allow parent cluster-forge app to bootstrap openbao (thereby si…

95818fa

…mplify bootstrap logic)

feat(bootstrap.sh): check for dependencies with guidance for resolving

91f4a9c

feat: enable child app rendering

4a5f5b0

fix: gitea-init-job race condition

7d3537d

fix: inject cluster size values file

51fb6c0

fix: openbao health check

b133d92

qa: add xtrace flag for debugging

3201b05

fix: gitea-init cm

d4cd995

fix: openbao health cheks; sync wave gap restructure

456466d

fix: openbao config timing and dep chain

7a8154a

fix: add openbao-init to enabled apps

b5dd7f9

feat: update SBOM scripts to collate from all cluster sizes and not d…

8ed5cc7

…epent on root/values.yaml (allowing the top-level enabledApps to be removed as well)

brownzebra and others added 21 commits March 3, 2026 12:57

EAI-1238 deprecate scripts/init-openbao-job/values.yaml

8fbfa7b

feat: implement AIRM_IMAGE_REPOSITORY env when running bootstrap.sh (…

9b20d3c

…passed from bloom or just set inline)

docs: document AIRM_IMAGE_REPOSITORY feature

45176ab

feat: refactor AIRM_IMAGE_REPOSITORY as command arg as opposed to env…

1ad26f8

… injection

fix: revert to dedicated openbao deploy before cluster-forge parent a…

466b1eb

…pplication

fix: revert openbao and gitea scripts to match main, preserving --air…

4812ac5

…m-image-repository support and app filtering

fix: add proper values files checks

607e5e2

qa: add error handling and yq fix

2e56f4f

qa: update check logic for apps.openbao

7f05e92

fix: resolve potential issue with previous run temp file permissions

b558b91

fix: same temp folder approach as now working openbao

82d9064

fix: airm image seeding for cluster-values

731b477

fix: apps key in cluster-values.yaml

466d70a

fix: add regcreds for airm images

66af8d0

fix: cp error in airm images

56273d4

fix: value quotes for aimr images

17ae294

fix: add domain when using AIRM_IMAGE_REPOSITORY

a843ff6

fix: init-gitea to ref domain without global

249d550

fix: adjust syncWaves in light of cluster-auth erroring on restarting…

9215c99

… kgateway

fix: argo health checks

b225e21

revert value_ha.yaml (not in use)

e28b767

Q-Dub requested a review from a team as a code owner March 4, 2026 11:37

Q-Dub changed the title ~~EAI-1235 octopus~~ octopus merge Mar 4, 2026

Update bootstrap_guide.md

7207dc7

remove deprecated ENV var for AIRM IMAGE (implemented as --airm-image-repository

Q-Dub enabled auto-merge March 4, 2026 11:55

brownzebra reviewed Mar 4, 2026

View reviewed changes

Merge branch 'main' into EAI-1235_octopus

9d7cca5

brownzebra approved these changes Mar 4, 2026

View reviewed changes

Q-Dub merged commit d93e501 into main Mar 4, 2026
5 checks passed

Q-Dub deleted the EAI-1235_octopus branch March 4, 2026 11:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

octopus merge#620

octopus merge#620
Q-Dub merged 72 commits intomainfrom
EAI-1235_octopus

Q-Dub commented Mar 4, 2026 •

edited

Loading

Uh oh!

brownzebra left a comment

Uh oh!

brownzebra left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Q-Dub commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

brownzebra left a comment

Choose a reason for hiding this comment

Uh oh!

brownzebra left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Q-Dub commented Mar 4, 2026 •

edited

Loading