From 55ecff3ef0d8f73a3d559050656504f59297bb31 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Fri, 25 Oct 2019 22:16:36 +0800 Subject: [PATCH] fix unmarshall err --- internal/locking/control_plane_init_mutex.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/internal/locking/control_plane_init_mutex.go b/internal/locking/control_plane_init_mutex.go index 9286669..e392b2b 100644 --- a/internal/locking/control_plane_init_mutex.go +++ b/internal/locking/control_plane_init_mutex.go @@ -54,7 +54,7 @@ func (c *ControlPlaneInitMutex) Lock(ctx context.Context, cluster *clusterv1.Clu err := c.client.Get(ctx, client.ObjectKey{ Namespace: cluster.Namespace, Name: cmName, - }, &sema.ConfigMap) + }, sema.ConfigMap) switch { case apierrors.IsNotFound(err): break @@ -82,9 +82,8 @@ func (c *ControlPlaneInitMutex) Lock(ctx context.Context, cluster *clusterv1.Clu log.Error(err, "Failed to acquire lock while setting semaphore information") return false } - log.Info("Attempting to acquire the lock") - err = c.client.Create(ctx, &sema.ConfigMap) + err = c.client.Create(ctx, sema.ConfigMap) switch { case apierrors.IsAlreadyExists(err): log.Info("Cannot acquire the lock. The lock has been acquired by someone else") @@ -106,7 +105,7 @@ func (c *ControlPlaneInitMutex) Unlock(ctx context.Context, cluster *clusterv1.C err := c.client.Get(ctx, client.ObjectKey{ Namespace: cluster.Namespace, Name: cmName, - }, &sema.ConfigMap) + }, sema.ConfigMap) switch { case apierrors.IsNotFound(err): log.Info("Control plane init lock not found, it may have been released already") @@ -116,7 +115,7 @@ func (c *ControlPlaneInitMutex) Unlock(ctx context.Context, cluster *clusterv1.C return false default: // Delete the config map semaphore if there is no error fetching it - if err := c.client.Delete(ctx, &sema.ConfigMap); err != nil { + if err := c.client.Delete(ctx, sema.ConfigMap); err != nil { // TODO: return true on apierrors.IsNotFound log.Error(err, "Error deleting the config map underlying the control plane init lock") return false @@ -130,11 +129,11 @@ type information struct { } type semaphore struct { - apicorev1.ConfigMap + *apicorev1.ConfigMap } func newSemaphore() *semaphore { - return &semaphore{apicorev1.ConfigMap{}} + return &semaphore{&apicorev1.ConfigMap{}} } func configMapName(clusterName string) string {