K8SPXC-1734 Fix haproxy env vars conflict #2290
Open
+91
−19
Conversation
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
|
|
oksana-grishchenko
requested review from
egegunes,
gkech,
hors,
mayankshah1607,
nmarukovich and
pooknull
as code owners
Collaborator
commit: 9639857 |
gkech
reviewed
Dec 5, 2025
Contributor
gkech
left a comment
gkech
left a comment
There was a problem hiding this comment.
leaving some small comments
| if cr.Spec.HAProxy != nil { | ||
| container.Env = append(container.Env, buildHAProxyHealthCheckEnvVars(cr.Spec.HAProxy.HealthCheck)...) | ||
| // check if the haproxy config is defined in EnvVarsSecretName, if so - it should be prioritized | ||
| // despite the fact the same env could have beren already applied above in the .EnvFrom section from the secret |
Contributor
There was a problem hiding this comment.
beren maybe should be -> env could have already been applied
| } | ||
|
|
||
| haproxy := &HAProxy{cr: cr} | ||
| ctx := context.Background() |
Contributor
There was a problem hiding this comment.
ctx can be defined outside the test loop, at the beginning of the test, or use t.Context()
| } | ||
|
|
||
| haproxy := &HAProxy{cr: cr} | ||
| ctx := context.Background() |
| } | ||
|
|
||
| proxySQL := &Proxy{cr: cr} | ||
| ctx := context.Background() |
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.
Fix haproxy env vars conflict
Problem:
Setting
cr.Spec.HAProxy.EnvVarsSecretNamedoes not take any effectCause:
With #2207 now we always define the
HA_SERVER_OPTIONSenv var in the.envsection of the sidecar container, however there is another mechanism of defining env variables that conflicts with it - defining viacr.Spec.HAProxy.EnvVarsSecretName. In that case the env vars defined in the secret go into the.envFromsection of the sidecar container, for which:Solution:
Check if the actual secret
cr.Spec.HAProxy.EnvVarsSecretNamecontains theHA_SERVER_OPTIONSenv var and use the value preferably over the value from thecr.Spec.HAProxy.HealthCheck(wether default or explicitly set)CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability