[CECO-570] Add operator introspection

controllers/datadogagent/controller.go

@@ -75,6 +75,7 @@ type Reconciler struct {
 	client       client.Client
 	versionInfo  *version.Info
 	platformInfo kubernetes.PlatformInfo
+	profiles     *kubernetes.Profiles
 	scheme       *runtime.Scheme
 	log          logr.Logger
 	recorder     record.EventRecorder
@@ -83,12 +84,14 @@ type Reconciler struct {
 
 // NewReconciler returns a reconciler for DatadogAgent
 func NewReconciler(options ReconcilerOptions, client client.Client, versionInfo *version.Info, platformInfo kubernetes.PlatformInfo,
-	scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder, metricForwarder datadog.MetricForwardersManager) (*Reconciler, error) {
+	profiles *kubernetes.Profiles, scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder,
+	metricForwarder datadog.MetricForwardersManager) (*Reconciler, error) {
 	return &Reconciler{
 		options:      options,
 		client:       client,
 		versionInfo:  versionInfo,
 		platformInfo: platformInfo,
+		profiles:     profiles,
 		scheme:       scheme,
 		log:          log,
 		recorder:     recorder,

controllers/datadogagent/controller_reconcile_agent.go

@@ -7,6 +7,7 @@ package datadogagent
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/DataDog/datadog-operator/apis/datadoghq/common/v1"
@@ -16,6 +17,7 @@ import (
 	"github.com/DataDog/datadog-operator/controllers/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/controllers/datadogagent/override"
 	"github.com/DataDog/datadog-operator/pkg/controller/utils/datadog"
+	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 
 	edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1"
 	"github.com/go-logr/logr"
@@ -31,6 +33,7 @@ func (r *Reconciler) reconcileV2Agent(logger logr.Logger, requiredComponents fea
 	var eds *edsv1alpha1.ExtendedDaemonSet
 	var daemonset *appsv1.DaemonSet
 	var podManagers feature.PodTemplateManagers
+	var err error
 
 	daemonsetLogger := logger.WithValues("component", datadoghqv2alpha1.NodeAgentComponentName)
 
@@ -78,7 +81,38 @@ func (r *Reconciler) reconcileV2Agent(logger logr.Logger, requiredComponents fea
 			}
 			return r.cleanupV2ExtendedDaemonSet(daemonsetLogger, dda, eds, newStatus)
 		}
-		return r.createOrUpdateExtendedDaemonset(daemonsetLogger, dda, eds, newStatus, updateEDSStatusV2WithAgent)
+
+		providersList := r.profiles.GetProviders()
+		switch {
+		case len(*providersList) == 1:
+			for provider := range *providersList {
+				eds.Spec.Template = *override.Provider(&eds.Spec.Template, provider, features)
+				return r.createOrUpdateExtendedDaemonset(daemonsetLogger, dda, eds, newStatus, updateEDSStatusV2WithAgent)
+			}
+		case len(*providersList) > 1:
+			var e error
+			for p := range *providersList {
+				edsCopy := eds.DeepCopy()
+				podTemplate := edsCopy.Spec.Template
+				edsCopy.Spec.Template = *override.Provider(&podTemplate, p, features)
+
+				// use provider-specific name
+				edsCopy.Name = fmt.Sprintf("%s-%s", edsCopy.Name, p.ComponentName)
+				// add provider-specific node selector
+				nodeSelector := kubernetes.GenerateNodeSelector(p)
+				edsCopy.Spec.Template.Spec.NodeSelector = nodeSelector
+
+				result, e = r.createOrUpdateExtendedDaemonset(daemonsetLogger, dda, edsCopy, newStatus, updateEDSStatusV2WithAgent)
+				if e != nil {
+					return result, e
+				}
+			}
+			return result, e
+		default:
+			return r.createOrUpdateExtendedDaemonset(daemonsetLogger, dda, eds, newStatus, updateEDSStatusV2WithAgent)
+		}
+
+		return reconcile.Result{}, err
 	}
 
 	// Start by creating the Default Agent daemonset
@@ -118,7 +152,38 @@ func (r *Reconciler) reconcileV2Agent(logger logr.Logger, requiredComponents fea
 		}
 		return r.cleanupV2DaemonSet(daemonsetLogger, dda, daemonset, newStatus)
 	}
-	return r.createOrUpdateDaemonset(daemonsetLogger, dda, daemonset, newStatus, updateDSStatusV2WithAgent)
+
+	providersList := r.profiles.GetProviders()
+	switch {
+	case len(*providersList) == 1:
+		for provider := range *providersList {
+			daemonset.Spec.Template = *override.Provider(&daemonset.Spec.Template, provider, features)
+			return r.createOrUpdateDaemonset(daemonsetLogger, dda, daemonset, newStatus, updateDSStatusV2WithAgent)
+		}
+	case len(*providersList) > 1:
+		var e error
+		for p := range *providersList {
+			dsCopy := daemonset.DeepCopy()
+			podTemplate := dsCopy.Spec.Template
+			dsCopy.Spec.Template = *override.Provider(&podTemplate, p, features)
+
+			// use provider-specific name
+			dsCopy.Name = fmt.Sprintf("%s-%s", dsCopy.Name, p.ComponentName)
+			// add provider-specific node selector
+			nodeSelector := kubernetes.GenerateNodeSelector(p)
+			dsCopy.Spec.Template.Spec.NodeSelector = nodeSelector
+
+			result, e = r.createOrUpdateDaemonset(daemonsetLogger, dda, dsCopy, newStatus, updateDSStatusV2WithAgent)
+			if e != nil {
+				return result, e
+			}
+		}
+		return result, e
+	default:
+		return r.createOrUpdateDaemonset(daemonsetLogger, dda, daemonset, newStatus, updateDSStatusV2WithAgent)
+	}
+
+	return reconcile.Result{}, err
 }
 
 func updateDSStatusV2WithAgent(dda *appsv1.DaemonSet, newStatus *datadoghqv2alpha1.DatadogAgentStatus, updateTime metav1.Time, status metav1.ConditionStatus, reason, message string) {

controllers/datadogagent/merger/fake/volume_manager.go

@@ -56,3 +56,14 @@ func NewFakeVolumeManager(t testing.TB) *VolumeManager {
 		t:       t,
 	}
 }
+
+// RemoveVolume provides a mock function with given fields: volume
+func (_m *VolumeManager) RemoveVolume(volume string) {
+	for id, cVolume := range _m.Volumes {
+		if volume == cVolume.Name {
+			updatedVolumes := make([]*v1.Volume, 0, len(_m.Volumes)-1)
+			updatedVolumes = append(updatedVolumes, _m.Volumes[:id]...)
+			_m.Volumes = append(updatedVolumes, _m.Volumes[id+1:]...)
+		}
+	}
+}

controllers/datadogagent/merger/fake/volume_mount_manager.go

@@ -53,6 +53,17 @@ func (_m *VolumeMountManager) AddVolumeMountToContainerWithMergeFunc(volumeMount
 	return _m.volumeMountMerge(containerName, volumeMount, volumeMountMergeFunc)
 }
 
+// RemoveVolumeMount provides a mock function with given fields: volumeMount
+func (_m *VolumeMountManager) RemoveVolumeMount(volumeMount string) {
+	for id, v := range _m.VolumeMountsByC[AllContainers] {
+		if v.Name == volumeMount {
+			updatedVolumeMounts := make([]*v1.VolumeMount, 0, len(_m.VolumeMountsByC[AllContainers])-1)
+			updatedVolumeMounts = append(updatedVolumeMounts, _m.VolumeMountsByC[AllContainers][:id]...)
+			_m.VolumeMountsByC[AllContainers] = append(updatedVolumeMounts, _m.VolumeMountsByC[AllContainers][id+1:]...)
+		}
+	}
+}
+
 func (_m *VolumeMountManager) volumeMountMerge(containerName commonv1.AgentContainerName, volume *v1.VolumeMount, volumeMergeFunc merger.VolumeMountMergeFunction) error {
 	found := false
 	idFound := 0

controllers/datadogagent/merger/volume.go

@@ -18,6 +18,8 @@ type VolumeManager interface {
 	// Add the volume to the PodTemplate.
 	// Provide merge functions if the merge is specific.
 	AddVolumeWithMergeFunc(volume *corev1.Volume, volumeMergeFunc VolumeMergeFunction) error
+	// RemoveVolume removes a volume from the PodTemplate.
+	RemoveVolume(volume string)
 }
 
 // NewVolumeManager returns a new instance of the VolumeManager
@@ -146,3 +148,14 @@ func mergeMode(a, b *int32) *int32 {
 	}
 	return a
 }
+
+// RemoveVolume removes a volume from the PodTemplate
+func (impl *volumeManagerImpl) RemoveVolume(volume string) {
+	for id, cVolume := range impl.podTmpl.Spec.Volumes {
+		if volume == cVolume.Name {
+			updatedVolumes := make([]corev1.Volume, 0, len(impl.podTmpl.Spec.Volumes)-1)
+			updatedVolumes = append(updatedVolumes, impl.podTmpl.Spec.Volumes[:id]...)
+			impl.podTmpl.Spec.Volumes = append(updatedVolumes, impl.podTmpl.Spec.Volumes[id+1:]...)
+		}
+	}
+}

controllers/datadogagent/merger/volume_mount.go

@@ -23,6 +23,8 @@ type VolumeMountManager interface {
 	// Add the volumeMount to the container matching the containerName.
 	// Provide merge functions if the merge is specific.
 	AddVolumeMountToContainerWithMergeFunc(volumeMount *corev1.VolumeMount, containerName commonv1.AgentContainerName, volumeMountMergeFunc VolumeMountMergeFunction) error
+	// Remove the volumeMount from all containers of the PodTemplate.
+	RemoveVolumeMount(volumeMount string)
 }
 
 // NewVolumeMountManager returns a new instance of the VolumeMountManager
@@ -128,3 +130,21 @@ func IgnoreNewVolumeMountMergeFunction(current, newVolumeMount *corev1.VolumeMou
 func ErrorOnMergeAttemptdVolumeMountMergeFunction(current, newVolumeMount *corev1.VolumeMount) (*corev1.VolumeMount, error) {
 	return nil, errMergeAttempted
 }
+
+// RemoveVolumeMount removes a volumeMount from all containers of the PodTemplate
+func (impl *volumeMountManagerImpl) RemoveVolumeMount(volumeMount string) {
+	for id := range impl.podTmpl.Spec.Containers {
+		RemoveVolumeMountFromContainer(&impl.podTmpl.Spec.Containers[id], volumeMount)
+	}
+}
+
+// RemoveVolumeMountFromContainer removes a volumeMount from a specific container
+func RemoveVolumeMountFromContainer(container *corev1.Container, volumeMount string) {
+	for id, cVolumeMount := range container.VolumeMounts {
+		if volumeMount == cVolumeMount.Name {
+			updatedVolumeMounts := make([]corev1.VolumeMount, 0, len(container.VolumeMounts)-1)
+			updatedVolumeMounts = append(updatedVolumeMounts, container.VolumeMounts[:id]...)
+			container.VolumeMounts = append(updatedVolumeMounts, container.VolumeMounts[id+1:]...)
+		}
+	}
+}

controllers/datadogagent/merger/volume_mount_test.go

@@ -120,3 +120,74 @@ func TestAddVolumeMountToContainer(t *testing.T) {
 		})
 	}
 }
