fix(helm): correct installGatewayAPI helm value defaulting #13759
Conversation
This file contains 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
Signed-off-by: Alex Leong <alex@buoyant.io>
alpeb
reviewed
Mar 10, 2025
| @@ -1,4 +1,4 @@ | |||
| {{- if .Values.enableTlsRoutes | default .Values.installGatewayAPI }} | |||
| {{- if (ternary .Values.enableTcpRoutes .Values.installGatewayAPI (hasKey .Values "enableTcpRoutes")) }} | |||
cli/cmd/install_helm_test.go
Outdated
| @@ -147,11 +167,15 @@ func testRenderHelm(t *testing.T, linkerd2Chart *chart.Chart, goldenFileName str | |||
| IsInstall: true, | |||
| } | |||
|
|
|||
| fmt.Println("overrideConfig", overrideConfig) | |||
cli/cmd/install_helm_test.go
Outdated
| valuesToRender, err := chartutil.ToRenderValues(linkerd2Chart, overrideConfig, releaseOptions, nil) | ||
| if err != nil { | ||
| t.Fatal("Unexpected error", err) | ||
| } | ||
|
|
||
| fmt.Println("valuesToRender", valuesToRender) |
| @@ -1,4 +1,4 @@ | |||
| {{- if .Values.enableHttpRoutes | default .Values.installGatewayAPI }} | |||
| {{- if (ternary .Values.enableHttpRoutes .Values.installGatewayAPI (hasKey .Values "enableHttpRoutes")) }} | |||
There was a problem hiding this comment.
Nit: no-parenthesis alternative:
{{- if hasKey .Values "enableHttpRoutes" | ternary .Values.enableHttpRoutes .Values.installGatewayAPI }}
alpeb
approved these changes
Mar 10, 2025
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.
The Helm function
defaultwill treat a boolean false value as unset and use the default instead of the false, even when it is set. When rendering CRDs during install or upgrade, this can cause Linkerd to fall back to using theinstallGatewayAPIvalue even whenenableHttpRoutesis explicitly set to false.We replace the
defaultfunction with a ternary which checks if the key is present. We also add tests for both CLI and Helm.