From 95b9af71fa9c76b6c537da1d85920b7ca9c220e5 Mon Sep 17 00:00:00 2001 From: Howard Lau Date: Fri, 30 Oct 2020 02:42:34 +0000 Subject: [PATCH] ownerReference for cm Signed-off-by: Howard Lau --- controllers/controller_filer.go | 3 +++ controllers/controller_master.go | 6 ++++++ controllers/controller_volume.go | 3 +++ 3 files changed, 12 insertions(+) diff --git a/controllers/controller_filer.go b/controllers/controller_filer.go index 7df9ee6..19bc33e 100644 --- a/controllers/controller_filer.go +++ b/controllers/controller_filer.go @@ -88,6 +88,9 @@ func (r *SeaweedReconciler) ensureFilerConfigMap(seaweedCR *seaweedv1.Seaweed) ( log := r.Log.WithValues("sw-filer-configmap", seaweedCR.Name) filerConfigMap := r.createFilerConfigMap(seaweedCR) + if err := controllerutil.SetControllerReference(seaweedCR, filerConfigMap, r.Scheme); err != nil { + return ReconcileResult(err) + } _, err := r.CreateOrUpdateConfigMap(filerConfigMap) log.Info("Get filer ConfigMap " + filerConfigMap.Name) diff --git a/controllers/controller_master.go b/controllers/controller_master.go index 1bb90d6..276222c 100644 --- a/controllers/controller_master.go +++ b/controllers/controller_master.go @@ -82,6 +82,9 @@ func (r *SeaweedReconciler) ensureMasterConfigMap(seaweedCR *seaweedv1.Seaweed) log := r.Log.WithValues("sw-master-configmap", seaweedCR.Name) masterConfigMap := r.createMasterConfigMap(seaweedCR) + if err := controllerutil.SetControllerReference(seaweedCR, masterConfigMap, r.Scheme); err != nil { + return ReconcileResult(err) + } _, err := r.CreateOrUpdateConfigMap(masterConfigMap) log.Info("Get master ConfigMap " + masterConfigMap.Name) @@ -105,6 +108,9 @@ func (r *SeaweedReconciler) ensureMasterPeerService(seaweedCR *seaweedv1.Seaweed log := r.Log.WithValues("sw-master-peer-service", seaweedCR.Name) masterPeerService := r.createMasterPeerService(seaweedCR) + if err := controllerutil.SetControllerReference(seaweedCR, masterPeerService, r.Scheme); err != nil { + return ReconcileResult(err) + } _, err := r.CreateOrUpdateService(masterPeerService) log.Info("Get master peer service " + masterPeerService.Name) diff --git a/controllers/controller_volume.go b/controllers/controller_volume.go index c9de951..5811a3e 100644 --- a/controllers/controller_volume.go +++ b/controllers/controller_volume.go @@ -56,6 +56,9 @@ func (r *SeaweedReconciler) ensureVolumeServerPeerService(seaweedCR *seaweedv1.S log := r.Log.WithValues("sw-volume-peer-service", seaweedCR.Name) volumeServerPeerService := r.createVolumeServerPeerService(seaweedCR) + if err := controllerutil.SetControllerReference(seaweedCR, volumeServerPeerService, r.Scheme); err != nil { + return ReconcileResult(err) + } _, err := r.CreateOrUpdateService(volumeServerPeerService) log.Info("ensure volume peer service " + volumeServerPeerService.Name)