check tenantid is set and correct (when upgrading kcp)

kcp-dev · Feb 8, 2023 · 5d0246d · 5d0246d
1 parent 6016ada
commit 5d0246d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/pkg/syncer/spec/spec_process.go b/pkg/syncer/spec/spec_process.go
@@ -304,6 +304,13 @@ func (c *Controller) ensureDownstreamNamespaceExists(ctx context.Context, downst
 		return fmt.Errorf("(namespace collision) namespace %s already exists, but has a different namespace locator annotation: %+v vs %+v", newNamespace.GetName(), nsLocator, desiredNSLocator)
 	}
 
+	// Handle kcp upgrades by checking the tenant ID is set and correct
+	if tenantID, ok := unstrNamespace.GetLabels()[shared.TenantIDLabel]; !ok || tenantID != desiredTenantID {
+		unstrNamespace.GetLabels()[shared.TenantIDLabel] = desiredTenantID
+		_, err := namespaces.Update(ctx, unstrNamespace, metav1.UpdateOptions{})
+		return err
+	}
+
 	return nil
 }