Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7fcd731
updating values_small from medium, removing gitea, keeping local-path
brownzebra Apr 15, 2026
502d4d3
gitea reoved from small values; dynamic deployment of gitea in bootstrap
brownzebra Apr 15, 2026
f755f68
update repository for clusterforge
brownzebra Apr 15, 2026
b30620f
fix: Set global.clusterSize to values_small.yaml
brownzebra Apr 15, 2026
5e04e24
fix: Set global.clusterSize in values_<size>.yaml files
brownzebra Apr 15, 2026
673dea2
fix: Disable externalValues and add valuesFile to clusterForge config
brownzebra Apr 15, 2026
50b0a84
Updating values for repositories and small configuration
brownzebra Apr 16, 2026
f340ea9
test with cert manager in small for minio usage
brownzebra Apr 16, 2026
1a6436b
fix: add missing app definitions for cert-manager-config, cluster-cer…
brownzebra Apr 17, 2026
a0c5083
fix: add domain helmParameter to cert-manager-config
brownzebra Apr 17, 2026
485a634
use local-path in small
brownzebra Apr 17, 2026
b87698c
adding kyverno stroageclass mutation for small as not all sc can be t…
brownzebra Apr 17, 2026
8b174cc
default to HEAD for target-revision to enable template override
brownzebra Apr 17, 2026
98843a2
include targetRevision to small
brownzebra Apr 17, 2026
f34cce5
main as defaut target revision
brownzebra Apr 17, 2026
2bc9358
focusing towatd nogitea and working target revision branches
brownzebra Apr 17, 2026
9ee1f0f
add cluster-cert to small enabledApps; fix kyverno policy wave ordering
brownzebra Apr 22, 2026
b242556
push keycloak syncwave on small
brownzebra Apr 22, 2026
96c1b9c
certs for small tls
brownzebra Apr 22, 2026
63a066f
fix: global.domain propagation and cluster-cert fix
brownzebra Apr 22, 2026
d588f67
updating kyverno to reduce flapping on the skip background requetss
brownzebra Apr 23, 2026
3e9c2fd
templating for storage classes for small; reductionions in requests f…
brownzebra Apr 23, 2026
23b6736
Merge branch 'main' into EAI-5838-optimizing-down-the-small-configura…
brownzebra Apr 23, 2026
2e9f623
update sbom for cluster-cert for small
brownzebra Apr 23, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions root/templates/cluster-forge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,48 @@ spec:
# Uses the SAME targetRevision for both chart templates AND values
sources:
- repoURL: {{ .Values.clusterForge.repoUrl }}
targetRevision: {{ .Values.clusterForge.targetRevision }}
targetRevision: {{ .Values.clusterForge.targetRevision | default "HEAD" | quote }}
path: root
helm:
valueFiles:
- {{ .Values.externalValues.path }}
- {{ .Values.global.clusterSize }}
- $cluster-values/values.yaml
parameters:
- name: clusterForge.targetRevision
value: {{ .Values.clusterForge.targetRevision | default "HEAD" | quote }}
- repoURL: {{ .Values.externalValues.repoUrl }}
targetRevision: {{ .Values.externalValues.targetRevision }}
ref: cluster-values
{{- else }}
# helm-chart & values file within the same git repo
source:
repoURL: {{ .Values.clusterForge.repoUrl }}
targetRevision: {{ .Values.clusterForge.targetRevision }}
targetRevision: {{ .Values.clusterForge.targetRevision | default "HEAD" | quote }}
path: root
helm:
valueFiles:
- {{ .Values.clusterForge.valuesFile }}
- {{ .Values.global.clusterSize }}
parameters:
- name: clusterForge.targetRevision
value: {{ .Values.clusterForge.targetRevision | default "HEAD" | quote }}
- name: global.domain
value: {{ .Values.global.domain | quote }}
{{- end }}
destination:
server: https://kubernetes.default.svc
namespace: argocd
syncPolicy:
automated:
prune: true
selfHeal: true
selfHeal: true
ignoreDifferences:
- group: argoproj.io
kind: Application
name: cluster-forge
jsonPointers:
- /spec/source/targetRevision
- /spec/sources/0/targetRevision
- /spec/source/helm/parameters
- /spec/sources/0/helm/parameters
31 changes: 29 additions & 2 deletions root/values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
clusterForge:
repoUrl: "http://gitea-http.cf-gitea.svc:3000/cluster-org/cluster-forge.git"
targetRevision: # injected via scripts/bootstrap.sh; tag, branch, or commit
targetRevision: main # Overridden by bootstrap --target-revision flag
valuesFile: values.yaml
externalValues:
enabled: true
enabled: false
path: values.yaml
repoUrl: "http://gitea-http.cf-gitea.svc:3000/cluster-org/cluster-values.git"
targetRevision: main
Expand Down Expand Up @@ -237,6 +238,14 @@ apps:
syncWave: -40
valuesObject:
installCRDs: true
cert-manager-config:
helmParameters:
- name: domain
value: "{{ .Values.global.domain }}"
namespace: cert-manager
path: cert-manager-config
syncWave: -35
valuesFile: values.yaml
cluster-auth:
namespace: cluster-auth
path: cluster-auth/0.5.0
Expand All @@ -253,6 +262,12 @@ apps:
namespace: cluster-auth
path: cluster-auth-config
syncWave: -20
cluster-cert:
namespace: cluster-cert
path: cluster-cert
syncWave: -15
directory:
recurse: true
cnpg-operator:
namespace: cnpg-system
path: cnpg-operator/0.26.0
Expand Down Expand Up @@ -525,6 +540,18 @@ apps:
requests:
cpu: "250m"
memory: "512Mi"
keycloak-config:
ignoreDifferences:
- group: external-secrets.io
jqPathExpressions:
- ".spec.data[].remoteRef.conversionStrategy"
- ".spec.data[].remoteRef.decodingStrategy"
- ".spec.data[].remoteRef.metadataPolicy"
kind: ExternalSecret
namespace: keycloak
path: keycloak-config
syncWave: -5
valuesFile: values.yaml
kgateway:
namespace: kgateway-system
path: kgateway/v2.1.0-main
Expand Down
11 changes: 11 additions & 0 deletions root/values_large.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
global:
clusterSize: values_large.yaml

# Large cluster uses Gitea for GitOps (multi-source)
clusterForge:
repoUrl: "http://gitea-http.cf-gitea.svc:3000/cluster-org/cluster-forge.git"
targetRevision: main # Default branch, can be overridden via --target-revision
externalValues:
enabled: true
repoUrl: "http://gitea-http.cf-gitea.svc:3000/cluster-org/cluster-values.git"

enabledApps:
- aim-cluster-model-source
- aim-engine
Expand Down
10 changes: 10 additions & 0 deletions root/values_medium.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Medium & Small clusters add local-path storage policy for RWX→RWO conversion

global:
clusterSize: values_medium.yaml

# Medium cluster uses Gitea for GitOps (multi-source)
clusterForge:
repoUrl: "http://gitea-http.cf-gitea.svc:3000/cluster-org/cluster-forge.git"
externalValues:
enabled: true
repoUrl: "http://gitea-http.cf-gitea.svc:3000/cluster-org/cluster-values.git"

enabledApps:
- aim-cluster-model-source
- aim-engine
Expand Down
Loading
Loading