From 9eceb8ae6bf62bca782a50c7789540fa7ed75838 Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Thu, 13 May 2021 09:44:25 -0400 Subject: [PATCH] Delete syncer-system namespace on cleanup --- pkg/reconciler/cluster/cluster.go | 2 +- pkg/reconciler/cluster/syncer.go | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkg/reconciler/cluster/cluster.go b/pkg/reconciler/cluster/cluster.go index a8b472ed425..6ba6bc1547e 100644 --- a/pkg/reconciler/cluster/cluster.go +++ b/pkg/reconciler/cluster/cluster.go @@ -239,7 +239,7 @@ func (c *Controller) cleanup(ctx context.Context, deletedCluster *v1alpha1.Clust return } - uninstallSyncer(ctx, client, logicalCluster) + uninstallSyncer(ctx, client) case SyncerModePush: s, ok := c.syncers[deletedCluster.Name] if !ok { diff --git a/pkg/reconciler/cluster/syncer.go b/pkg/reconciler/cluster/syncer.go index be5801a7339..817829baf2a 100644 --- a/pkg/reconciler/cluster/syncer.go +++ b/pkg/reconciler/cluster/syncer.go @@ -142,7 +142,7 @@ func installSyncer(ctx context.Context, client kubernetes.Interface, syncerImage args = append(args, resourcesToSync...) var one int32 = 1 - // Create or Update Pod + // Create or Update Deployment deployment := &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Namespace: syncerNS, @@ -211,14 +211,10 @@ func installSyncer(ctx context.Context, client kubernetes.Interface, syncerImage return nil } -// uninstallSyncer uninstalls the syncer image from the target cluster. -func uninstallSyncer(ctx context.Context, client kubernetes.Interface, logicalCluster string) { - if err := client.CoreV1().ConfigMaps(syncerNS).Delete(ctx, syncerConfigMapName(logicalCluster), metav1.DeleteOptions{}); err != nil { - klog.Error(err) - } - - if err := client.AppsV1().Deployments(syncerNS).Delete(ctx, syncerWorkloadName(logicalCluster), metav1.DeleteOptions{}); err != nil { - klog.Error(err) +// uninstallSyncer uninstalls the syncer from the target cluster by deleting the syncer namespace. +func uninstallSyncer(ctx context.Context, client kubernetes.Interface) { + if err := client.CoreV1().Namespaces().Delete(ctx, syncerNS, metav1.DeleteOptions{}); err != nil { + klog.Errorf("Deleting namespace %q: %v", syncerNS, err) } }