set the clusterId and namespaceId correctly

Change-Id: Icb99bb9d2d7aa313e75c1087fc9f099afd5d4824