leftyer/rancher
1
0
Fork 0
mirror of https://gitee.com/rancher/rancher.git synced 2025-12-06 15:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove pkg/types and move most packages as subpackages of pkg

Browse Source
This commit is contained in:
Darren Shepherd
2020-07-21 09:40:44 -07:00
parent f84031fe10
commit 04ed242d5a
139 changed files with 122 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/app.go
View File

@@ -6,6 +6,8 @@ import (
"os"
"time"
"github.com/rancher/rancher/pkg/crds/dashboard"
"github.com/rancher/norman/pkg/k8scheck"
"github.com/rancher/rancher/pkg/api/steve"
"github.com/rancher/rancher/pkg/api/steve/clusterapi"
@@ -15,7 +17,6 @@ import (
"github.com/rancher/rancher/pkg/auth/tokens"
"github.com/rancher/rancher/pkg/clustermanager"
managementController "github.com/rancher/rancher/pkg/controllers/management"
"github.com/rancher/rancher/pkg/crds"
"github.com/rancher/rancher/pkg/cron"
managementdata "github.com/rancher/rancher/pkg/data/management"
"github.com/rancher/rancher/pkg/dialer"
@@ -93,7 +94,7 @@ func initFeatures(ctx context.Context, scaledContext *config.ScaledContext, cfg
return err
}
if err := crds.Create(ctx, &scaledContext.RESTConfig); err != nil {
if err := dashboard.Create(ctx, &scaledContext.RESTConfig); err != nil {
return err
}

4
generate.go
View File

@@ -1,4 +1,4 @@
//go:generate go run pkg/types/generator/cleanup/main.go
//go:generate go run pkg/types/codegen/main.go
//go:generate go run pkg/codegen/generator/cleanup/main.go
//go:generate go run pkg/codegen/main.go
package main

2
pkg/api/norman/customization/app/app.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/rancher/rancher/pkg/ref"
clusterschema "github.com/rancher/rancher/pkg/schemas/cluster.cattle.io/v3"
projectschema "github.com/rancher/rancher/pkg/schemas/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
pkg/api/norman/customization/cluster/actionhandler.go
View File

@@ -11,7 +11,7 @@ import (
mgmtclient "github.com/rancher/rancher/pkg/client/generated/management/v3"
"github.com/rancher/rancher/pkg/clustermanager"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
v1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
)

2
pkg/api/norman/customization/cluster/actions_cis.go
View File

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

2
pkg/api/norman/customization/cluster/actions_rketemplate.go
View File

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

2
pkg/api/norman/customization/cluster/validator.go
View File

@@ -18,9 +18,9 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementuser/cis"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/kontainer-engine/service"
"github.com/rancher/rancher/pkg/namespace"
mgmtSchema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/robfig/cron"
)

2
pkg/api/norman/customization/clustertemplate/cluster_template.go
View File

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

2
pkg/api/norman/customization/cred/store.go
View File

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

2
pkg/api/norman/customization/multiclusterapp/multi_cluster_app.go
View File

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

2
pkg/api/norman/customization/multiclusterapp/store.go
View File

@@ -16,8 +16,8 @@ import (
client "github.com/rancher/rancher/pkg/client/generated/management/v3"
"github.com/rancher/rancher/pkg/clusterrouter"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors"
)

2
pkg/api/norman/customization/namespacedresource/store.go
View File

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

2
pkg/api/norman/customization/oci/handler.go
View File

@@ -14,10 +14,10 @@ import (
"github.com/rancher/rancher/pkg/auth/util"
client "github.com/rancher/rancher/pkg/client/generated/management/v3"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/ref"
schema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
)

2
pkg/api/norman/customization/pipeline/pipeline_execution_log.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/rancher/norman/types"
"github.com/rancher/rancher/pkg/pipeline/engine"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
)

2
pkg/api/norman/customization/project/project_actions.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/rancher/rancher/pkg/monitoring"
"github.com/rancher/rancher/pkg/ref"
managementschema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
apierrors "k8s.io/apimachinery/pkg/api/errors"
)

