Merge pull request #25 from adyanth/bug-24

🐛 Update labels instead of overwriting them
adyanth · Feb 22, 2022 · 97d52aa · 97d52aa
2 parents 1c8ca60 + b1922a1
commit 97d52aa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/controllers/clustertunnel_controller.go b/controllers/clustertunnel_controller.go
@@ -283,7 +283,9 @@ func (r *ClusterTunnelReconciler) cleanupTunnel() (ctrl.Result, bool, error) {
 }
 
 func (r *ClusterTunnelReconciler) updateTunnelStatus() error {
-	r.tunnel.Labels = labelsForClusterTunnel(*r.tunnel)
+	for k, v := range labelsForClusterTunnel(*r.tunnel) {
+		r.tunnel.Labels[k] = v
+	}
 	if err := r.Update(r.ctx, r.tunnel); err != nil {
 		return err
 	}

diff --git a/controllers/service_controller.go b/controllers/service_controller.go
@@ -277,7 +277,9 @@ func (r *ServiceReconciler) creationLogic() error {
 	}
 
 	// Add labels for Service
-	r.service.Labels = r.labelsForService()
+	for k, v := range r.labelsForService() {
+		r.service.Labels[k] = v
+	}
 
 	// Update Service resource
 	if err := r.Update(r.ctx, r.service); err != nil {

diff --git a/controllers/tunnel_controller.go b/controllers/tunnel_controller.go
@@ -278,7 +278,9 @@ func (r *TunnelReconciler) cleanupTunnel() (ctrl.Result, bool, error) {
 }
 
 func (r *TunnelReconciler) updateTunnelStatus() error {
-	r.tunnel.Labels = labelsForTunnel(*r.tunnel)
+	for k, v := range labelsForTunnel(*r.tunnel) {
+		r.tunnel.Labels[k] = v
+	}
 	if err := r.Update(r.ctx, r.tunnel); err != nil {
 		return err
 	}