Skip to content

Fix/ci env branch workflows#32

Merged
JackMaarek merged 4 commits into
mainfrom
fix/ci-env-branch-workflows
Mar 27, 2026
Merged

Fix/ci env branch workflows#32
JackMaarek merged 4 commits into
mainfrom
fix/ci-env-branch-workflows

Conversation

@JackMaarek

Copy link
Copy Markdown
Collaborator

What

Why

Changes

  • path/to/file — reason

Checklist

  • Branch is based on latest main (git log --oneline main..HEAD)
  • No env-specific values on main-bound files
    grep -r "env: dev\|eu-west-3\|k8s-platform-dev\|esoIrsaRoleArn: \"\"" argocd/ kubernetes/helm/
  • No unreplaced placeholder in manifests (only allowed in ApplicationSet elements:)
    grep -r "__ENV__\|__CLUSTER_NAME__" kubernetes/manifests/ kubernetes/helm/
  • Commit messages follow Conventional Commits (type(scope): description)
  • No file exceeds 200 lines (find . -name "*.yaml" -o -name "*.go" | xargs wc -l | sort -rn | head -20)
  • No secrets or credentials committed (git diff main --name-only | xargs grep -l "password\|secret\|token\|key" 2>/dev/null)
  • ArgoCD wave order documented in comments if sync order matters
  • SRP respected — one file, one responsibility

Testing

  • kubectl apply --dry-run=server on changed manifests
  • ArgoCD sync validated on local cluster (Kind)
  • No new CrashLoopBackOff or ImagePullBackOff after sync

Notes for reviewer

…ng, prod)

The apply IAM role was scoped to refs/heads/main only. CI on env branches
(dev, staging, prod) could not assume it. Extend the condition using
StringLike with an explicit list of allowed branches.
The project uses env-branch model (dev/staging/prod), not main-centric.
Workflows now trigger on push/PR targeting env branches. The target env
is resolved from the branch name — no matrix needed.

Also fix terraform-platform.yml path: _domains/platform → domains/platform.
domains/organization manages IAM Identity Center bootstrap and all
account assignments. Single apply from dev branch — no per-env matrix.
…commit config

__GIT_WORKING_DIR__ was never resolved by platform-bot (not in
placeholderMapping, pre-commit config not a substitution target).
Replace with ./terraform/_ci which works without any substitution.
@JackMaarek
JackMaarek merged commit 07d19d8 into main Mar 27, 2026
5 of 6 checks passed
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.

1 participant