[datadogagent/finalizer] Delete dependencies of V2 agents

controllers/datadogagent/controller_reconcile_v2.go

@@ -10,12 +10,10 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/errors"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	datadoghqv2alpha1 "github.com/DataDog/datadog-operator/apis/datadoghq/v2alpha1"
@@ -191,13 +189,3 @@ func (r *Reconciler) updateStatusIfNeededV2(logger logr.Logger, agentdeployment
 
 	return result, currentError
 }
-
-func (r *Reconciler) finalizeDadV2(reqLogger logr.Logger, obj client.Object) {
-	dda := obj.(*datadoghqv2alpha1.DatadogAgent)
-
-	if r.options.OperatorMetricsEnabled {
-		r.forwarders.Unregister(dda)
-	}
-
-	reqLogger.Info("Successfully finalized DatadogAgent")
-}

controllers/datadogagent/controller_test.go

@@ -13,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	testutils "github.com/DataDog/datadog-operator/controllers/datadogagent/testutils"
 	"github.com/pkg/errors"
 	assert "github.com/stretchr/testify/require"
 
@@ -141,22 +142,7 @@ func TestReconcileDatadogAgent_Reconcile(t *testing.T) {
 	logf.SetLogger(zap.New(zap.UseDevMode(true)))
 
 	// Register operator types with the runtime scheme.
-	s := scheme.Scheme
-	s.AddKnownTypes(datadoghqv1alpha1.GroupVersion, &datadoghqv1alpha1.DatadogAgent{})
-	s.AddKnownTypes(edsdatadoghqv1alpha1.GroupVersion, &edsdatadoghqv1alpha1.ExtendedDaemonSet{})
-	s.AddKnownTypes(appsv1.SchemeGroupVersion, &appsv1.DaemonSet{})
-	s.AddKnownTypes(appsv1.SchemeGroupVersion, &appsv1.Deployment{})
-	s.AddKnownTypes(corev1.SchemeGroupVersion, &corev1.Secret{})
-	s.AddKnownTypes(corev1.SchemeGroupVersion, &corev1.ServiceAccount{})
-	s.AddKnownTypes(corev1.SchemeGroupVersion, &corev1.ConfigMap{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.ClusterRoleBinding{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.ClusterRole{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.Role{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.RoleBinding{})
-	s.AddKnownTypes(policyv1.SchemeGroupVersion, &policyv1.PodDisruptionBudget{})
-	s.AddKnownTypes(apiregistrationv1.SchemeGroupVersion, &apiregistrationv1.APIServiceList{})
-	s.AddKnownTypes(apiregistrationv1.SchemeGroupVersion, &apiregistrationv1.APIService{})
-	s.AddKnownTypes(networkingv1.SchemeGroupVersion, &networkingv1.NetworkPolicy{})
+	s := testutils.TestScheme(false)
 
 	defaultRequeueDuration := 15 * time.Second
 	affinity := &corev1.Affinity{

controllers/datadogagent/dependencies/store.go

@@ -41,6 +41,7 @@ type StoreClient interface {
 	GetOrCreate(kind kubernetes.ObjectKind, namespace, name string) (client.Object, bool)
 	GetVersionInfo() string
 	Delete(kind kubernetes.ObjectKind, namespace string, name string) bool
+	DeleteAll(ctx context.Context, k8sClient client.Client) []error
 }
 
 // NewStore returns a new Store instance
@@ -278,6 +279,48 @@ func (ds *Store) GetVersionInfo() string {
 	return ds.versionInfo.GitVersion
 }
 
+// DeleteAll deletes all the resources that are in the Store
+func (ds *Store) DeleteAll(ctx context.Context, k8sClient client.Client) []error {
+	ds.mutex.RLock()
+	defer ds.mutex.RUnlock()
+
+	var objsToDelete []client.Object
+
+	for _, kind := range kubernetes.GetResourcesKind(ds.supportCilium) {
+		requirementLabel, _ := labels.NewRequirement(operatorStoreLabelKey, selection.Exists, nil)
+		listOptions := &client.ListOptions{
+			LabelSelector: labels.NewSelector().Add(*requirementLabel),
+		}
+		objList := kubernetes.ObjectListFromKind(kind)
+		if err := k8sClient.List(ctx, objList, listOptions); err != nil {
+			return []error{err}
+		}
+
+		items, err := apimeta.ExtractList(objList)
+		if err != nil {
+			return []error{err}
+		}
+
+		for _, objAPIServer := range items {
+			objMeta, _ := apimeta.Accessor(objAPIServer)
+
+			idObj := buildID(objMeta.GetNamespace(), objMeta.GetName())
+			if _, found := ds.deps[kind][idObj]; found {
+				partialObj := &metav1.PartialObjectMetadata{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      objMeta.GetName(),
+						Namespace: objMeta.GetNamespace(),
+					},
+				}
+				partialObj.TypeMeta.SetGroupVersionKind(objAPIServer.GetObjectKind().GroupVersionKind())
+				objsToDelete = append(objsToDelete, partialObj)
+			}
+		}
+	}
+
+	return deleteObjects(ctx, k8sClient, objsToDelete)
+}
+
 func listObjectToDelete(objList client.ObjectList, cacheObjects map[string]client.Object) ([]client.Object, error) {
 	items, err := apimeta.ExtractList(objList)
 	if err != nil {

controllers/datadogagent/dependencies/store_test.go

@@ -11,9 +11,11 @@ import (
 	"testing"
 
 	"github.com/DataDog/datadog-operator/apis/datadoghq/v2alpha1"
+	testutils "github.com/DataDog/datadog-operator/controllers/datadogagent/testutils"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 	assert "github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -585,3 +587,132 @@ func TestStore_GetOrCreate(t *testing.T) {
 		})
 	}
 }
+
+func TestStore_DeleteAll(t *testing.T) {
+	testConfigMap1 := &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "ConfigMap",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "ns1",
+			Name:      "some_name",
+			Labels: map[string]string{
+				operatorStoreLabelKey: "true",
+			},
+		},
+	}
+
+	testConfigMap2 := &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "ConfigMap",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "ns2",
+			Name:      "another_name",
+			Labels: map[string]string{
+				operatorStoreLabelKey: "true",
+			},
+		},
+	}
+
+	testStore := map[kubernetes.ObjectKind]map[string]client.Object{
+		kubernetes.ConfigMapKind: {
+			"ns1/some_name":    testConfigMap1,
+			"ns2/another_name": testConfigMap2,
+		},
+	}
+
+	// ConfigMap not included in testStore
+	testConfigMap3 := &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "ConfigMap",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "ns3",
+			Name:      "some_name",
+			Labels: map[string]string{
+				operatorStoreLabelKey: "true",
+			},
+		},
+	}
+
+	tests := []struct {
+		name                          string
+		dependenciesStore             map[kubernetes.ObjectKind]map[string]client.Object
+		existingObjects               []client.Object
+		objectsExpectedToBeDeleted    []client.Object
+		objectsExpectedNotToBeDeleted []client.Object
+	}{
+		{
+			name:              "deletes all the objects in the store",
+			dependenciesStore: testStore,
+			existingObjects: []client.Object{
+				testConfigMap1,
+				testConfigMap2,
+			},
+			objectsExpectedToBeDeleted: []client.Object{
+				testConfigMap1,
+				testConfigMap2,
+			},
+		},
+		{
+			name:              "does not delete objects that are not in the store",
+			dependenciesStore: testStore,
+			existingObjects: []client.Object{
+				testConfigMap1,
+				testConfigMap2,
+				testConfigMap3, // Not in dependenciesStore
+			},
+			objectsExpectedToBeDeleted: []client.Object{
+				testConfigMap1,
+				testConfigMap2,
+			},
+			objectsExpectedNotToBeDeleted: []client.Object{
+				testConfigMap3, // Not in dependenciesStore
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			k8sClient := fake.NewClientBuilder().
+				WithScheme(testutils.TestScheme(true)).
+				WithObjects(test.existingObjects...).
+				Build()
+
+			store := &Store{
+				deps: test.dependenciesStore,
+			}
+
+			errs := store.DeleteAll(context.TODO(), k8sClient)
+			assert.Empty(t, errs)
+
+			for _, expectedToBeDeleted := range test.objectsExpectedToBeDeleted {
+				err := k8sClient.Get(
+					context.TODO(),
+					client.ObjectKey{
+						Namespace: expectedToBeDeleted.GetNamespace(),
+						Name:      expectedToBeDeleted.GetName(),
+					},
+					&corev1.ConfigMap{}, // Adapt according to test input objects
+				)
+				assert.True(t, errors.IsNotFound(err))
+			}
+
+			for _, expectedToExist := range test.objectsExpectedNotToBeDeleted {
+				err := k8sClient.Get(
+					context.TODO(),
+					client.ObjectKey{
+						Namespace: expectedToExist.GetNamespace(),
+						Name:      expectedToExist.GetName(),
+					},
+					&corev1.ConfigMap{}, // Adapt according to test input objects
+				)
+				assert.NoError(t, err)
+			}
+		})
+	}
+}

controllers/datadogagent/feature/test/testsuite.go

@@ -4,24 +4,15 @@ import (
 	"testing"
 
 	"github.com/DataDog/datadog-operator/controllers/datadogagent/feature/fake"
+	testutils "github.com/DataDog/datadog-operator/controllers/datadogagent/testutils"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	appsv1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
-	policyv1 "k8s.io/api/policy/v1beta1"
-	rbacv1 "k8s.io/api/rbac/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-
-	edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1"
-	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
-
 	"github.com/DataDog/datadog-operator/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/datadog-operator/apis/datadoghq/v2alpha1"
 	"github.com/DataDog/datadog-operator/controllers/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/controllers/datadogagent/feature"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // FeatureTestSuite use define several tests on a Feature
@@ -90,33 +81,6 @@ func (suite FeatureTestSuite) Run(t *testing.T, buildFunc feature.BuildFunc) {
 	}
 }
 
-// testScheme return a runtime.Scheme for testing purpose
-func testScheme(isV2 bool) *runtime.Scheme {
-	s := runtime.NewScheme()
-	s.AddKnownTypes(edsdatadoghqv1alpha1.GroupVersion, &edsdatadoghqv1alpha1.ExtendedDaemonSet{})
-	s.AddKnownTypes(appsv1.SchemeGroupVersion, &appsv1.DaemonSet{})
-	s.AddKnownTypes(appsv1.SchemeGroupVersion, &appsv1.Deployment{})
-	s.AddKnownTypes(corev1.SchemeGroupVersion, &corev1.Secret{})
-	s.AddKnownTypes(corev1.SchemeGroupVersion, &corev1.ServiceAccount{})
-	s.AddKnownTypes(corev1.SchemeGroupVersion, &corev1.ConfigMap{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.ClusterRoleBinding{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.ClusterRole{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.Role{})
-	s.AddKnownTypes(rbacv1.SchemeGroupVersion, &rbacv1.RoleBinding{})
-	s.AddKnownTypes(policyv1.SchemeGroupVersion, &policyv1.PodDisruptionBudget{})
-	s.AddKnownTypes(apiregistrationv1.SchemeGroupVersion, &apiregistrationv1.APIServiceList{})
-	s.AddKnownTypes(apiregistrationv1.SchemeGroupVersion, &apiregistrationv1.APIService{})
-	s.AddKnownTypes(networkingv1.SchemeGroupVersion, &networkingv1.NetworkPolicy{})
-
-	if isV2 {
-		s.AddKnownTypes(v2alpha1.GroupVersion, &v2alpha1.DatadogAgent{})
-	} else {
-		s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.DatadogAgent{})
-	}
-
-	return s
-}
-
 func runTest(t *testing.T, tt FeatureTest, buildFunc feature.BuildFunc) {
 	logf.SetLogger(zap.New(zap.UseDevMode(true)))
 	logger := logf.Log.WithName(tt.Name)
@@ -155,7 +119,7 @@ func runTest(t *testing.T, tt FeatureTest, buildFunc feature.BuildFunc) {
 		}
 	}
 	if tt.StoreOption.Scheme == nil {
-		tt.StoreOption.Scheme = testScheme(isV2)
+		tt.StoreOption.Scheme = testutils.TestScheme(isV2)
 	}
 
 	// dependencies