Support nested path in confd configmap (#335)

* Support nested path in `confd` configmap
* Fix conflict between `ksm-core conf` and `confd`

api/v1alpha1/datadogagent_types.go

@@ -706,6 +706,8 @@ type SyscallMonitorSpec struct {
 type ConfigDirSpec struct {
 	// ConfigMapName name of a ConfigMap used to mount a directory.
 	ConfigMapName string `json:"configMapName,omitempty"`
+	// items mapping between configMap data key and file path mount.
+	Items []corev1.KeyToPath `json:"items,omitempty"`
 }
 
 // ConfigFileConfigMapSpec contains configMap information used to store a config file.

api/v1alpha1/test/new.go

@@ -33,6 +33,7 @@ type NewDatadogAgentOptions struct {
 	Status                           *datadoghqv1alpha1.DatadogAgentStatus
 	UseEDS                           bool
 	ClusterAgentEnabled              bool
+	ClusterAgentConfd                *datadoghqv1alpha1.ClusterAgentConfig
 	MetricsServerEnabled             bool
 	MetricsServerPort                int32
 	MetricsServerEndpoint            string
@@ -182,9 +183,13 @@ func NewDefaultedDatadogAgent(ns, name string, options *NewDatadogAgentOptions)
 			ad.Spec.Agent.Security.VolumeMounts = options.VolumeMounts
 		}
 		if options.ClusterAgentEnabled {
+			config := &datadoghqv1alpha1.ClusterAgentConfig{}
+			if options.ClusterAgentConfd != nil {
+				config = options.ClusterAgentConfd
+			}
 			ad.Spec.ClusterAgent = datadoghqv1alpha1.DatadogAgentSpecClusterAgentSpec{
 				Enabled: datadoghqv1alpha1.NewBoolPointer(true),
-				Config:  &datadoghqv1alpha1.ClusterAgentConfig{},
+				Config:  config,
 				Rbac: &datadoghqv1alpha1.RbacConfig{
 					Create: datadoghqv1alpha1.NewBoolPointer(true),
 				},