[GEN-2267] chore: move limit device injection into webhook #2307
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
…ntainer Task 149 sources container
…play-source-manage-list
…urces-card Task 107 overview sources card
…rce-manage-list Task 142 display source manage list
…rce-btn Task 143 add new source btn
…sources-connection Task 145 handle new sources connection
blumamir
reviewed
Jan 27, 2025
|
|
||
| pl, otelsdk, found := containerutils.GetLanguageAndOtelSdk(container) | ||
| otelSdk, found := sdks.GetDefaultSDKs()[pl] |
There was a problem hiding this comment.
need to also address instrumentationrules.
blumamir
reviewed
Jan 27, 2025
| if !found { | ||
| fmt.Println("No default SDK found for language", pl) |
blumamir
reviewed
Jan 27, 2025
| continue | ||
| } | ||
|
|
||
| webhookenvinjector.InjectOdigosAgentEnvVars(ctx, p.Client, logger, *podWorkload, container, pl, otelsdk) | ||
| webhookdeviceinjector.InjectOdigosInstrumentationDevice(ctx, p.Client, logger, *podWorkload, container, pl, otelSdk) |
There was a problem hiding this comment.
this function name is injectOdigosEnvVars.
consider moving this logic to a different function with good name
blumamir
reviewed
Jan 27, 2025
| var workloadInstrumentationConfig odigosv1.InstrumentationConfig | ||
| instrumentationConfigName := workload.CalculateWorkloadRuntimeObjectName(podWorkload.Name, podWorkload.Kind) | ||
|
|
||
| if err := p.Get(ctx, client.ObjectKey{Namespace: podWorkload.Namespace, Name: instrumentationConfigName}, &workloadInstrumentationConfig); err != nil { |
There was a problem hiding this comment.
we are already getting the instrumentation config for the service name.
could be nice to do it only once and use the same object in both places
blumamir
reviewed
Jan 27, 2025
| func getLibCTypeOfContainer(ctx context.Context, p client.Client, logger logr.Logger, podWorkload workload.PodWorkload, containerName string) *common.LibCType { | ||
|
|
||
| var instConfig v1alpha1.InstrumentationConfig | ||
| err := p.Get(ctx, client.ObjectKey{Namespace: podWorkload.Namespace, Name: workload.CalculateWorkloadRuntimeObjectName(podWorkload.Name, podWorkload.Kind)}, &instConfig) |
There was a problem hiding this comment.
use the instrumentation config that we already "get" before
blumamir
reviewed
Jan 27, 2025
| } | ||
|
|
||
| // Find the matching container runtime details | ||
| for _, rd := range instConfig.Status.RuntimeDetailsByContainer { |
There was a problem hiding this comment.
consider merging this one with getLanguageOfContainer
blumamir
reviewed
Jan 27, 2025
| // devicePartiallyApplied is used to indicate that the instrumentation device was partially applied for some of the containers. | ||
| devicePartiallyApplied := false | ||
| deviceNotAppliedDueToPresenceOfAnotherAgent := false | ||
| func addInstrumentationDeviceToWorkload(ctx context.Context, kubeClient client.Client, instConfig *odigosv1.InstrumentationConfig) error { |
There was a problem hiding this comment.
consider giving this function a better name now that it's no longer addressing instrumentation device
blumamir
reviewed
Jan 27, 2025
| instrumentation.SetInjectInstrumentationLabel(podSpec) | ||
| } | ||
| // add odigos.io/inject-instrumentation label to enable the webhook | ||
| instrumentation.SetInjectInstrumentationLabel(podSpec) |
There was a problem hiding this comment.
if device is skipped, we must not inject the instrumentation label
blumamir
reviewed
Jan 27, 2025
| } | ||
|
|
||
| if err != nil { | ||
| return err, false | ||
| return err | ||
| } | ||
|
|
||
| modified := result != controllerutil.OperationResultNone | ||
| if modified { | ||
| logger.V(0).Info("added instrumentation device to workload", "name", obj.GetName(), "namespace", obj.GetNamespace()) |
There was a problem hiding this comment.
Suggested change
| logger.V(0).Info("added instrumentation device to workload", "name", obj.GetName(), "namespace", obj.GetNamespace()) | |
| logger.V(0).Info("added inject instrumentation label to workload pod template", "name", obj.GetName(), "namespace", obj.GetNamespace()) |
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.
No description provided.