Partially revert EAI-5893: Remove valuesFiles from single-source apps#708
Merged
Partially revert EAI-5893: Remove valuesFiles from single-source apps#708
Conversation
This commit selectively reverts parts of PR #692 (EAI-5893) that added support for multiple helm value files. Changes: - Removed valuesFiles support from single-source app definitions in cluster-apps.yaml - Modified bootstrap.sh render_actual_helm_manifests() to use valuesFile (singular) instead of valuesFiles - Reverted SBOM validation script to pre-EAI-5893 version - Removed sources/kaiwo/values.yaml Kept unchanged: - root/values.yaml (kaiwo OCI configuration - newer functionality depends on this) - sbom/components.yaml (current kaiwo metadata is correct) - sbom/generate-compare-components.sh (already updated for OCI support in commit 089da0c) - OCI multi-source support in cluster-apps.yaml (valuesFiles retained for OCI functionality) - bootstrap.sh render_actual_helm_manifests() function (modified to remove valuesFiles, kept the function) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Q-Dub
force-pushed
the
revert-EAI-5893-selective
branch
from
4575966 to
ec16062
Compare
OCI-based apps like kaiwo use repoURL instead of path. The validation script needs to check for app existence (not just non-null path) and normalize empty/null values for proper comparison. This fixes the CI failure where kaiwo showed as: cluster-configs='' vs components.yaml='null'
Replace the chart field with path for OCI repositories in ArgoCD Application specs, aligning with modern ArgoCD OCI support. Defaults to "." when path is not explicitly defined. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
oskarasbrink
approved these changes
May 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Selectively reverts parts of #692 (EAI-5893) that added support for multiple helm value files.
What's Being Reverted/Modified
valuesFilessupport from single-source app definitions in cluster-apps.yamlrender_actual_helm_manifests()function to usevaluesFile(singular) instead ofvaluesFilesarraysources/kaiwo/values.yamlWhat's Being Kept (NOT Reverted)
valuesFilesis retained here as it's required for OCI functionality added in commit 3061487render_actual_helm_manifests()function in bootstrap.sh (modified to remove valuesFiles array, but kept the function itself)Rationale
The
valuesFilesarray feature from EAI-5893 is no longer needed for single-source apps, but cannot be fully removed because:valuesFilesvaluesFilesin single-source modevaluesFile(singular)