[CONTP-403] Configure agent sidecar mutator to use config component #29955
+48
−42
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,7 @@ import ( | |
| "k8s.io/client-go/dynamic" | ||
|
|
||
| "github.com/DataDog/datadog-agent/cmd/cluster-agent/admission" | ||
| "github.com/DataDog/datadog-agent/comp/core/config" | ||
| "github.com/DataDog/datadog-agent/pkg/clusteragent/admission/common" | ||
| "github.com/DataDog/datadog-agent/pkg/clusteragent/admission/metrics" | ||
| mutatecommon "github.com/DataDog/datadog-agent/pkg/clusteragent/admission/mutate/common" | ||
|
|
@@ -52,23 +53,25 @@ type Webhook struct { | |
| namespaceSelector *metav1.LabelSelector | ||
| objectSelector *metav1.LabelSelector | ||
| containerRegistry string | ||
| datadogConfig config.Component | ||
| } | ||
|
|
||
| // NewWebhook returns a new Webhook | ||
| func NewWebhook(datadogConfig config.Component) *Webhook { | ||
| nsSelector, objSelector := labelSelectors(datadogConfig) | ||
|
|
||
| containerRegistry := mutatecommon.ContainerRegistry("admission_controller.agent_sidecar.container_registry") | ||
|
|
||
| return &Webhook{ | ||
| name: webhookName, | ||
| isEnabled: datadogConfig.GetBool("admission_controller.agent_sidecar.enabled"), | ||
| endpoint: datadogConfig.GetString("admission_controller.agent_sidecar.endpoint"), | ||
| resources: []string{"pods"}, | ||
| operations: []admissionregistrationv1.OperationType{admissionregistrationv1.Create}, | ||
| namespaceSelector: nsSelector, | ||
| objectSelector: objSelector, | ||
| containerRegistry: containerRegistry, | ||
| datadogConfig: datadogConfig, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -129,12 +132,12 @@ func (w *Webhook) injectAgentSidecar(pod *corev1.Pod, _ string, _ dynamic.Interf | |
| podUpdated := false | ||
|
|
||
| if !agentSidecarExists { | ||
| agentSidecarContainer := getDefaultSidecarTemplate(w.containerRegistry, w.datadogConfig) | ||
|
There was a problem hiding this comment. the So my suggestion is to make the and do it for any other option value that we get with |
||
| pod.Spec.Containers = append(pod.Spec.Containers, *agentSidecarContainer) | ||
| podUpdated = true | ||
| } | ||
|
|
||
| updated, err := applyProviderOverrides(pod, w.datadogConfig) | ||
| if err != nil { | ||
| log.Errorf("Failed to apply provider overrides: %v", err) | ||
| return podUpdated, errors.New(metrics.InvalidInput) | ||
|
|
@@ -145,7 +148,7 @@ func (w *Webhook) injectAgentSidecar(pod *corev1.Pod, _ string, _ dynamic.Interf | |
| // highest override-priority. They only apply to the agent sidecar container. | ||
| for i := range pod.Spec.Containers { | ||
| if pod.Spec.Containers[i].Name == agentSidecarContainerName { | ||
| updated, err = applyProfileOverrides(&pod.Spec.Containers[i], w.datadogConfig) | ||
| if err != nil { | ||
| log.Errorf("Failed to apply profile overrides: %v", err) | ||
| return podUpdated, errors.New(metrics.InvalidInput) | ||
|
|
@@ -158,14 +161,14 @@ func (w *Webhook) injectAgentSidecar(pod *corev1.Pod, _ string, _ dynamic.Interf | |
| return podUpdated, nil | ||
| } | ||
|
|
||
| func getDefaultSidecarTemplate(containerRegistry string, datadogConfig config.Component) *corev1.Container { | ||
| ddSite := os.Getenv("DD_SITE") | ||
| if ddSite == "" { | ||
| ddSite = pkgconfigsetup.DefaultSite | ||
| } | ||
|
|
||
| imageName := datadogConfig.GetString("admission_controller.agent_sidecar.image_name") | ||
| imageTag := datadogConfig.GetString("admission_controller.agent_sidecar.image_tag") | ||
|
|
||
| agentContainer := &corev1.Container{ | ||
| Env: []corev1.EnvVar{ | ||
|
|
@@ -199,7 +202,7 @@ func getDefaultSidecarTemplate(containerRegistry string) *corev1.Container { | |
| }, | ||
| { | ||
| Name: "DD_LANGUAGE_DETECTION_ENABLED", | ||
| Value: strconv.FormatBool(datadogConfig.GetBool("language_detection.enabled") && datadogConfig.GetBool("language_detection.reporting.enabled")), | ||
| }, | ||
| }, | ||
| Image: fmt.Sprintf("%s/%s:%s", containerRegistry, imageName, imageTag), | ||
|
|
@@ -217,11 +220,11 @@ func getDefaultSidecarTemplate(containerRegistry string) *corev1.Container { | |
| }, | ||
| } | ||
|
|
||
| clusterAgentEnabled := datadogConfig.GetBool("admission_controller.agent_sidecar.cluster_agent.enabled") | ||
|
|
||
| if clusterAgentEnabled { | ||
| clusterAgentCmdPort := datadogConfig.GetInt("cluster_agent.cmd_port") | ||
| clusterAgentServiceName := datadogConfig.GetString("cluster_agent.kubernetes_service_name") | ||
|
|
||
| _, _ = withEnvOverrides(agentContainer, corev1.EnvVar{ | ||
| Name: "DD_CLUSTER_AGENT_ENABLED", | ||
|
|
@@ -249,12 +252,12 @@ func getDefaultSidecarTemplate(containerRegistry string) *corev1.Container { | |
| } | ||
|
|
||
| // labelSelectors returns the mutating webhooks object selectors based on the configuration | ||
| func labelSelectors(datadogConfig config.Component) (namespaceSelector, objectSelector *metav1.LabelSelector) { | ||
| // Read and parse selectors | ||
| selectorsJSON := datadogConfig.GetString("admission_controller.agent_sidecar.selectors") | ||
|
|
||
| // Get sidecar profiles | ||
| _, err := loadSidecarProfiles(datadogConfig) | ||
| if err != nil { | ||
| log.Errorf("encountered issue when loading sidecar profiles: %s", err) | ||
| return nil, nil | ||
|
|
@@ -273,7 +276,7 @@ func labelSelectors() (namespaceSelector, objectSelector *metav1.LabelSelector) | |
| return nil, nil | ||
| } | ||
|
|
||
| provider := datadogConfig.GetString("admission_controller.agent_sidecar.provider") | ||
| if !providerIsSupported(provider) { | ||
| log.Errorf("agent sidecar provider is not supported: %v", provider) | ||
| return nil, nil | ||
|
|
||
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is great to now have access to the
config.Componentin thenewWebhook()function. However, instead of keeping a "pointer" to the config in theWebhookstruct to get config option values later in other functions, all the values should be extracted in this function and be stored in thisWebhookstruct.I will give more details in next comments