Repository navigation
feat(helm): support for specifying Helm flags on region (forceConflicts, serverSide) - #697
Merged
Merged
Conversation
…start with The implementation allows one to easily add helm flags on the region - which will then be used during helm upgrade (i.e. install, suspend, resume). The reason to add it on the region is that these flags make sense for all services rather then on a catalog or service level (these kind of flags manipulate how helm functions, and we want the same result for all services, at least as of now).
forceConflicts requires that upgrade is done server side. Thus we want the ability to supply this flag
|
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
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.
Rebase of #646 by @johnksv onto the current
main. The original branch lives on thestatisticsnorwayfork without maintainer edit access, so it is reopened from this repository. Commits and authorship are unchanged.What it does
Adds a
helmblock to the region services configuration so that Helm flags apply to everyhelm upgraderun by Onyxia (install, suspend, resume):forceConflicts(defaultfalse) adds--force-conflicts, needed with Helm 4 when a field is owned by another manager (for example a mutating webhook).serverSide(default"auto") adds--server-side <value>.Helm flags are grouped in a new
HelmFlagsrecord, and suspend/resume now go through the singleinstallChartwithglobal.suspend.Conflict resolution during the rebase
HelmAppsService.suspendOrResume: kept the PR's version and passednamespaceIdtogetHelmConfiguration(region, user, namespaceId)(signature changed in Mode service account in target namespace #693).docs/region-configuration.md: kept the table frommain(it now includesserviceAccountInTargetNamespace/targetNamespaceServiceAccount) and added thehelmrow, linked to#helm-properties.Open points from the review
--server-side autois now always passed. It is Helm 4's default and the image ships Helm v4.3.1, but Helm 3 does not know the flag.serverSide: auto, a release first installed client-side (Helm 3) stays client-side, and Helm 4 may then reject--force-conflicts. Not tested on a cluster.serverSideis not documented in the "Helm properties" section and its value is not validated (true|false|auto).HelmFlags.toHelmUpgradeCliString()has no unit test.Tests (
mvn test) andspotless:checkpass locally.Supersedes #646.
🤖 Generated with Claude Code