From a570f857187c307445beec1b589b474ed0f64399 Mon Sep 17 00:00:00 2001
From: "Crank, Daniel (dc6350)" <dc6350@att.com>
Date: Fri, 19 Feb 2021 15:50:11 -0600
Subject: [PATCH] Update finalizer for runtime namespace

Change [0] moves the daemonset and configmap resources
for a VINO resource to the runtime namespace; this change
updates the finalizer to use the same name and namespace
for those resources at delete time.

Also updates commands at the end of the README for
examining the cluster.

[0] https://review.opendev.org/c/airship/vino/+/774549

Change-Id: If3d400f4f8a95d6413d1a8ee3805427eb0a3ead1
---
 README.md                          |  8 ++++----
 pkg/controllers/vino_controller.go | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 42d4e8e..8d6994f 100644
--- a/README.md
+++ b/README.md
@@ -139,16 +139,16 @@ vino-system   vino-controller-manager-788b994c74-sbf26    2/2     Running   0
 
 ```
 # kubectl apply -f config/samples/vino_cr.yaml
-# kubectl get pods
-# kubectl get ds
+# kubectl -n vino-system get pods
+# kubectl -n vino-system get ds
 ```
 
 delete vino CR and make sure DaemonSet is deleted as well
 
 ```
 # kubectl delete vino vino-test-cr
-# kubectl get ds
-# kubectl get cm
+# kubectl -n vino-system get ds
+# kubectl -n vino-system get cm
 ```
 
 ## Get in Touch
diff --git a/pkg/controllers/vino_controller.go b/pkg/controllers/vino_controller.go
index 288a522..5cf8fd4 100644
--- a/pkg/controllers/vino_controller.go
+++ b/pkg/controllers/vino_controller.go
@@ -366,6 +366,10 @@ func (r *VinoReconciler) getConfigMapName(vino *vinov1.Vino) string {
 	return fmt.Sprintf("%s-%s", vino.Namespace, vino.Name)
 }
 
+func (r *VinoReconciler) getDaemonSetName(vino *vinov1.Vino) string {
+	return fmt.Sprintf("%s-%s", vino.Namespace, vino.Name)
+}
+
 func (r *VinoReconciler) getCurrentConfigMap(ctx context.Context, vino *vinov1.Vino) (*corev1.ConfigMap, error) {
 	logr.FromContext(ctx).Info("Getting current config map for vino object")
 	cm := &corev1.ConfigMap{}
@@ -475,7 +479,7 @@ func (r *VinoReconciler) decorateDaemonSet(ctx context.Context, ds *appsv1.Daemo
 
 	ds.Spec.Template.Spec.NodeSelector = vino.Spec.NodeSelector.MatchLabels
 	ds.Namespace = getRuntimeNamespace()
-	ds.Name = fmt.Sprintf("%s-%s", vino.Namespace, vino.Name)
+	ds.Name = r.getDaemonSetName(vino)
 
 	found := false
 	for _, vol := range ds.Spec.Template.Spec.Volumes {
@@ -639,7 +643,7 @@ func (r *VinoReconciler) finalize(ctx context.Context, vino *vinov1.Vino) error
 	if err := r.Delete(ctx,
 		&appsv1.DaemonSet{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: vino.Name, Namespace: vino.Namespace,
+				Name: r.getDaemonSetName(vino), Namespace: getRuntimeNamespace(),
 			},
 		}); err != nil {
 		return err
@@ -647,7 +651,7 @@ func (r *VinoReconciler) finalize(ctx context.Context, vino *vinov1.Vino) error
 	if err := r.Delete(ctx,
 		&corev1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: vino.Name, Namespace: vino.Namespace,
+				Name: r.getConfigMapName(vino), Namespace: getRuntimeNamespace(),
 			},
 		}); err != nil {
 		return err