Add PodResources mount

api/datadoghq/v2alpha1/const.go

@@ -178,8 +178,9 @@ const (
 	CriSocketVolumeName     = "runtimesocketdir"
 	RuntimeDirVolumePath    = "/var/run"
 
-	KubeletAgentCAPath  = "/var/run/host-kubelet-ca.crt"
-	KubeletCAVolumeName = "kubelet-ca"
+	KubeletAgentCAPath            = "/var/run/host-kubelet-ca.crt"
+	KubeletCAVolumeName           = "kubelet-ca"
+	KubeletPodResourcesVolumeName = "kubelet-pod-resources"
 
 	APMSocketName = "apm.socket"
 

api/datadoghq/v2alpha1/datadogagent_types.go

@@ -1079,6 +1079,11 @@ type KubeletConfig struct {
 	// Default: '/var/run/host-kubelet-ca.crt' if hostCAPath is set, else '/var/run/secrets/kubernetes.io/serviceaccount/ca.crt'
 	// +optional
 	AgentCAPath string `json:"agentCAPath,omitempty"`
+
+	// PodResourcesSocket is the path to the pod resources socket, to be used to read pod resource assignments
+	// Default: `/var/lib/kubelet/pod-resources/kubelet.sock`
+	// +optional
+	PodResourcesSocket string `json:"podResourcesSocket,omitempty"`
 }
 
 // HostPortConfig contains host port configuration.

api/datadoghq/v2alpha1/envvar.go

@@ -44,6 +44,7 @@ const (
 	DDKubeResourcesNamespace               = "DD_KUBE_RESOURCES_NAMESPACE"
 	DDKubernetesResourcesLabelsAsTags      = "DD_KUBERNETES_RESOURCES_LABELS_AS_TAGS"
 	DDKubernetesResourcesAnnotationsAsTags = "DD_KUBERNETES_RESOURCES_ANNOTATIONS_AS_TAGS"
+	DDKubernetesPodResourcesSocket         = "DD_KUBERNETES_KUBELET_PODRESOURCES_SOCKET"
 	DDLeaderElection                       = "DD_LEADER_ELECTION"
 	DDLogsEnabled                          = "DD_LOGS_ENABLED"
 	DDNamespaceLabelsAsTags                = "DD_KUBERNETES_NAMESPACE_LABELS_AS_TAGS"

config/crd/bases/v1/datadoghq.com_datadogagents.yaml

@@ -2149,6 +2149,11 @@ spec:
                         hostCAPath:
                           description: HostCAPath is the host path where the kubelet CA certificate is stored.
                           type: string
+                        podResourcesSocket:
+                          description: |-
+                            PodResourcesSocket is the path to the pod resources socket, to be used to read pod resource assignments
+                            Default: `/var/lib/kubelet/pod-resources/kubelet.sock`
+                          type: string
                         tlsVerify:
                           description: |-
                             TLSVerify toggles kubelet TLS verification.

config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json

@@ -2300,6 +2300,10 @@
                   "description": "HostCAPath is the host path where the kubelet CA certificate is stored.",
                   "type": "string"
                 },
+                "podResourcesSocket": {
+                  "description": "PodResourcesSocket is the path to the pod resources socket, to be used to read pod resource assignments\nDefault: `/var/lib/kubelet/pod-resources/kubelet.sock`",
+                  "type": "string"
+                },
                 "tlsVerify": {
                   "description": "TLSVerify toggles kubelet TLS verification.\nDefault: true",
                   "type": "boolean"

docs/configuration.v2alpha1.md

@@ -228,6 +228,7 @@ spec:
 | global.kubelet.host.secretKeyRef.name | Of the referent. This field is effectively required, but due to backwards compatibility is allowed to be empty. Instances of this type with an empty value here are almost certainly wrong. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names |
 | global.kubelet.host.secretKeyRef.optional | Specify whether the Secret or its key must be defined |
 | global.kubelet.hostCAPath | HostCAPath is the host path where the kubelet CA certificate is stored. |
+| global.kubelet.podResourcesSocket | PodResourcesSocket is the path to the pod resources socket, to be used to read pod resource assignments Default: `/var/lib/kubelet/pod-resources/kubelet.sock` |
 | global.kubelet.tlsVerify | TLSVerify toggles kubelet TLS verification. Default: true |
 | global.kubernetesResourcesAnnotationsAsTags | Provide a mapping of Kubernetes Resource Groups to annotations mapping to Datadog Tags. <KUBERNETES_RESOURCE_GROUP>: 		<KUBERNETES_ANNOTATION>: <DATADOG_TAG_KEY> KUBERNETES_RESOURCE_GROUP should be in the form `{resource}.{group}` or `{resource}` (example: deployments.apps, pods) |
 | global.kubernetesResourcesLabelsAsTags | Provide a mapping of Kubernetes Resource Groups to labels mapping to Datadog Tags. <KUBERNETES_RESOURCE_GROUP>: 		<KUBERNETES_LABEL>: <DATADOG_TAG_KEY> KUBERNETES_RESOURCE_GROUP should be in the form `{resource}.{group}` or `{resource}` (example: deployments.apps, pods) |

internal/controller/datadogagent/defaults/datadogagent_default.go

@@ -115,6 +115,7 @@ const (
 
 	// defaultKubeletAgentCAPath            = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
 	// defaultKubeletAgentCAPathHostPathSet = "/var/run/host-kubelet-ca.crt"
+	defaultKubeletPodResourcesSocket = "/var/lib/kubelet/pod-resources/kubelet.sock"
 
 	defaultContainerStrategy = v2alpha1.OptimizedContainerStrategy
 
@@ -192,6 +193,14 @@ func defaultGlobalConfig(ddaSpec *v2alpha1.DatadogAgentSpec) {
 		apiutils.DefaultBooleanIfUnset(&ddaSpec.Global.FIPS.UseHTTPS, defaultFIPSUseHTTPS)
 	}
 
+	if ddaSpec.Global.Kubelet == nil {
+		ddaSpec.Global.Kubelet = &v2alpha1.KubeletConfig{}
+	}
+
+	if ddaSpec.Global.Kubelet.PodResourcesSocket == "" {
+		ddaSpec.Global.Kubelet.PodResourcesSocket = defaultKubeletPodResourcesSocket
+	}
+
 	apiutils.DefaultBooleanIfUnset(&ddaSpec.Global.RunProcessChecksInCoreAgent, defaultRunProcessChecksInCoreAgent)
 }
 

internal/controller/datadogagent/override/global.go

@@ -285,6 +285,31 @@ func applyGlobalSettings(logger logr.Logger, manager feature.PodTemplateManagers
 					Value: agentCAPath,
 				})
 			}
+			if config.Kubelet.PodResourcesSocket != "" {
+				manager.EnvVar().AddEnvVar(&corev1.EnvVar{
+					Name:  v2alpha1.DDKubernetesPodResourcesSocket,
+					Value: config.Kubelet.PodResourcesSocket,
+				})
+
+				podResourcesVol, podResourcesMount := volume.GetVolumes(v2alpha1.KubeletPodResourcesVolumeName, config.Kubelet.PodResourcesSocket, config.Kubelet.PodResourcesSocket, false)
+				if singleContainerStrategyEnabled {
+					manager.VolumeMount().AddVolumeMountToContainers(
+						&podResourcesMount,
+						[]apicommon.AgentContainerName{
+							apicommon.UnprivilegedSingleAgentContainerName,
+						},
+					)
+					manager.Volume().AddVolume(&podResourcesVol)
+				} else {
+					manager.VolumeMount().AddVolumeMountToContainers(
+						&podResourcesMount,
+						[]apicommon.AgentContainerName{
+							apicommon.CoreAgentContainerName,
+						},
+					)
+					manager.Volume().AddVolume(&podResourcesVol)
+				}
+			}
 		}
 
 		var runtimeVol corev1.Volume

internal/controller/datadogagent/override/global_test.go

@@ -32,6 +32,7 @@ import (
 const (
 	hostCAPath           = "/host/ca/path/ca.crt"
 	agentCAPath          = "/agent/ca/path/ca.crt"
+	podResourcesSocket   = "/kubelet/podresources.sock"
 	dockerSocketPath     = "/docker/socket/path/docker.sock"
 	secretBackendCommand = "foo.sh"
 	secretBackendArgs    = "bar baz"
@@ -69,7 +70,7 @@ func TestNodeAgentComponenGlobalSettings(t *testing.T) {
 			name:                           "Kubelet volume configured",
 			singleContainerStrategyEnabled: false,
 			dda: testutils.NewDatadogAgentBuilder().
-				WithGlobalKubeletConfig(hostCAPath, agentCAPath, true).
+				WithGlobalKubeletConfig(hostCAPath, agentCAPath, true, podResourcesSocket).
 				WithGlobalDockerSocketPath(dockerSocketPath).
 				BuildWithDefaults(),
 			wantEnvVars: getExpectedEnvVars([]*corev1.EnvVar{
@@ -85,6 +86,10 @@ func TestNodeAgentComponenGlobalSettings(t *testing.T) {
 					Name:  v2alpha1.DockerHost,
 					Value: "unix:///host" + dockerSocketPath,
 				},
+				{
+					Name:  v2alpha1.DDKubernetesPodResourcesSocket,
+					Value: podResourcesSocket,
+				},
 			}...),
 			wantVolumeMounts: getExpectedVolumeMounts(),
 			wantVolumes:      getExpectedVolumes(),
@@ -94,7 +99,7 @@ func TestNodeAgentComponenGlobalSettings(t *testing.T) {
 			name:                           "Kubelet volume configured",
 			singleContainerStrategyEnabled: true,
 			dda: testutils.NewDatadogAgentBuilder().
-				WithGlobalKubeletConfig(hostCAPath, agentCAPath, true).
+				WithGlobalKubeletConfig(hostCAPath, agentCAPath, true, podResourcesSocket).
 				WithGlobalDockerSocketPath(dockerSocketPath).
 				BuildWithDefaults(),
 			wantEnvVars: getExpectedEnvVars([]*corev1.EnvVar{
@@ -110,6 +115,10 @@ func TestNodeAgentComponenGlobalSettings(t *testing.T) {
 					Name:  v2alpha1.DockerHost,
 					Value: "unix:///host" + dockerSocketPath,
 				},
+				{
+					Name:  v2alpha1.DDKubernetesPodResourcesSocket,
+					Value: podResourcesSocket,
+				},
 			}...),
 			wantVolumeMounts: getExpectedVolumeMounts(),
 			wantVolumes:      getExpectedVolumes(),
@@ -314,6 +323,14 @@ func getExpectedVolumes() []*corev1.Volume {
 				},
 			},
 		},
+		{
+			Name: v2alpha1.KubeletPodResourcesVolumeName,
+			VolumeSource: corev1.VolumeSource{
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: podResourcesSocket,
+				},
+			},
+		},
 	}
 }
 
