Merge branch 'uuid-unmigration' of github.com:nflynt/rancher into uui…

…d-unmigration

cleanup/ad-guid-README.md

@@ -45,7 +45,7 @@ Active Directory is not the authentication provider, this utility will take no a
 
 
 ## Additional notes
-*  The utility will create a configmap named ad-guid-migration in the cattle-system namespace.  This configmap contains
+*  The utility will create a configmap named `ad-guid-migration` in the `cattle-system` namespace.  This configmap contains
    a data entry with a key named "ad-guid-migration-status".  If the utility is currently active, that status will be
    set to "Running".  After the utility has completed, the status will be set to "Finished".  If a run is interrupted
    prior to completion, that configmap will retain the status of "Running" and subsequent attempts to run the script will

cleanup/ad-guid-unmigration.sh

@@ -177,6 +177,8 @@ if [ $# -lt 1 ]; then
   exit 1
 fi
 
+display_banner "${banner_text}"
+
 if [ "$dry_run" != true ]
 then
     # Check the Rancher version before doing anything.
@@ -194,7 +196,6 @@ then
     fi
 fi
 
-display_banner "${banner_text}"
 read -p "Do you want to continue? (y/n): " choice
 if [[ ! $choice =~ ^[Yy]$ ]]; then
     echo "Exiting..."

pkg/auth/providers/activedirectory/activedirectory_provider.go

@@ -11,6 +11,10 @@ import (
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 	"github.com/rancher/norman/types"
+	"github.com/sirupsen/logrus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
 	v32 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
 	"github.com/rancher/rancher/pkg/auth/providers/common"
 	"github.com/rancher/rancher/pkg/auth/tokens"
@@ -20,9 +24,6 @@ import (
 	v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
 	"github.com/rancher/rancher/pkg/types/config"
 	"github.com/rancher/rancher/pkg/user"
-	"github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 const (
@@ -274,8 +275,3 @@ func (p *adProvider) IsDisabledProvider() (bool, error) {
 	}
 	return !adConfig.Enabled, nil
 }
-
-// IsStatusLoginDisabledError will return true when the login is disabled due to a migration in process.
-func IsStatusLoginDisabledError(err error) bool {
-	return errors.Is(err, LoginDisabledError{})
-}