Merge pull request rancher#29 from crobby/migrationreview25

Store skipped/missing user count in configmap and do not store the actual list on the authconfig object

pkg/agent/clean/adunmigration/ldap.go

@@ -275,7 +275,10 @@ func updateADConfigMigrationStatus(status map[string]string, sc *config.ScaledCo
 		annotations = make(map[string]string)
 	}
 	for annotation, value := range status {
-		annotations[adGUIDMigrationPrefix+annotation] = value
+		// We do not mirror the actual user lists to the AuthConfig
+		if annotation != migrateStatusSkipped && annotation != migrateStatusMissing {
+			annotations[adGUIDMigrationPrefix+annotation] = value
+		}
 	}
 	storedADConfig.SetAnnotations(annotations)
 

pkg/agent/clean/adunmigration/migrate.go

@@ -8,6 +8,8 @@ package adunmigration
 import (
 	"context"
 	"fmt"
+	"strconv"
+	"strings"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -42,6 +44,7 @@ const (
 	AttributeObjectGUID       = "objectGUID"
 	migrateStatusSkipped      = "skippedUsers"
 	migrateStatusMissing      = "missingUsers"
+	migrateStatusCountSuffix  = "Count"
 	migrationStatusPercentage = "percentDone"
 	migrationStatusLastUpdate = "statusLastUpdated"
 )
@@ -487,13 +490,16 @@ func updateUnmigratedUsers(user string, status string, reset bool, sc *config.Sc
 	var currentList string
 	if reset {
 		delete(cm.Data, status)
+		delete(cm.Data, status+migrateStatusCountSuffix)
 	} else {
 		currentList = cm.Data[status]
 		if currentList == "" {
 			currentList = currentList + user
 		} else {
 			currentList = currentList + "," + user
 		}
+		count := strconv.Itoa(len(strings.Split(currentList, ",")))
+		cm.Data[status+migrateStatusCountSuffix] = count
 		cm.Data[status] = currentList
 	}