Skip to content

Commit

Permalink
Ignore default when we have properties
Browse files Browse the repository at this point in the history
  • Loading branch information
garronej committed Dec 2, 2024
1 parent 89fe3ae commit 957f261
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions web/src/core/usecases/launcher/decoupledLogic/computeHelmValues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ export function computeHelmValues_rec(params: {
break use_x_onyxia_overwriteDefaultWith;
}

if (
helmValuesSchema.type === "object" &&
helmValuesSchema.properties !== undefined
) {
break use_x_onyxia_overwriteDefaultWith;
}

const resolvedValue = resolveXOnyxiaValueReference({
expression: overwriteDefaultWith,
xOnyxiaContext
Expand Down Expand Up @@ -165,6 +172,13 @@ export function computeHelmValues_rec(params: {
break use_default;
}

if (
helmValuesSchema.type === "object" &&
helmValuesSchema.properties !== undefined
) {
break use_default;
}

const { isValid } = validateValueAgainstJSONSchema({
helmValuesSchema,
xOnyxiaContext,
Expand Down

0 comments on commit 957f261

Please sign in to comment.