+
+func TestRemoveVolumeMountFromContainer(t *testing.T) {
+	volumemountFoo := &corev1.VolumeMount{
+		Name:      "foo",
+		MountPath: "/path/foo",
+	}
+	volumemountFoo2 := &corev1.VolumeMount{
+		Name:      "foo2",
+		MountPath: "/path/foo2",
+	}
+	volumemountBar := &corev1.VolumeMount{
+		Name:      "bar",
+		MountPath: "/path/bar",
+	}
+	type args struct {
+		container   *corev1.Container
+		volumemount string
+	}
+	tests := []struct {
+		name string
+		args args
+		want []corev1.VolumeMount
+	}{
+		{
+			name: "container.volumeMount is empty",
+			args: args{
+				container:   &corev1.Container{},
+				volumemount: "foo",
+			},
+			want: nil,
+		},
+		{
+			name: "one existing volumemount",
+			args: args{
+				container: &corev1.Container{
+					VolumeMounts: []corev1.VolumeMount{*volumemountFoo},
+				},
+				volumemount: "foo",
+			},
+			want: []corev1.VolumeMount{},
+		},
+		{
+			name: "multiple existing volumemounts",
+			args: args{
+				container: &corev1.Container{
+					VolumeMounts: []corev1.VolumeMount{*volumemountFoo, *volumemountFoo2, *volumemountBar},
+				},
+				volumemount: "foo2",
+			},
+			want: []corev1.VolumeMount{*volumemountFoo, *volumemountBar},
+		},
+		{
+			name: "remove nonexistent volumemounts",
+			args: args{
+				container: &corev1.Container{
+					VolumeMounts: []corev1.VolumeMount{*volumemountFoo, *volumemountFoo2, *volumemountBar},
+				},
+				volumemount: "bar2",
+			},
+			want: []corev1.VolumeMount{*volumemountFoo, *volumemountFoo2, *volumemountBar},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			RemoveVolumeMountFromContainer(tt.args.container, tt.args.volumemount)
+			if !reflect.DeepEqual(tt.args.container.VolumeMounts, tt.want) {
+				t.Errorf("RemoveVolumeMountFromContainer() = %v, want %v", tt.args.container.VolumeMounts, tt.want)
+			}
+		})
+	}
+}