Merge pull request rancher#27315 from ibuildthecloud/master

Move randomtoken and namespace

app/authconfig_data.go

@@ -8,10 +8,10 @@ import (
 	"github.com/rancher/rancher/pkg/auth/providers/ldap"
 	localprovider "github.com/rancher/rancher/pkg/auth/providers/local"
 	"github.com/rancher/rancher/pkg/auth/providers/saml"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	client "github.com/rancher/types/client/management/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

app/global_namespace.go

@@ -3,9 +3,9 @@ package app
 import (
 	"fmt"
 
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/settings"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 
 	corev1 "k8s.io/api/core/v1"

go.mod

@@ -89,7 +89,7 @@ require (
 	github.com/rancher/security-scan v0.1.7-0.20200222041501-f7377f127168
 	github.com/rancher/steve v0.0.0-20200518163824-9e4ed62a470a
 	github.com/rancher/system-upgrade-controller v0.4.1-0.20200326220202-4655d4a551bd
-	github.com/rancher/types v0.0.0-20200522181207-0db99d3f04a9
+	github.com/rancher/types v0.0.0-20200528211210-57a315b44c03
 	github.com/rancher/wrangler v0.6.2-0.20200515155908-1923f3f8ec3f
 	github.com/rancher/wrangler-api v0.6.1-0.20200515193802-dcf70881b087
 	github.com/robfig/cron v1.1.0

go.sum

@@ -908,8 +908,6 @@ github.com/rancher/remotedialer v0.2.6-0.20200403185207-c326f2656545 h1:7vAj8Zsw
 github.com/rancher/remotedialer v0.2.6-0.20200403185207-c326f2656545/go.mod h1:dbzn9NF1JWbGEHL6Q/1KG4KFROILiY/j6wmfF1Np3fk=
 github.com/rancher/rke v1.1.0-rc9.0.20200327175519-ecc629f2c3d5 h1:oFsVADIU2D2+DZaoufecjzQufwSzv2kMZa87VdFdtKA=
 github.com/rancher/rke v1.1.0-rc9.0.20200327175519-ecc629f2c3d5/go.mod h1:EsJzVba2zttfJgdk/awBWfG2yNrZvKlMlN9LwkxbM+o=
-github.com/rancher/rke v1.1.0-rc9.0.20200522005900-4295b887b37b h1:grbcaCtTC6c/3+jQrbebt3TGshGLRdkoBlWxyi9taH4=
-github.com/rancher/rke v1.1.0-rc9.0.20200522005900-4295b887b37b/go.mod h1:EsJzVba2zttfJgdk/awBWfG2yNrZvKlMlN9LwkxbM+o=
 github.com/rancher/rke v1.2.0-rc1.0.20200528044429-33480c62291d h1:i0zfiG+6VJFF7FVFtPnVCZsacvp+g8JtMJcOWPJjg9A=
 github.com/rancher/rke v1.2.0-rc1.0.20200528044429-33480c62291d/go.mod h1:EsJzVba2zttfJgdk/awBWfG2yNrZvKlMlN9LwkxbM+o=
 github.com/rancher/saml v0.0.0-20180713225824-ce1532152fde h1:+gd9up4jLeFeuNC5bHn7qfRXZO9WKtBe8b4vhucg9lg=
@@ -921,8 +919,8 @@ github.com/rancher/steve v0.0.0-20200518163824-9e4ed62a470a/go.mod h1:48ecYu5vn9
 github.com/rancher/system-upgrade-controller v0.4.1-0.20200326220202-4655d4a551bd h1:h4VDCviV2Iixfk9SjUcfzq0l+pRsvadt2QSNuoQKfxE=
 github.com/rancher/system-upgrade-controller v0.4.1-0.20200326220202-4655d4a551bd/go.mod h1:8x2eK9Q5/1c2AC9xJtNFyAyjP9ytP4uPHhGA6wajIS0=
 github.com/rancher/types v0.0.0-20200326224235-0d1e1dcc8d55/go.mod h1:k5LoTlUpefw0eAzFSJsZI0gf+C4WE41yrc1jm/MS1nM=
-github.com/rancher/types v0.0.0-20200522181207-0db99d3f04a9 h1:ABRv+NNc2+ZvBJYJtZFT+4dDBl4P1GDpPMrJ5pn8kCE=
-github.com/rancher/types v0.0.0-20200522181207-0db99d3f04a9/go.mod h1:1f9IG3X8ZreqsCNnt60wcEpGC4p8k9qYp/UZflb1DYw=
+github.com/rancher/types v0.0.0-20200528211210-57a315b44c03 h1:jiF1xMhb6WsFBVE0INCOOqlsCal2AWTzyXfc/vAQXnA=
+github.com/rancher/types v0.0.0-20200528211210-57a315b44c03/go.mod h1:1f9IG3X8ZreqsCNnt60wcEpGC4p8k9qYp/UZflb1DYw=
 github.com/rancher/wrangler v0.1.4/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xsr+XGpWyE=
 github.com/rancher/wrangler v0.4.1/go.mod h1:1cR91WLhZgkZ+U4fV9nVuXqKurWbgXcIReU4wnQvTN8=
 github.com/rancher/wrangler v0.5.0/go.mod h1:txHSBkPtVgNH/0pUCvdP0Ak0HptAOc9ffBmFxQnL4z4=

pkg/api/customization/cluster/actions_cis.go

@@ -12,8 +12,8 @@ import (
 	"github.com/rancher/norman/httperror"
 	"github.com/rancher/norman/types"
 	"github.com/rancher/rancher/pkg/controllers/user/cis"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/api/customization/cluster/actions_rketemplate.go

@@ -11,10 +11,10 @@ import (
 	"github.com/rancher/norman/parse"
 	"github.com/rancher/norman/types"
 	"github.com/rancher/rancher/pkg/controllers/management/rbac"
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/ref"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	mgmtclient "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/api/customization/cluster/validator.go

@@ -15,11 +15,11 @@ import (
 	gaccess "github.com/rancher/rancher/pkg/api/customization/globalnamespaceaccess"
 	"github.com/rancher/rancher/pkg/controllers/management/k3supgrade"
 	"github.com/rancher/rancher/pkg/controllers/user/cis"
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/settings"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	mgmtSchema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	mgmtclient "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/robfig/cron"
 )
 

pkg/api/customization/clustertemplate/cluster_template.go

@@ -15,10 +15,10 @@ import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/norman/types/values"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	managementschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	client "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/api/customization/cred/store.go

@@ -10,9 +10,9 @@ import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/rancher/pkg/api/customization/namespacedresource"
-	"github.com/rancher/rancher/pkg/namespace"
 	v1 "github.com/rancher/types/apis/core/v1"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
+	"github.com/rancher/types/namespace"
 	"k8s.io/apimachinery/pkg/labels"
 )
 

pkg/api/customization/multiclusterapp/multi_cluster_app.go

@@ -16,10 +16,10 @@ import (
 	"github.com/rancher/norman/types/convert"
 	gaccess "github.com/rancher/rancher/pkg/api/customization/globalnamespaceaccess"
 	catUtil "github.com/rancher/rancher/pkg/catalog/utils"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	managementschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	client "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/api/customization/multiclusterapp/store.go

@@ -13,10 +13,10 @@ import (
 	"github.com/rancher/rancher/pkg/auth/providers"
 	"github.com/rancher/rancher/pkg/auth/requests"
 	catUtil "github.com/rancher/rancher/pkg/catalog/utils"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	client "github.com/rancher/types/client/management/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )

pkg/api/customization/namespacedresource/store.go

@@ -7,9 +7,9 @@ import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/norman/types/values"
-	"github.com/rancher/rancher/pkg/namespace"
 	v1 "github.com/rancher/types/apis/core/v1"
 	client "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 )
 
 //NamespacedStore makes sure that the namespaced resources are assigned to a given namespace

pkg/api/customization/vsphere/handler.go

@@ -10,12 +10,12 @@ import (
 	"github.com/rancher/norman/httperror"
 	"github.com/rancher/norman/types"
 	"github.com/rancher/rancher/pkg/auth/util"
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/ref"
 	v1 "github.com/rancher/types/apis/core/v1"
 	"github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	client "github.com/rancher/types/client/management/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 	corev1 "k8s.io/api/core/v1"
 )
 

pkg/api/server/managementstored/setup.go

@@ -65,14 +65,14 @@ import (
 	"github.com/rancher/rancher/pkg/clustermanager"
 	"github.com/rancher/rancher/pkg/controllers/management/compose/common"
 	md "github.com/rancher/rancher/pkg/controllers/management/kontainerdrivermetadata"
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/nodeconfig"
 	sourcecodeproviders "github.com/rancher/rancher/pkg/pipeline/providers"
 	managementschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	projectschema "github.com/rancher/types/apis/project.cattle.io/v3/schema"
 	client "github.com/rancher/types/client/management/v3"
 	projectclient "github.com/rancher/types/client/project/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 )
 
 func Setup(ctx context.Context, apiContext *config.ScaledContext, clusterManager *clustermanager.Manager,

pkg/api/store/app/store.go

@@ -10,12 +10,12 @@ import (
 	pv3app "github.com/rancher/rancher/pkg/api/customization/app"
 	catUtil "github.com/rancher/rancher/pkg/catalog/utils"
 	hcommon "github.com/rancher/rancher/pkg/controllers/user/helm/common"
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/ref"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	mgmtschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	pv3 "github.com/rancher/types/apis/project.cattle.io/v3"
 	client "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

pkg/api/store/auth/store.go

@@ -8,9 +8,9 @@ import (
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/norman/types/values"
 	"github.com/rancher/rancher/pkg/auth/providers/common"
-	"github.com/rancher/rancher/pkg/namespace"
 	corev1 "github.com/rancher/types/apis/core/v1"
 	client "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 )
 
 var (

pkg/api/store/cluster/cluster_registration_store.go

@@ -2,7 +2,7 @@ package cluster
 
 import (
 	"github.com/rancher/norman/types"
-	"github.com/rancher/rancher/pkg/randomtoken"
+	"github.com/rancher/wrangler/pkg/randomtoken"
 )
 
 type RegistrationTokenStore struct {

pkg/api/store/cluster/cluster_store.go

@@ -28,7 +28,6 @@ import (
 	"github.com/rancher/rancher/pkg/controllers/management/clusterstatus"
 	"github.com/rancher/rancher/pkg/controllers/management/etcdbackup"
 	"github.com/rancher/rancher/pkg/controllers/management/rkeworkerupgrader"
-	"github.com/rancher/rancher/pkg/namespace"
 	nodehelper "github.com/rancher/rancher/pkg/node"
 	"github.com/rancher/rancher/pkg/ref"
 	"github.com/rancher/rancher/pkg/settings"
@@ -38,6 +37,7 @@ import (
 	managementschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	managementv3 "github.com/rancher/types/client/management/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/intstr"

pkg/api/store/globaldns/globaldnsprovider_store.go

@@ -8,8 +8,8 @@ import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/norman/types/values"
-	"github.com/rancher/rancher/pkg/namespace"
 	managementv3 "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 )
 
 func ProviderWrap(store types.Store) types.Store {

pkg/api/store/nodetemplate/store.go

@@ -10,12 +10,12 @@ import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/norman/types/values"
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/ref"
 	corev1 "github.com/rancher/types/apis/core/v1"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	managementschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	client "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/labels"
 )

pkg/api/store/password/password.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rancher/rancher/pkg/namespace"
 	v1 "github.com/rancher/types/apis/core/v1"
+	"github.com/rancher/types/namespace"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

pkg/api/store/password/store.go

@@ -6,20 +6,17 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/rancher/rancher/pkg/namespace"
-	"github.com/rancher/rancher/pkg/randomtoken"
-
-	"github.com/rancher/types/config"
-
-	"github.com/rancher/norman/types/convert"
-	"k8s.io/apimachinery/pkg/api/errors"
-
 	"github.com/rancher/norman/types"
+	"github.com/rancher/norman/types/convert"
 	v1 "github.com/rancher/types/apis/core/v1"
 	managementschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	projectschema "github.com/rancher/types/apis/project.cattle.io/v3/schema"
+	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
+	"github.com/rancher/wrangler/pkg/randomtoken"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

pkg/auth/providers/common/password.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/rancher/rancher/pkg/namespace"
 	corev1 "github.com/rancher/types/apis/core/v1"
+	"github.com/rancher/types/namespace"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/auth/providers/common/usermanager.go

@@ -13,11 +13,11 @@ import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/slice"
 	"github.com/rancher/rancher/pkg/auth/tokens"
-	"github.com/rancher/rancher/pkg/randomtoken"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	rbacv1 "github.com/rancher/types/apis/rbac.authorization.k8s.io/v1"
 	"github.com/rancher/types/config"
 	"github.com/rancher/types/user"
+	"github.com/rancher/wrangler/pkg/randomtoken"
 	"github.com/sirupsen/logrus"
 	k8srbacv1 "k8s.io/api/rbac/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

pkg/auth/providers/setup.go

@@ -6,10 +6,10 @@ import (
 	"github.com/rancher/norman/store/subtype"
 	"github.com/rancher/norman/types"
 	"github.com/rancher/rancher/pkg/api/store/auth"
-	"github.com/rancher/rancher/pkg/namespace"
 	managementschema "github.com/rancher/types/apis/management.cattle.io/v3/schema"
 	client "github.com/rancher/types/client/management/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 )
 
 var authConfigTypes = []string{

pkg/auth/tokens/manager.go

@@ -14,11 +14,11 @@ import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/rancher/pkg/auth/util"
-	"github.com/rancher/rancher/pkg/randomtoken"
 	v1 "github.com/rancher/types/apis/core/v1"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	clientv3 "github.com/rancher/types/client/management/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/wrangler/pkg/randomtoken"
 	"github.com/sirupsen/logrus"
 	apicorev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

pkg/catalog/helm/helm.go

@@ -20,10 +20,10 @@ import (
 
 	"github.com/rancher/norman/controller"
 	catUtil "github.com/rancher/rancher/pkg/catalog/utils"
-	nsutil "github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/settings"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	mgmtv3 "github.com/rancher/types/client/management/v3"
+	nsutil "github.com/rancher/types/namespace"
 
 	"github.com/blang/semver"
 	"github.com/docker/docker/pkg/locker"

pkg/catalog/manager/catalog_sync.go

@@ -2,8 +2,8 @@ package manager
 
 import (
 	helmlib "github.com/rancher/rancher/pkg/catalog/helm"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/catalog/manager/manager.go

@@ -7,11 +7,11 @@ import (
 
 	helmlib "github.com/rancher/rancher/pkg/catalog/helm"
 	"github.com/rancher/rancher/pkg/controllers/user/helm/common"
-	"github.com/rancher/rancher/pkg/namespace"
 	"github.com/rancher/rancher/pkg/settings"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	projectv3 "github.com/rancher/types/apis/project.cattle.io/v3"
 	"github.com/rancher/types/config"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/catalog/manager/traverse.go

@@ -8,9 +8,9 @@ import (
 	"github.com/rancher/norman/controller"
 	helmlib "github.com/rancher/rancher/pkg/catalog/helm"
 	cutils "github.com/rancher/rancher/pkg/catalog/utils"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
 	client "github.com/rancher/types/client/management/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

pkg/catalog/utils/utils.go

@@ -4,8 +4,8 @@ import (
 	"regexp"
 
 	"github.com/pkg/errors"
-	"github.com/rancher/rancher/pkg/namespace"
 	v3 "github.com/rancher/types/apis/management.cattle.io/v3"
+	"github.com/rancher/types/namespace"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )