Commit 53838f4
Restructure component directories to group by environment tier
Problem
-------
The current flat naming convention (external-staging, internal-staging,
external-production, internal-production) makes it difficult to maintain
components that need independent staging and production configurations.
When a component requires a staging-specific base (e.g. different
resource sizing, different credentials, staging-only features), there
is no natural place for it. Recent PRs (#384, #369) worked around this
with ad-hoc conventions (staging-base/, production-base/) and
placeholder directories, because the flat structure assumes a single
shared base across all environments.
This also makes it hard to deploy to staging first and production
later — a common pattern for validating changes before they reach
production clusters.
Solution
--------
Group environment directories by tier first, then by cluster type:
Before: After:
external-staging/ staging/external/
internal-staging/ staging/internal/
external-production/ production/external/
internal-production/ production/internal/
This enables a natural structure for tier-specific bases:
components/prometheus/
├── staging/
│ ├── base/ ← staging-specific config
│ ├── external/
│ └── internal/
└── production/
├── base/ ← production-specific config
├── external/
└── internal/
Components with a shared base across tiers keep their existing
base/ directory unchanged:
components/smee/
├── base/ ← shared across staging and production
├── staging/
│ └── external/
└── production/
└── external/
What changed
------------
- Renamed 46 environment directories across all 18 components
- Updated relative paths in 34 kustomization.yaml files (../base →
../../base, ../k-components → ../../k-components)
- Updated the 4 ArgoCD environment-patch.yaml files to match the
new directory names
Verified that kustomize build output is byte-identical before and
after for all 75 overlays — this is a pure directory reorganization
with no functional change to any deployed manifest.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent 80fae4f commit 53838f4
218 files changed
Lines changed: 55 additions & 55 deletions
File tree
- argo-cd-apps/overlays
- external-production
- external-staging
- internal-production
- internal-staging
- components
- argocd-repo-secrets
- production
- external
- internal
- staging
- external
- internal
- cert-manager/staging/internal
- cluster-secret-store
- production
- external
- internal
- staging
- external
- internal
- codecov/staging/internal
- external-secrets
- external-secrets-operator
- external-staging
- internal-production
- internal-staging
- production
- external
- internal
- staging
- external
- internal
- iam
- production
- external
- internal
- staging
- external
- internal
- internal-services
- production/internal
- config
- crds
- cronjob
- eso
- es
- extra
- manager
- networkpolicy
- rbac
- signing
- staging/internal
- config
- crds
- cronjob
- eso
- es
- extra
- manager
- networkpolicy
- rbac
- signing
- kargo/staging/internal
- deployment
- rbac
- projects
- base
- kargo-konflux-infra
- kargo-konflux-vanguard
- kargo-konflux
- konflux-devlake
- production/internal
- external-secrets
- staging/internal
- external-secrets
- konflux-support-ops-dashboard
- production/internal
- staging/internal
- konflux-support-ops
- production/internal
- external-secrets
- staging/internal
- external-secrets
- kueue/staging/internal
- kueue
- localqueues
- queue-config
- tekton-kueue
- kyverno
- production/internal
- staging/internal
- monitoring/logging
- production
- external
- patches
- internal
- patches
- staging
- external
- patches
- internal
- patches
- openshift-pipelines
- production/internal
- staging/internal
- policies
- production/internal
- block-signing-server-access
- .chainsaw-test
- resources
- staging/internal
- block-signing-server-access
- .chainsaw-test
- resources
- rover-group-sync
- production/internal
- staging/internal
- smee
- production/external
- staging/external
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
0 commit comments