diff --git a/internal/operator/reconciler.go b/internal/operator/reconciler.go index 02c991f1..283c4c0b 100644 --- a/internal/operator/reconciler.go +++ b/internal/operator/reconciler.go @@ -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") } } diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 0c0cc780..8f722558 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:latest@sha256:8e542aac428a5518f6cf5ecedd949454b1dfd85ff3ac968f1a3a08d86472dd50 + image: ghcr.io/cozystack/cozystack/installer:latest@sha256:06e47d65e0b9c9eebc72d9bcf63ad644a75b9b740c433ad7f1e3b0e703957f7d