vrr/cozystack
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merging values.yaml

Browse source 
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
This commit is contained in:
Andrei Kvapil 2025-11-19 17:59:06 +01:00
parent ea9d44b4af
commit 17286ad213
No known key found for this signature in database
GPG key ID: 931CF7FEACEAF765
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/operator/reconciler.go
View file

@ -490,7 +490,7 @@ func (r *PlatformReconciler) reconcileArtifactGenerator(ctx context.Context, nam
for i, valuesFile := range valuesFiles {
// Copy values file from GitRepository to artifact
// Path in GitRepository: packages/{name}/{pkg}/{valuesFile}
// Path in artifact: {pkg}/{valuesFile}
// All files should be merged into values.yaml in artifact
// First file should use Overwrite (to replace original values.yaml), others use Merge
strategy := "Merge"
if i == 0 {
@ -498,10 +498,10 @@ func (r *PlatformReconciler) reconcileArtifactGenerator(ctx context.Context, nam
}
copyOps = append(copyOps, sourcewatcherv1beta1.CopyOperation{
From: fmt.Sprintf("@cozystack/packages/%s/%s/%s", name, pkg, valuesFile),
To: fmt.Sprintf("@artifact/%s/%s", pkg, valuesFile),
To: fmt.Sprintf("@artifact/%s/values.yaml", pkg),
Strategy: strategy,
})
logger.Info("Adding valuesFile copy operation", "package", pkg, "valuesFile", valuesFile, "strategy", strategy)
logger.Info("Adding valuesFile copy operation", "package", pkg, "valuesFile", valuesFile, "strategy", strategy, "target", "values.yaml")
}
}

2
packages/core/installer/values.yaml
View file

@ -1,2 +1,2 @@
cozystack:
image: ghcr.io/cozystack/cozystack/installer:latest@sha256:8e542aac428a5518f6cf5ecedd949454b1dfd85ff3ac968f1a3a08d86472dd50
image: ghcr.io/cozystack/cozystack/installer:latest@sha256:06e47d65e0b9c9eebc72d9bcf63ad644a75b9b740c433ad7f1e3b0e703957f7d