Skip to content

Commit b92477e

Browse files
kvapsclaude
andcommitted
refactor: replace Helm lookup with valuesFrom mechanism
Replace Helm lookup functions with FluxCD valuesFrom for passing configuration to HelmReleases. This eliminates the need for force reconcile controllers and provides cleaner config propagation. Changes: - Add Secret cozystack-values creation in platform and tenant charts - Modify cozystack-api to add valuesFrom, filter _ prefixed keys - Add valuesFrom validation in cozystack-controller - Add helper templates in cozy-lib for _cluster/_namespace access - Replace ConfigMap/Namespace lookups in 40+ Helm charts - Remove CozystackConfigReconciler and TenantHelmReconciler The Secret cozystack-values contains: - _cluster: data from cozystack, cozystack-branding, cozystack-scheduling ConfigMaps - _namespace: service references (etcd, host, ingress, monitoring, seaweedfs) Co-Authored-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
1 parent bbeaacc commit b92477e

59 files changed

Lines changed: 547 additions & 501 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/cozystack-controller/main.go‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -200,22 +200,6 @@ func main() {
200200
os.Exit(1)
201201
}
202202

203-
if err = (&controller.TenantHelmReconciler{
204-
Client: mgr.GetClient(),
205-
Scheme: mgr.GetScheme(),
206-
}).SetupWithManager(mgr); err != nil {
207-
setupLog.Error(err, "unable to create controller", "controller", "TenantHelmReconciler")
208-
os.Exit(1)
209-
}
210-
211-
if err = (&controller.CozystackConfigReconciler{
212-
Client: mgr.GetClient(),
213-
Scheme: mgr.GetScheme(),
214-
}).SetupWithManager(mgr); err != nil {
215-
setupLog.Error(err, "unable to create controller", "controller", "CozystackConfigReconciler")
216-
os.Exit(1)
217-
}
218-
219203
cozyAPIKind := "DaemonSet"
220204
if reconcileDeployment {
221205
cozyAPIKind = "Deployment"

‎internal/controller/cozystackresourcedefinition_helmreconciler.go‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,44 @@ func (r *CozystackResourceDefinitionHelmReconciler) updateHelmReleasesForCRD(ctx
9797
return nil
9898
}
9999

100-
// updateHelmReleaseChart updates the chart in HelmRelease based on CozystackResourceDefinition
100+
// expectedValuesFrom returns the expected valuesFrom configuration for HelmReleases
101+
func expectedValuesFrom() []helmv2.ValuesReference {
102+
return []helmv2.ValuesReference{
103+
{
104+
Kind: "Secret",
105+
Name: "cozystack-values",
106+
ValuesKey: "_namespace",
107+
TargetPath: "_namespace",
108+
Optional: false,
109+
},
110+
{
111+
Kind: "Secret",
112+
Name: "cozystack-values",
113+
ValuesKey: "_cluster",
114+
TargetPath: "_cluster",
115+
Optional: false,
116+
},
117+
}
118+
}
119+
120+
// valuesFromEqual compares two ValuesReference slices
121+
func valuesFromEqual(a, b []helmv2.ValuesReference) bool {
122+
if len(a) != len(b) {
123+
return false
124+
}
125+
for i := range a {
126+
if a[i].Kind != b[i].Kind ||
127+
a[i].Name != b[i].Name ||
128+
a[i].ValuesKey != b[i].ValuesKey ||
129+
a[i].TargetPath != b[i].TargetPath ||
130+
a[i].Optional != b[i].Optional {
131+
return false
132+
}
133+
}
134+
return true
135+
}
136+
137+
// updateHelmReleaseChart updates the chart and valuesFrom in HelmRelease based on CozystackResourceDefinition
101138
func (r *CozystackResourceDefinitionHelmReconciler) updateHelmReleaseChart(ctx context.Context, hr *helmv2.HelmRelease, crd *cozyv1alpha1.CozystackResourceDefinition) error {
102139
logger := log.FromContext(ctx)
103140
hrCopy := hr.DeepCopy()
@@ -154,6 +191,14 @@ func (r *CozystackResourceDefinitionHelmReconciler) updateHelmReleaseChart(ctx c
154191
}
155192
}
156193

194+
// Check and update valuesFrom configuration
195+
expected := expectedValuesFrom()
196+
if !valuesFromEqual(hrCopy.Spec.ValuesFrom, expected) {
197+
logger.V(4).Info("Updating HelmRelease valuesFrom", "name", hr.Name, "namespace", hr.Namespace)
198+
hrCopy.Spec.ValuesFrom = expected
199+
updated = true
200+
}
201+
157202
if updated {
158203
logger.V(4).Info("Updating HelmRelease chart", "name", hr.Name, "namespace", hr.Namespace)
159204
if err := r.Update(ctx, hrCopy); err != nil {

‎internal/controller/system_helm_reconciler.go‎

Lines changed: 0 additions & 140 deletions
This file was deleted.

‎internal/controller/tenant_helm_reconciler.go‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎packages/apps/bucket/templates/bucketclaim.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
2-
{{- $seaweedfs := index $myNS.metadata.annotations "namespace.cozystack.io/seaweedfs" }}
1+
{{- $seaweedfs := .Values._namespace.seaweedfs }}
32
apiVersion: objectstorage.k8s.io/v1alpha1
43
kind: BucketClaim
54
metadata:

0 commit comments

Comments
 (0)