feat: webhook to set agent injection env var with odigos additions #2107
+282
−85
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
blumamir
reviewed
Jan 1, 2025
| @@ -52,6 +53,15 @@ type InstrumentationConfigStatus struct { | |||
| RuntimeDetailsByContainer []RuntimeDetailsByContainer `json:"runtimeDetailsByContainer,omitempty"` | |||
| } | |||
|
|
|||
| func (in *InstrumentationConfigStatus) GetRuntimeDetailsForContainer(container v1.Container) *RuntimeDetailsByContainer { | |||
There was a problem hiding this comment.
We usually host these sort of functions in k8sutils. WDYT?
There was a problem hiding this comment.
As we discussed let's discuss on this with @RonFed and take decision here
There was a problem hiding this comment.
I'm OK with both options as long we don't have duplicated functions in more than one place.
It feels like we have a lot of functions like this in
instrumentor/internal/webhook_env_injector/webhook_env_injector.go
Outdated
Show resolved
Hide resolved
instrumentor/internal/webhook_env_injector/webhook_env_injector.go
Outdated
Show resolved
Hide resolved
instrumentor/internal/webhook_env_injector/webhook_env_injector.go
Outdated
Show resolved
Hide resolved
instrumentor/internal/webhook_env_injector/webhook_env_injector.go
Outdated
Show resolved
Hide resolved
instrumentor/internal/webhook_env_injector/webhook_env_injector.go
Outdated
Show resolved
Hide resolved
instrumentor/internal/webhook_env_injector/webhook_env_injector.go
Outdated
Show resolved
Hide resolved
instrumentor/internal/webhook_env_injector/webhook_env_injector.go
Outdated
Show resolved
Hide resolved
edeNFed
reviewed
Jan 1, 2025
tamirdavid1
force-pushed
the
inject-env-new-runtime-logic
branch
from
67512da to
d5924cc
Compare
RonFed
reviewed
Jan 3, 2025
| @@ -52,6 +53,15 @@ type InstrumentationConfigStatus struct { | |||
| RuntimeDetailsByContainer []RuntimeDetailsByContainer `json:"runtimeDetailsByContainer,omitempty"` | |||
| } | |||
|
|
|||
| func (in *InstrumentationConfigStatus) GetRuntimeDetailsForContainer(container v1.Container) *RuntimeDetailsByContainer { | |||
There was a problem hiding this comment.
I'm OK with both options as long we don't have duplicated functions in more than one place.
It feels like we have a lot of functions like this in
|
|
||
| // Return true if further processing should be skipped, either because it was already handled or due to a potential error (e.g., missing possible values) | ||
| // Return false if the env was not processed using the manifest value and requires further handling by other methods. | ||
| func handleManifestEnvVar(container *corev1.Container, envVarName string, otelsdk common.OtelSdk, logger logr.Logger) bool { |
There was a problem hiding this comment.
Suggested change
| func handleManifestEnvVar(container *corev1.Container, envVarName string, otelsdk common.OtelSdk, logger logr.Logger) bool { | |
| func ShouldIgnoreInjection(container *corev1.Container, envVarName string, otelsdk common.OtelSdk, logger logr.Logger) bool { |
Comment on lines
+128
to
+143
| func appendOdigosAdditionsToEnvVar(envName string, observedValue string, desiredOdigosAddition string) *string { | ||
| envValues, ok := envOverwrite.EnvValuesMap[envName] | ||
| if !ok { | ||
| // Odigos does not manipulate this environment variable, so ignore it | ||
| return nil | ||
| } | ||
|
|
||
| // In case observedValue is exists but empty, we just need to set the desiredOdigosAddition without delim before | ||
| if strings.TrimSpace(observedValue) == "" { | ||
| return &desiredOdigosAddition | ||
| } else { | ||
| // In case observedValue is not empty, we need to append the desiredOdigosAddition with the delim | ||
| mergedEnvValue := observedValue + envValues.Delim + desiredOdigosAddition | ||
| return &mergedEnvValue | ||
| } | ||
| } |
There was a problem hiding this comment.
maybe this function should be under the overwriter.go?
That way we won't need to export the Delim and we could use that module in the future from the vm-agent
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.
This is the initial phase of enabling the webhook to set agent injection-related environment variables (e.g., PYTHONPATH). The plan is to merge this after the migration and the new runtime inspection have been running for a while.
Once enough time has passed, I will merge this change to handle simpler cases where the envOverwriter is not involved. After this phase runs for a sufficient period, we can fully remove the envOverwriter and rely solely on this logic.
Finally, we can clean up the remaining code related to the envOverwriter.