2
pkg/api/norman/customization/vsphere/handler.go
View File

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

2
pkg/api/norman/server/managementstored/setup.go
View File

@@ -67,12 +67,12 @@ import (
"github.com/rancher/rancher/pkg/clusterrouter"
"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/rancher/pkg/schemas/management.cattle.io/v3"
projectschema "github.com/rancher/rancher/pkg/schemas/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
)
func Setup(ctx context.Context, apiContext *config.ScaledContext, clusterManager *clustermanager.Manager,

2
pkg/api/norman/store/app/store.go
View File

@@ -13,9 +13,9 @@ import (
hcommon "github.com/rancher/rancher/pkg/controllers/managementuser/helm/common"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
pv3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/ref"
mgmtschema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/namespace"
"k8s.io/apimachinery/pkg/api/errors"
)

2
pkg/api/norman/store/cluster/cluster_store.go
View File

@@ -34,12 +34,12 @@ import (
"github.com/rancher/rancher/pkg/controllers/management/etcdbackup"
"github.com/rancher/rancher/pkg/controllers/management/rkeworkerupgrader"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
nodehelper "github.com/rancher/rancher/pkg/node"
"github.com/rancher/rancher/pkg/ref"
managementschema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
rkedefaults "github.com/rancher/rke/cluster"
rkeservices "github.com/rancher/rke/services"
"github.com/sirupsen/logrus"

2
pkg/api/norman/store/globaldns/globaldnsprovider_store.go
View File

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

2
pkg/api/norman/store/nodetemplate/store.go
View File

@@ -13,9 +13,9 @@ import (
client "github.com/rancher/rancher/pkg/client/generated/management/v3"
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/ref"
managementschema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/labels"
)

2
pkg/api/norman/store/password/password.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
pkg/api/norman/store/password/store.go
View File

@@ -9,10 +9,10 @@ import (
"github.com/rancher/norman/types"
"github.com/rancher/norman/types/convert"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
"github.com/rancher/rancher/pkg/namespace"
managementschema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
projectschema "github.com/rancher/rancher/pkg/schemas/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/wrangler/pkg/randomtoken"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"

2
pkg/auth/api/secrets/store.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/rancher/rancher/pkg/auth/providers/common"
client "github.com/rancher/rancher/pkg/client/generated/management/v3"
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
)
var (

2
pkg/auth/api/user/user_store.go
View File

@@ -12,7 +12,7 @@ import (
client "github.com/rancher/rancher/pkg/client/generated/management/v3"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt"
"k8s.io/client-go/tools/cache"

2
pkg/auth/data/authconfig_data.go
View File

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

2
pkg/auth/providers/activedirectory/activedirectory_provider.go
View File

@@ -18,7 +18,7 @@ import (
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/auth/providers/azure/azure_provider.go
View File

@@ -22,7 +22,7 @@ import (
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/auth/providers/common/password.go
View File

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

2
pkg/auth/providers/common/usermanager.go
View File

@@ -18,7 +18,7 @@ import (
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
rbacv1 "github.com/rancher/rancher/pkg/generated/norman/rbac.authorization.k8s.io/v1"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/rancher/wrangler/pkg/randomtoken"
"github.com/sirupsen/logrus"
k8srbacv1 "k8s.io/api/rbac/v1"

2
pkg/auth/providers/github/github_provider.go
View File

@@ -22,7 +22,7 @@ import (
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/auth/providers/googleoauth/goauth_provider.go
View File

@@ -21,7 +21,7 @@ import (
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"

2
pkg/auth/providers/ldap/ldap_provider.go
View File

@@ -18,7 +18,7 @@ import (
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
ldapv2 "gopkg.in/ldap.v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/auth/providers/publicapi/login.go
View File

@@ -26,7 +26,7 @@ import (
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
schema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3public"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
)

2
pkg/auth/providers/saml/saml_provider.go
View File

@@ -22,7 +22,7 @@ import (
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/auth/providers/setup.go
View File

@@ -7,9 +7,9 @@ import (
"github.com/rancher/norman/types"
"github.com/rancher/rancher/pkg/auth/api/secrets"
client "github.com/rancher/rancher/pkg/client/generated/management/v3"
"github.com/rancher/rancher/pkg/namespace"
managementschema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
)
var authConfigTypes = []string{

2
pkg/catalog/helm/helm.go
View File

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

2
pkg/catalog/manager/catalog_sync.go
View File

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

2
pkg/catalog/manager/manager.go
View File

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

2
pkg/catalog/manager/traverse.go
View File

@@ -12,7 +12,7 @@ import (
cutils "github.com/rancher/rancher/pkg/catalog/utils"
client "github.com/rancher/rancher/pkg/client/generated/management/v3"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
"github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/catalog/utils/utils.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/pkg/errors"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
"github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
)

0
pkg/types/generator/cleanup/main.go → pkg/codegen/generator/cleanup/main.go
View File

0
pkg/types/generator/compose_template.go → pkg/codegen/generator/compose_template.go
View File

0
pkg/types/generator/generator.go → pkg/codegen/generator/generator.go
View File

2
pkg/types/codegen/main.go → pkg/codegen/main.go
View File

@@ -10,11 +10,11 @@ import (
"github.com/coreos/prometheus-operator/pkg/apis/monitoring"
monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1"
istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3"
"github.com/rancher/rancher/pkg/codegen/generator"
clusterSchema "github.com/rancher/rancher/pkg/schemas/cluster.cattle.io/v3"
managementSchema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3"
publicSchema "github.com/rancher/rancher/pkg/schemas/management.cattle.io/v3public"
projectSchema "github.com/rancher/rancher/pkg/schemas/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/generator"
"github.com/rancher/wrangler/pkg/controller-gen/args"
appsv1 "k8s.io/api/apps/v1"

2
pkg/controllers/management/auth/globalrolebinding_handler.go
View File

@@ -10,9 +10,9 @@ import (
"github.com/rancher/rancher/pkg/clustermanager"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
rbacv1 "github.com/rancher/rancher/pkg/generated/norman/rbac.authorization.k8s.io/v1"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/rbac"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
v1 "k8s.io/api/rbac/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/management/auth/manager.go
View File

@@ -11,7 +11,7 @@ import (
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
typesrbacv1 "github.com/rancher/rancher/pkg/generated/norman/rbac.authorization.k8s.io/v1"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
v1 "k8s.io/api/rbac/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/management/auth/user.go
View File

@@ -10,7 +10,7 @@ import (
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
v12 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/management/catalog/controller.go
View File

@@ -8,8 +8,8 @@ import (
"github.com/rancher/rancher/pkg/catalog/manager"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controllers/management/cloudcredential/controller.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/management/rbac"
typesv1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/controllers/management/clusterdeploy/clusterdeploy.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/rancher/rancher/pkg/systemaccount"
"github.com/rancher/rancher/pkg/systemtemplate"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/controllers/management/clusterprovisioner/rke_store.go
View File

@@ -4,7 +4,7 @@ import (
kd "github.com/rancher/rancher/pkg/controllers/management/kontainerdrivermetadata"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
kontainerengine "github.com/rancher/rancher/pkg/kontainer-engine/drivers/rke"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
rketypes "github.com/rancher/rke/types"
"github.com/rancher/rke/types/kdm"
"github.com/sirupsen/logrus"

2
pkg/controllers/management/clustertemplate/clustertemplate_rbac.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/management/rbac"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"

2
pkg/controllers/management/clustertemplate/revision_controller.go
View File

@@ -7,8 +7,8 @@ import (
"strings"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/controllers/management/compose/controller.go
View File

@@ -20,7 +20,7 @@ import (
"github.com/rancher/rancher/pkg/generated/compose"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"gopkg.in/yaml.v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/controllers/management/etcdbackup/etcdbackup.go
View File

@@ -26,8 +26,8 @@ import (
"github.com/rancher/rancher/pkg/kontainer-engine/drivers/rke"
"github.com/rancher/rancher/pkg/kontainer-engine/service"
"github.com/rancher/rancher/pkg/rkedialerfactory"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/controllers/management/globaldns/globaldns_handler.go
View File

@@ -8,8 +8,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/management/rbac"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
"strconv"

4
pkg/controllers/management/globaldns/globaldnsprovider_catalog_launcher.go
View File

@@ -15,11 +15,11 @@ import (
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
pv3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/project"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors"
k8serrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/management/globaldns/globaldnsprovider_secret_syncer.go
View File

@@ -6,9 +6,9 @@ import (
"strings"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/controllers/management/k3supgrade/k3supgrade_handler.go
View File

@@ -11,9 +11,9 @@ import (
utils2 "github.com/rancher/rancher/pkg/app/utils"
"github.com/rancher/rancher/pkg/catalog/utils"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/project"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/types/namespace"
planv1 "github.com/rancher/system-upgrade-controller/pkg/apis/upgrade.cattle.io/v1"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/management/kontainerdrivermetadata/data.go
View File

@@ -14,8 +14,8 @@ import (
"github.com/rancher/norman/types/convert"
setting2 "github.com/rancher/rancher/pkg/api/norman/store/setting"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/types/namespace"
rketypes "github.com/rancher/rke/types"
"github.com/rancher/rke/types/kdm"
"github.com/rancher/rke/util"

2
pkg/controllers/management/kontainerdrivermetadata/data_getter.go
View File

@@ -8,8 +8,8 @@ import (
mVersion "github.com/mcuadros/go-version"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/types/namespace"
rketypes "github.com/rancher/rke/types"
"github.com/rancher/rke/util"
"github.com/sirupsen/logrus"

2
pkg/controllers/management/kontainerdrivermetadata/metadata_handler.go
View File

@@ -12,9 +12,9 @@ import (
"github.com/rancher/norman/types/convert"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/runtime"
)

4
pkg/controllers/management/multiclusterapp/controller_multiclusterapp.go
View File

@@ -16,10 +16,10 @@ import (
"github.com/rancher/rancher/pkg/controllers/management/rbac"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
pv3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/management/multiclusterapp/enqueue.go
View File

@@ -5,8 +5,8 @@ import (
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
pv3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"k8s.io/apimachinery/pkg/runtime"
)

4
pkg/controllers/management/multiclusterapp/handler_multiclusterapp.go
View File

@@ -8,10 +8,10 @@ import (
"github.com/rancher/rancher/pkg/clustermanager"
"github.com/rancher/rancher/pkg/controllers/management/rbac"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"

4
pkg/controllers/management/multiclusterapp/interval.go
View File

@@ -6,8 +6,8 @@ import (
"time"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
)

2
pkg/controllers/management/node/controller.go
View File

@@ -26,12 +26,12 @@ import (
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/jailer"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/nodeconfig"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/systemaccount"
"github.com/rancher/rancher/pkg/taints"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
v1 "k8s.io/api/core/v1"

2
pkg/controllers/management/nodetemplate/nodetemplate.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/management/rbac"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/controllers/managementagent/controllers.go
View File

@@ -16,8 +16,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementagent/targetworkloadservice"
"github.com/rancher/rancher/pkg/controllers/managementagent/workload"
pkgmonitoring "github.com/rancher/rancher/pkg/monitoring"
"github.com/rancher/rancher/pkg/schemas/factory"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/factory"
)
func Register(ctx context.Context, cluster *config.UserOnlyContext) error {

2
pkg/controllers/managementapi/catalog/catalog.go
View File

@@ -10,8 +10,8 @@ import (
"github.com/bep/debounce"
helmlib "github.com/rancher/rancher/pkg/catalog/helm"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/controllers/managementapi/usercontrollers/usercontroller.go
View File

@@ -17,8 +17,8 @@ import (
"github.com/rancher/rancher/pkg/clustermanager"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/metrics"
tpeermanager "github.com/rancher/rancher/pkg/peermanager"
"github.com/rancher/rancher/pkg/types/config"
tpeermanager "github.com/rancher/rancher/pkg/types/peermanager"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controllers/managementuser/alert/deployer/deployer.go
View File

@@ -17,11 +17,11 @@ import (
mgmtv3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
projectv3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
monitorutil "github.com/rancher/rancher/pkg/monitoring"
"github.com/rancher/rancher/pkg/namespace"
projectutil "github.com/rancher/rancher/pkg/project"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/systemaccount"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"golang.org/x/sync/errgroup"
"gopkg.in/yaml.v2"

2
pkg/controllers/managementuser/alert/deployer/upgradeimpl.go
View File

@@ -17,9 +17,9 @@ import (
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
projectv3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
monitorutil "github.com/rancher/rancher/pkg/monitoring"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/managementuser/alert/statesyncer/statesyncer.go
View File

@@ -8,8 +8,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementuser/alert/common"
"github.com/rancher/rancher/pkg/controllers/managementuser/alert/manager"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controllers/managementuser/alert/watcher/node.go
View File

@@ -13,8 +13,8 @@ import (
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
nodeHelper "github.com/rancher/rancher/pkg/node"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/controllers/managementuser/alert/watcher/pod.go
View File

@@ -14,8 +14,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementuser/alert/manager"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/managementuser/alert/watcher/syscomponent.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementuser/alert/manager"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/labels"

4
pkg/controllers/managementuser/alert/watcher/workload.go
View File

@@ -14,8 +14,8 @@ import (
appsv1 "github.com/rancher/rancher/pkg/generated/norman/apps/v1"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
@@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
nsutils "github.com/rancher/rancher/pkg/types/namespace"
nsutils "github.com/rancher/rancher/pkg/namespace"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
pkg/controllers/managementuser/approuter/ingress_controller.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/pkg/errors"
"github.com/rancher/rancher/pkg/generated/norman/extensions/v1beta1"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controllers/managementuser/cis/register.go
View File

@@ -7,9 +7,9 @@ import (
v32 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/systemaccount"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
pkg/controllers/managementuser/globaldns/user_cluster_globaldns_controller.go
View File

@@ -7,8 +7,8 @@ import (
v1coreRancher "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v1beta1Rancher "github.com/rancher/rancher/pkg/generated/norman/extensions/v1beta1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
"k8s.io/api/extensions/v1beta1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/managementuser/globaldns/user_cluster_ingress.go
View File

@@ -6,8 +6,8 @@ import (
"strings"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
k8serrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/managementuser/healthsyncer/healthsyncer.go
View File

@@ -15,8 +15,8 @@ import (
"github.com/rancher/norman/condition"
corev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/managementuser/helm/common/common.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/pkg/errors"
v3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/jailer"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
"github.com/sirupsen/logrus"
)

2
pkg/controllers/managementuser/helm/controller.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/systemaccount"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"

2
pkg/controllers/managementuser/logging/deployer/deployer.go
View File

@@ -9,12 +9,12 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementuser/logging/utils"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
mgmtv3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/project"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/settings"
"github.com/rancher/rancher/pkg/systemaccount"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"

2
pkg/controllers/managementuser/logging/deployer/testerdeployer.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/rancher/rancher/pkg/types/config"
"github.com/pkg/errors"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
)

2
pkg/controllers/managementuser/logging/deployer/upgradeimpl.go
View File

@@ -19,7 +19,7 @@ import (
"github.com/rancher/rancher/pkg/types/config"
"github.com/pkg/errors"
"github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rancher/pkg/namespace"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controllers/managementuser/logging/watcher/watcher.go
View File

@@ -9,9 +9,9 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementuser/logging/utils"
mgmtv3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/config/dialer"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"

2
pkg/controllers/managementuser/nodesyncer/nodessyncer.go
View File

@@ -19,7 +19,7 @@ import (
nodehelper "github.com/rancher/rancher/pkg/node"
"github.com/rancher/rancher/pkg/systemaccount"
"github.com/rancher/rancher/pkg/types/config"
"github.com/rancher/rancher/pkg/types/user"
"github.com/rancher/rancher/pkg/user"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

2
pkg/controllers/managementuser/pipeline/controller/pipelineexecution/deploy.go
View File

@@ -15,9 +15,9 @@ import (
"github.com/rancher/rancher/pkg/controllers/managementagent/nslabels"
"github.com/rancher/rancher/pkg/controllers/managementuser/resourcequota"
images "github.com/rancher/rancher/pkg/image"
namespaceutil "github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/pipeline/utils"
"github.com/rancher/rancher/pkg/ref"
namespaceutil "github.com/rancher/rancher/pkg/types/namespace"
"github.com/rancher/rke/pki"
"github.com/rancher/rke/pki/cert"
"github.com/rancher/wrangler/pkg/randomtoken"

2
pkg/controllers/managementuser/pipeline/controller/pipelineexecution/registrycertsyncer.go
View File

@@ -12,8 +12,8 @@ import (
v3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3"
"github.com/rancher/rancher/pkg/pipeline/utils"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/rke/pki/cert"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/controllers/managementuser/pipeline/controller/pipelineexecution/statesyncer.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/rancher/rancher/pkg/pipeline/engine"
"github.com/rancher/rancher/pkg/pipeline/utils"
"github.com/rancher/rancher/pkg/ref"
"github.com/rancher/rancher/pkg/ticker"
"github.com/rancher/wrangler/pkg/ticker"
"github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controllers/managementuser/rbac/handler_base.go
View File

@@ -12,9 +12,9 @@ import (
typescorev1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
typesrbacv1 "github.com/rancher/rancher/pkg/generated/norman/rbac.authorization.k8s.io/v1"
nsutils "github.com/rancher/rancher/pkg/namespace"
pkgrbac "github.com/rancher/rancher/pkg/rbac"
"github.com/rancher/rancher/pkg/types/config"
nsutils "github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
rbacv1 "k8s.io/api/rbac/v1"

2
pkg/controllers/managementuser/rbac/namespace_handler.go
View File

@@ -12,8 +12,8 @@ import (
"github.com/rancher/norman/types/slice"
"github.com/rancher/rancher/pkg/controllers/managementuser/resourcequota"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
namespaceutil "github.com/rancher/rancher/pkg/namespace"
"github.com/rancher/rancher/pkg/project"
namespaceutil "github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"

2
pkg/controllers/managementuser/resourcequota/resource_quota_calculate_used.go
View File

@@ -8,8 +8,8 @@ import (
"fmt"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
namespaceutil "github.com/rancher/rancher/pkg/namespace"
validate "github.com/rancher/rancher/pkg/resourcequota"
namespaceutil "github.com/rancher/rancher/pkg/types/namespace"
corev1 "k8s.io/api/core/v1"
clientcache "k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/quota/v1"

2
pkg/controllers/managementuser/resourcequota/resource_quota_sync.go
View File

@@ -14,8 +14,8 @@ import (
"github.com/rancher/norman/types/convert"
v1 "github.com/rancher/rancher/pkg/generated/norman/core/v1"
v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
namespaceutil "github.com/rancher/rancher/pkg/namespace"
validate "github.com/rancher/rancher/pkg/resourcequota"
namespaceutil "github.com/rancher/rancher/pkg/types/namespace"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"

2
pkg/crds/crds.go → pkg/crds/dashboard/crds.go
View File

@@ -1,4 +1,4 @@
package crds
package dashboard
import (
"context"

2
pkg/data/management/global_namespace.go
View File

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

Some files were not shown because too many files have changed in this diff Show More