add PVC in the owner chain

Author: MatousJobanek

controllers/idler/idler_controller.go

@@ -67,7 +67,7 @@ type Reconciler struct {
 //+kubebuilder:rbac:groups=toolchain.dev.openshift.com,resources=idlers/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=toolchain.dev.openshift.com,resources=idlers/finalizers,verbs=update
 
-//+kubebuilder:rbac:groups="",resources=pods;replicationcontrollers,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups="",resources=pods;replicationcontrollers;persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;replicasets;statefulsets,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=apps.openshift.io,resources=deploymentconfigs,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create;update;patch;delete

controllers/idler/idler_controller_test.go

@@ -1003,7 +1003,14 @@ func preparePayloads(t *testing.T, clients *memberoperatortest.FakeClientSet, na
 	dv.SetName(fmt.Sprintf("%s%s-datavolume", namePrefix, namespace))
 	dv.SetNamespace(namespace)
 	createObjectWithDynamicClient(t, clients.DynamicClient, dv)
-	controlledPods = createPods(t, clients.AllNamespacesClient, dv, sTime, controlledPods, noRestart())
+	// PersistentVolumeClaim owned by DataVolume
+	dvPvc := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("%s-pvc", dv.GetName()), Namespace: namespace},
+	}
+	err := controllerutil.SetControllerReference(dv, dvPvc, scheme.Scheme)
+	require.NoError(t, err)
+	createObjectWithDynamicClient(t, clients.DynamicClient, dvPvc)
+	controlledPods = createPods(t, clients.AllNamespacesClient, dvPvc, sTime, controlledPods, noRestart())
 
 	// StatefulSet
 	sts := &appsv1.StatefulSet{
@@ -1023,7 +1030,7 @@ func preparePayloads(t *testing.T, clients *memberoperatortest.FakeClientSet, na
 		ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("%s-replicationcontroller", dc.Name), Namespace: namespace},
 		Spec:       corev1.ReplicationControllerSpec{Replicas: &replicas},
 	}
-	err := controllerutil.SetControllerReference(dc, rc, scheme.Scheme)
+	err = controllerutil.SetControllerReference(dc, rc, scheme.Scheme)
 	require.NoError(t, err)
 	createObjectWithDynamicClient(t, clients.DynamicClient, rc)
 	controlledPods = createPods(t, clients.AllNamespacesClient, rc, sTime, controlledPods, noRestart())

controllers/idler/owners_test.go

@@ -159,7 +159,9 @@ var testConfigs = map[string]createTestConfigFunc{
 	},
 	"DataVolume": func(plds payloads) payloadTestConfig {
 		return payloadTestConfig{
-			podOwnerName:    plds.dataVolume.GetName(),
+			// We are testing the case with nested controllers (DataVolume -> PersistentVolumeClaim -> Pod) here,
+			// so the pod's owner is PersistentVolumeClaim but the expected scaled app is the parent DataVolume.
+			podOwnerName:    fmt.Sprintf("%s-pvc", plds.dataVolume.GetName()),
 			expectedAppName: plds.dataVolume.GetName(),
 			ownerScaledUp: func(assertion *test.IdleablePayloadAssertion) {
 				assertion.DataVolumeExists(plds.dataVolume)