@@ -329,6 +346,11 @@ func getExpectedVolumeMounts() []*corev1.VolumeMount {
 			MountPath: "/host" + dockerSocketPath,
 			ReadOnly:  true,
 		},
+		{
+			Name:      v2alpha1.KubeletPodResourcesVolumeName,
+			MountPath: podResourcesSocket,
+			ReadOnly:  false,
+		},
 	}
 }
 

pkg/testutils/builder.go

@@ -834,11 +834,12 @@ func (builder *DatadogAgentBuilder) WithHelmCheckValuesAsTags(valuesAsTags map[s
 
 // Global Kubelet
 
-func (builder *DatadogAgentBuilder) WithGlobalKubeletConfig(hostCAPath, agentCAPath string, tlsVerify bool) *DatadogAgentBuilder {
+func (builder *DatadogAgentBuilder) WithGlobalKubeletConfig(hostCAPath, agentCAPath string, tlsVerify bool, podResourcesSocket string) *DatadogAgentBuilder {
 	builder.datadogAgent.Spec.Global.Kubelet = &v2alpha1.KubeletConfig{
-		TLSVerify:   apiutils.NewBoolPointer(tlsVerify),
-		HostCAPath:  hostCAPath,
-		AgentCAPath: agentCAPath,
+		TLSVerify:          apiutils.NewBoolPointer(tlsVerify),
+		HostCAPath:         hostCAPath,
+		AgentCAPath:        agentCAPath,
+		PodResourcesSocket: podResourcesSocket,
 	}
 	return builder
 }