From 04ed242d5a5990102f3c371b04d9dd5cea4c5d7f Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 21 Jul 2020 09:40:44 -0700 Subject: [PATCH] Remove pkg/types and move most packages as subpackages of pkg --- app/app.go | 5 +++-- generate.go | 4 ++-- pkg/api/norman/customization/app/app.go | 2 +- .../norman/customization/cluster/actionhandler.go | 2 +- .../norman/customization/cluster/actions_cis.go | 2 +- .../customization/cluster/actions_rketemplate.go | 2 +- pkg/api/norman/customization/cluster/validator.go | 2 +- .../clustertemplate/cluster_template.go | 2 +- pkg/api/norman/customization/cred/store.go | 2 +- .../multiclusterapp/multi_cluster_app.go | 2 +- .../norman/customization/multiclusterapp/store.go | 2 +- .../customization/namespacedresource/store.go | 2 +- pkg/api/norman/customization/oci/handler.go | 2 +- .../pipeline/pipeline_execution_log.go | 2 +- .../customization/project/project_actions.go | 2 +- pkg/api/norman/customization/vsphere/handler.go | 2 +- pkg/api/norman/server/managementstored/setup.go | 2 +- pkg/api/norman/store/app/store.go | 2 +- pkg/api/norman/store/cluster/cluster_store.go | 2 +- .../store/globaldns/globaldnsprovider_store.go | 2 +- pkg/api/norman/store/nodetemplate/store.go | 2 +- pkg/api/norman/store/password/password.go | 2 +- pkg/api/norman/store/password/store.go | 2 +- pkg/auth/api/secrets/store.go | 2 +- pkg/auth/api/user/user_store.go | 2 +- pkg/auth/data/authconfig_data.go | 2 +- .../activedirectory/activedirectory_provider.go | 2 +- pkg/auth/providers/azure/azure_provider.go | 2 +- pkg/auth/providers/common/password.go | 2 +- pkg/auth/providers/common/usermanager.go | 2 +- pkg/auth/providers/github/github_provider.go | 2 +- pkg/auth/providers/googleoauth/goauth_provider.go | 2 +- pkg/auth/providers/ldap/ldap_provider.go | 2 +- pkg/auth/providers/publicapi/login.go | 2 +- pkg/auth/providers/saml/saml_provider.go | 2 +- pkg/auth/providers/setup.go | 2 +- pkg/catalog/helm/helm.go | 2 +- pkg/catalog/manager/catalog_sync.go | 2 +- pkg/catalog/manager/manager.go | 2 +- pkg/catalog/manager/traverse.go | 2 +- pkg/catalog/utils/utils.go | 2 +- pkg/{types => codegen}/generator/cleanup/main.go | 0 .../generator/compose_template.go | 0 pkg/{types => codegen}/generator/generator.go | 0 pkg/{types => }/codegen/main.go | 2 +- .../management/auth/globalrolebinding_handler.go | 2 +- pkg/controllers/management/auth/manager.go | 2 +- pkg/controllers/management/auth/user.go | 2 +- pkg/controllers/management/catalog/controller.go | 2 +- .../management/cloudcredential/controller.go | 2 +- .../management/clusterdeploy/clusterdeploy.go | 2 +- .../management/clusterprovisioner/rke_store.go | 2 +- .../clustertemplate/clustertemplate_rbac.go | 2 +- .../clustertemplate/revision_controller.go | 2 +- pkg/controllers/management/compose/controller.go | 2 +- .../management/etcdbackup/etcdbackup.go | 2 +- .../management/globaldns/globaldns_handler.go | 2 +- .../globaldnsprovider_catalog_launcher.go | 4 ++-- .../globaldns/globaldnsprovider_secret_syncer.go | 2 +- .../management/k3supgrade/k3supgrade_handler.go | 2 +- .../management/kontainerdrivermetadata/data.go | 2 +- .../kontainerdrivermetadata/data_getter.go | 2 +- .../kontainerdrivermetadata/metadata_handler.go | 2 +- .../multiclusterapp/controller_multiclusterapp.go | 4 ++-- .../management/multiclusterapp/enqueue.go | 2 +- .../multiclusterapp/handler_multiclusterapp.go | 4 ++-- .../management/multiclusterapp/interval.go | 4 ++-- pkg/controllers/management/node/controller.go | 2 +- .../management/nodetemplate/nodetemplate.go | 2 +- pkg/controllers/managementagent/controllers.go | 2 +- pkg/controllers/managementapi/catalog/catalog.go | 2 +- .../usercontrollers/usercontroller.go | 2 +- .../managementuser/alert/deployer/deployer.go | 2 +- .../managementuser/alert/deployer/upgradeimpl.go | 2 +- .../alert/statesyncer/statesyncer.go | 2 +- .../managementuser/alert/watcher/node.go | 2 +- .../managementuser/alert/watcher/pod.go | 2 +- .../managementuser/alert/watcher/syscomponent.go | 2 +- .../managementuser/alert/watcher/workload.go | 4 ++-- .../approuter/ingress_controller.go | 2 +- pkg/controllers/managementuser/cis/register.go | 2 +- .../user_cluster_globaldns_controller.go | 2 +- .../globaldns/user_cluster_ingress.go | 2 +- .../managementuser/healthsyncer/healthsyncer.go | 2 +- .../managementuser/helm/common/common.go | 2 +- pkg/controllers/managementuser/helm/controller.go | 2 +- .../managementuser/logging/deployer/deployer.go | 2 +- .../logging/deployer/testerdeployer.go | 2 +- .../logging/deployer/upgradeimpl.go | 2 +- .../managementuser/logging/watcher/watcher.go | 2 +- .../managementuser/nodesyncer/nodessyncer.go | 2 +- .../controller/pipelineexecution/deploy.go | 2 +- .../pipelineexecution/registrycertsyncer.go | 2 +- .../controller/pipelineexecution/statesyncer.go | 2 +- .../managementuser/rbac/handler_base.go | 2 +- .../managementuser/rbac/namespace_handler.go | 2 +- .../resource_quota_calculate_used.go | 2 +- .../resourcequota/resource_quota_sync.go | 2 +- pkg/crds/{ => dashboard}/crds.go | 2 +- pkg/data/management/global_namespace.go | 2 +- .../v1/zz_generated_api_service_controller.go | 2 +- pkg/httpproxy/sign_utils.go | 2 +- pkg/metrics/metrics.go | 2 +- pkg/monitoring/monitoring.go | 2 +- pkg/{types => }/namespace/namespace.go | 0 pkg/{types => }/namespace/namespace_utils.go | 0 pkg/{types => }/peermanager/peermanager.go | 0 pkg/schemas/cluster.cattle.io/v3/schema.go | 2 +- pkg/{types => schemas}/factory/schemas.go | 2 +- pkg/schemas/management.cattle.io/v3/schema.go | 4 ++-- .../v3public/public_schema.go | 2 +- pkg/{types => schemas}/mapper/container_ports.go | 0 pkg/{types => schemas}/mapper/container_probe.go | 0 pkg/{types => schemas}/mapper/container_status.go | 0 pkg/{types => schemas}/mapper/creator.go | 0 pkg/{types => schemas}/mapper/credentialmapper.go | 0 .../mapper/cross_version_object.go | 0 pkg/{types => schemas}/mapper/drop_from_schema.go | 0 pkg/{types => schemas}/mapper/env.go | 0 pkg/{types => schemas}/mapper/init_container.go | 0 .../mapper/merge_list_by_index.go | 0 .../mapper/merge_list_by_index_test.go | 0 pkg/{types => schemas}/mapper/namespace.go | 0 .../mapper/namespace_reference.go | 0 pkg/{types => schemas}/mapper/node_address.go | 0 pkg/{types => schemas}/mapper/os_info.go | 0 .../mapper/persistvolumeclaim.go | 0 pkg/{types => schemas}/mapper/scheduling.go | 0 pkg/{types => schemas}/mapper/statefulset_spec.go | 0 pkg/{types => schemas}/mapper/status.go | 2 +- pkg/{types => schemas}/mapper/workload.go | 0 pkg/schemas/project.cattle.io/v3/schema.go | 4 ++-- pkg/{types => schemas}/status/status.go | 0 pkg/systemaccount/systemaccount.go | 2 +- pkg/telemetry/telemetry.go | 2 +- pkg/ticker/ticker.go | 15 --------------- pkg/tunnelserver/peermanager.go | 2 +- pkg/types/config/context.go | 4 ++-- pkg/{types => }/user/manager.go | 0 139 files changed, 122 insertions(+), 136 deletions(-) rename pkg/{types => codegen}/generator/cleanup/main.go (100%) rename pkg/{types => codegen}/generator/compose_template.go (100%) rename pkg/{types => codegen}/generator/generator.go (100%) rename pkg/{types => }/codegen/main.go (98%) rename pkg/crds/{ => dashboard}/crds.go (98%) rename pkg/{types => }/namespace/namespace.go (100%) rename pkg/{types => }/namespace/namespace_utils.go (100%) rename pkg/{types => }/peermanager/peermanager.go (100%) rename pkg/{types => schemas}/factory/schemas.go (94%) rename pkg/{types => schemas}/mapper/container_ports.go (100%) rename pkg/{types => schemas}/mapper/container_probe.go (100%) rename pkg/{types => schemas}/mapper/container_status.go (100%) rename pkg/{types => schemas}/mapper/creator.go (100%) rename pkg/{types => schemas}/mapper/credentialmapper.go (100%) rename pkg/{types => schemas}/mapper/cross_version_object.go (100%) rename pkg/{types => schemas}/mapper/drop_from_schema.go (100%) rename pkg/{types => schemas}/mapper/env.go (100%) rename pkg/{types => schemas}/mapper/init_container.go (100%) rename pkg/{types => schemas}/mapper/merge_list_by_index.go (100%) rename pkg/{types => schemas}/mapper/merge_list_by_index_test.go (100%) rename pkg/{types => schemas}/mapper/namespace.go (100%) rename pkg/{types => schemas}/mapper/namespace_reference.go (100%) rename pkg/{types => schemas}/mapper/node_address.go (100%) rename pkg/{types => schemas}/mapper/os_info.go (100%) rename pkg/{types => schemas}/mapper/persistvolumeclaim.go (100%) rename pkg/{types => schemas}/mapper/scheduling.go (100%) rename pkg/{types => schemas}/mapper/statefulset_spec.go (100%) rename pkg/{types => schemas}/mapper/status.go (94%) rename pkg/{types => schemas}/mapper/workload.go (100%) rename pkg/{types => schemas}/status/status.go (100%) delete mode 100644 pkg/ticker/ticker.go rename pkg/{types => }/user/manager.go (100%) diff --git a/app/app.go b/app/app.go index f384cfd6f..074f511d2 100644 --- a/app/app.go +++ b/app/app.go @@ -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 } diff --git a/generate.go b/generate.go index 886733bb9..be28027bf 100644 --- a/generate.go +++ b/generate.go @@ -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 diff --git a/pkg/api/norman/customization/app/app.go b/pkg/api/norman/customization/app/app.go index 37da683aa..7f6737454 100644 --- a/pkg/api/norman/customization/app/app.go +++ b/pkg/api/norman/customization/app/app.go @@ -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" ) diff --git a/pkg/api/norman/customization/cluster/actionhandler.go b/pkg/api/norman/customization/cluster/actionhandler.go index 72a1a2e7e..f3d185ea0 100644 --- a/pkg/api/norman/customization/cluster/actionhandler.go +++ b/pkg/api/norman/customization/cluster/actionhandler.go @@ -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" ) diff --git a/pkg/api/norman/customization/cluster/actions_cis.go b/pkg/api/norman/customization/cluster/actions_cis.go index 6ba73f954..f62bbcbe5 100644 --- a/pkg/api/norman/customization/cluster/actions_cis.go +++ b/pkg/api/norman/customization/cluster/actions_cis.go @@ -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" diff --git a/pkg/api/norman/customization/cluster/actions_rketemplate.go b/pkg/api/norman/customization/cluster/actions_rketemplate.go index 9c5122726..cd5ab9f94 100644 --- a/pkg/api/norman/customization/cluster/actions_rketemplate.go +++ b/pkg/api/norman/customization/cluster/actions_rketemplate.go @@ -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" diff --git a/pkg/api/norman/customization/cluster/validator.go b/pkg/api/norman/customization/cluster/validator.go index a6e829e7b..2d7ac5736 100644 --- a/pkg/api/norman/customization/cluster/validator.go +++ b/pkg/api/norman/customization/cluster/validator.go @@ -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" ) diff --git a/pkg/api/norman/customization/clustertemplate/cluster_template.go b/pkg/api/norman/customization/clustertemplate/cluster_template.go index 462ccec8a..3f8702406 100644 --- a/pkg/api/norman/customization/clustertemplate/cluster_template.go +++ b/pkg/api/norman/customization/clustertemplate/cluster_template.go @@ -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" diff --git a/pkg/api/norman/customization/cred/store.go b/pkg/api/norman/customization/cred/store.go index afd057663..a82ce0236 100644 --- a/pkg/api/norman/customization/cred/store.go +++ b/pkg/api/norman/customization/cred/store.go @@ -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" ) diff --git a/pkg/api/norman/customization/multiclusterapp/multi_cluster_app.go b/pkg/api/norman/customization/multiclusterapp/multi_cluster_app.go index 0aa98b569..3417983f8 100644 --- a/pkg/api/norman/customization/multiclusterapp/multi_cluster_app.go +++ b/pkg/api/norman/customization/multiclusterapp/multi_cluster_app.go @@ -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" diff --git a/pkg/api/norman/customization/multiclusterapp/store.go b/pkg/api/norman/customization/multiclusterapp/store.go index 0f03f53d9..91ce86f45 100644 --- a/pkg/api/norman/customization/multiclusterapp/store.go +++ b/pkg/api/norman/customization/multiclusterapp/store.go @@ -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" ) diff --git a/pkg/api/norman/customization/namespacedresource/store.go b/pkg/api/norman/customization/namespacedresource/store.go index 77a9e0e81..d5da2b6c9 100644 --- a/pkg/api/norman/customization/namespacedresource/store.go +++ b/pkg/api/norman/customization/namespacedresource/store.go @@ -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 diff --git a/pkg/api/norman/customization/oci/handler.go b/pkg/api/norman/customization/oci/handler.go index 85d152233..a0077ed91 100644 --- a/pkg/api/norman/customization/oci/handler.go +++ b/pkg/api/norman/customization/oci/handler.go @@ -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" ) diff --git a/pkg/api/norman/customization/pipeline/pipeline_execution_log.go b/pkg/api/norman/customization/pipeline/pipeline_execution_log.go index 52f967694..5ac982e22 100644 --- a/pkg/api/norman/customization/pipeline/pipeline_execution_log.go +++ b/pkg/api/norman/customization/pipeline/pipeline_execution_log.go @@ -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" ) diff --git a/pkg/api/norman/customization/project/project_actions.go b/pkg/api/norman/customization/project/project_actions.go index 7ae939a92..67534affd 100644 --- a/pkg/api/norman/customization/project/project_actions.go +++ b/pkg/api/norman/customization/project/project_actions.go @@ -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" ) diff --git a/pkg/api/norman/customization/vsphere/handler.go b/pkg/api/norman/customization/vsphere/handler.go index 3824e3db7..09d390a0d 100644 --- a/pkg/api/norman/customization/vsphere/handler.go +++ b/pkg/api/norman/customization/vsphere/handler.go @@ -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" ) diff --git a/pkg/api/norman/server/managementstored/setup.go b/pkg/api/norman/server/managementstored/setup.go index 39e025297..ae0c15ae8 100644 --- a/pkg/api/norman/server/managementstored/setup.go +++ b/pkg/api/norman/server/managementstored/setup.go @@ -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, diff --git a/pkg/api/norman/store/app/store.go b/pkg/api/norman/store/app/store.go index 6a6c0f56b..26d909548 100644 --- a/pkg/api/norman/store/app/store.go +++ b/pkg/api/norman/store/app/store.go @@ -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" ) diff --git a/pkg/api/norman/store/cluster/cluster_store.go b/pkg/api/norman/store/cluster/cluster_store.go index 7ce9a9751..07d70fa53 100644 --- a/pkg/api/norman/store/cluster/cluster_store.go +++ b/pkg/api/norman/store/cluster/cluster_store.go @@ -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" diff --git a/pkg/api/norman/store/globaldns/globaldnsprovider_store.go b/pkg/api/norman/store/globaldns/globaldnsprovider_store.go index 69a1b3ab2..85b74d241 100644 --- a/pkg/api/norman/store/globaldns/globaldnsprovider_store.go +++ b/pkg/api/norman/store/globaldns/globaldnsprovider_store.go @@ -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 { diff --git a/pkg/api/norman/store/nodetemplate/store.go b/pkg/api/norman/store/nodetemplate/store.go index bd2cf0f49..82a9c2cfc 100644 --- a/pkg/api/norman/store/nodetemplate/store.go +++ b/pkg/api/norman/store/nodetemplate/store.go @@ -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" ) diff --git a/pkg/api/norman/store/password/password.go b/pkg/api/norman/store/password/password.go index e7903ed87..2ce6dac2c 100644 --- a/pkg/api/norman/store/password/password.go +++ b/pkg/api/norman/store/password/password.go @@ -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" ) diff --git a/pkg/api/norman/store/password/store.go b/pkg/api/norman/store/password/store.go index 13a135148..7c2ac7546 100644 --- a/pkg/api/norman/store/password/store.go +++ b/pkg/api/norman/store/password/store.go @@ -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" diff --git a/pkg/auth/api/secrets/store.go b/pkg/auth/api/secrets/store.go index 8dbf88cb7..995f6cd58 100644 --- a/pkg/auth/api/secrets/store.go +++ b/pkg/auth/api/secrets/store.go @@ -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 ( diff --git a/pkg/auth/api/user/user_store.go b/pkg/auth/api/user/user_store.go index e53abac5a..b48bab6c0 100644 --- a/pkg/auth/api/user/user_store.go +++ b/pkg/auth/api/user/user_store.go @@ -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" diff --git a/pkg/auth/data/authconfig_data.go b/pkg/auth/data/authconfig_data.go index 41e522c94..a2728415c 100644 --- a/pkg/auth/data/authconfig_data.go +++ b/pkg/auth/data/authconfig_data.go @@ -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" diff --git a/pkg/auth/providers/activedirectory/activedirectory_provider.go b/pkg/auth/providers/activedirectory/activedirectory_provider.go index f9e882080..70c9159cd 100644 --- a/pkg/auth/providers/activedirectory/activedirectory_provider.go +++ b/pkg/auth/providers/activedirectory/activedirectory_provider.go @@ -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" diff --git a/pkg/auth/providers/azure/azure_provider.go b/pkg/auth/providers/azure/azure_provider.go index a4ddc5083..41cbd774e 100644 --- a/pkg/auth/providers/azure/azure_provider.go +++ b/pkg/auth/providers/azure/azure_provider.go @@ -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" diff --git a/pkg/auth/providers/common/password.go b/pkg/auth/providers/common/password.go index f1774f2f3..f0d2fb1f6 100644 --- a/pkg/auth/providers/common/password.go +++ b/pkg/auth/providers/common/password.go @@ -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" diff --git a/pkg/auth/providers/common/usermanager.go b/pkg/auth/providers/common/usermanager.go index 60c4629ce..18efe6e66 100644 --- a/pkg/auth/providers/common/usermanager.go +++ b/pkg/auth/providers/common/usermanager.go @@ -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" diff --git a/pkg/auth/providers/github/github_provider.go b/pkg/auth/providers/github/github_provider.go index cb8608aed..6a44ae861 100644 --- a/pkg/auth/providers/github/github_provider.go +++ b/pkg/auth/providers/github/github_provider.go @@ -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" diff --git a/pkg/auth/providers/googleoauth/goauth_provider.go b/pkg/auth/providers/googleoauth/goauth_provider.go index 6c54a8f7b..95b634911 100644 --- a/pkg/auth/providers/googleoauth/goauth_provider.go +++ b/pkg/auth/providers/googleoauth/goauth_provider.go @@ -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" diff --git a/pkg/auth/providers/ldap/ldap_provider.go b/pkg/auth/providers/ldap/ldap_provider.go index 943bda799..518f32a41 100644 --- a/pkg/auth/providers/ldap/ldap_provider.go +++ b/pkg/auth/providers/ldap/ldap_provider.go @@ -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" diff --git a/pkg/auth/providers/publicapi/login.go b/pkg/auth/providers/publicapi/login.go index bd279fd84..08fa4f1f0 100644 --- a/pkg/auth/providers/publicapi/login.go +++ b/pkg/auth/providers/publicapi/login.go @@ -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" ) diff --git a/pkg/auth/providers/saml/saml_provider.go b/pkg/auth/providers/saml/saml_provider.go index b4aa3b426..293b1e943 100644 --- a/pkg/auth/providers/saml/saml_provider.go +++ b/pkg/auth/providers/saml/saml_provider.go @@ -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" diff --git a/pkg/auth/providers/setup.go b/pkg/auth/providers/setup.go index b927a2b29..8978e0fd1 100644 --- a/pkg/auth/providers/setup.go +++ b/pkg/auth/providers/setup.go @@ -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{ diff --git a/pkg/catalog/helm/helm.go b/pkg/catalog/helm/helm.go index f8969522b..a392554eb 100644 --- a/pkg/catalog/helm/helm.go +++ b/pkg/catalog/helm/helm.go @@ -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" diff --git a/pkg/catalog/manager/catalog_sync.go b/pkg/catalog/manager/catalog_sync.go index de8b785bf..312a797c2 100644 --- a/pkg/catalog/manager/catalog_sync.go +++ b/pkg/catalog/manager/catalog_sync.go @@ -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" diff --git a/pkg/catalog/manager/manager.go b/pkg/catalog/manager/manager.go index b5af3d5c5..9c6ac71cb 100644 --- a/pkg/catalog/manager/manager.go +++ b/pkg/catalog/manager/manager.go @@ -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" diff --git a/pkg/catalog/manager/traverse.go b/pkg/catalog/manager/traverse.go index a05e0dbd5..a47fa9064 100644 --- a/pkg/catalog/manager/traverse.go +++ b/pkg/catalog/manager/traverse.go @@ -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" diff --git a/pkg/catalog/utils/utils.go b/pkg/catalog/utils/utils.go index c037c424e..fd6b721ae 100644 --- a/pkg/catalog/utils/utils.go +++ b/pkg/catalog/utils/utils.go @@ -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" ) diff --git a/pkg/types/generator/cleanup/main.go b/pkg/codegen/generator/cleanup/main.go similarity index 100% rename from pkg/types/generator/cleanup/main.go rename to pkg/codegen/generator/cleanup/main.go diff --git a/pkg/types/generator/compose_template.go b/pkg/codegen/generator/compose_template.go similarity index 100% rename from pkg/types/generator/compose_template.go rename to pkg/codegen/generator/compose_template.go diff --git a/pkg/types/generator/generator.go b/pkg/codegen/generator/generator.go similarity index 100% rename from pkg/types/generator/generator.go rename to pkg/codegen/generator/generator.go diff --git a/pkg/types/codegen/main.go b/pkg/codegen/main.go similarity index 98% rename from pkg/types/codegen/main.go rename to pkg/codegen/main.go index d17797dcc..13e9f5d84 100644 --- a/pkg/types/codegen/main.go +++ b/pkg/codegen/main.go @@ -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" diff --git a/pkg/controllers/management/auth/globalrolebinding_handler.go b/pkg/controllers/management/auth/globalrolebinding_handler.go index bac349c1d..f06859c18 100644 --- a/pkg/controllers/management/auth/globalrolebinding_handler.go +++ b/pkg/controllers/management/auth/globalrolebinding_handler.go @@ -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" diff --git a/pkg/controllers/management/auth/manager.go b/pkg/controllers/management/auth/manager.go index 330e8ef1b..ae6512539 100644 --- a/pkg/controllers/management/auth/manager.go +++ b/pkg/controllers/management/auth/manager.go @@ -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" diff --git a/pkg/controllers/management/auth/user.go b/pkg/controllers/management/auth/user.go index e651206d7..4ae77a2fc 100644 --- a/pkg/controllers/management/auth/user.go +++ b/pkg/controllers/management/auth/user.go @@ -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" diff --git a/pkg/controllers/management/catalog/controller.go b/pkg/controllers/management/catalog/controller.go index 4ebc72ca3..139b0c769 100644 --- a/pkg/controllers/management/catalog/controller.go +++ b/pkg/controllers/management/catalog/controller.go @@ -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" diff --git a/pkg/controllers/management/cloudcredential/controller.go b/pkg/controllers/management/cloudcredential/controller.go index 36cb37c6a..041624266 100644 --- a/pkg/controllers/management/cloudcredential/controller.go +++ b/pkg/controllers/management/cloudcredential/controller.go @@ -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" diff --git a/pkg/controllers/management/clusterdeploy/clusterdeploy.go b/pkg/controllers/management/clusterdeploy/clusterdeploy.go index 27cb41b5e..8b5528f98 100644 --- a/pkg/controllers/management/clusterdeploy/clusterdeploy.go +++ b/pkg/controllers/management/clusterdeploy/clusterdeploy.go @@ -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" diff --git a/pkg/controllers/management/clusterprovisioner/rke_store.go b/pkg/controllers/management/clusterprovisioner/rke_store.go index 744542f03..5fabe870e 100644 --- a/pkg/controllers/management/clusterprovisioner/rke_store.go +++ b/pkg/controllers/management/clusterprovisioner/rke_store.go @@ -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" diff --git a/pkg/controllers/management/clustertemplate/clustertemplate_rbac.go b/pkg/controllers/management/clustertemplate/clustertemplate_rbac.go index 1b181e666..12026dde9 100644 --- a/pkg/controllers/management/clustertemplate/clustertemplate_rbac.go +++ b/pkg/controllers/management/clustertemplate/clustertemplate_rbac.go @@ -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" diff --git a/pkg/controllers/management/clustertemplate/revision_controller.go b/pkg/controllers/management/clustertemplate/revision_controller.go index 133252bc0..7d6eb103f 100644 --- a/pkg/controllers/management/clustertemplate/revision_controller.go +++ b/pkg/controllers/management/clustertemplate/revision_controller.go @@ -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" diff --git a/pkg/controllers/management/compose/controller.go b/pkg/controllers/management/compose/controller.go index 6c4b37491..3ed26208a 100644 --- a/pkg/controllers/management/compose/controller.go +++ b/pkg/controllers/management/compose/controller.go @@ -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" diff --git a/pkg/controllers/management/etcdbackup/etcdbackup.go b/pkg/controllers/management/etcdbackup/etcdbackup.go index 2ad333d99..7c58251c3 100644 --- a/pkg/controllers/management/etcdbackup/etcdbackup.go +++ b/pkg/controllers/management/etcdbackup/etcdbackup.go @@ -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" diff --git a/pkg/controllers/management/globaldns/globaldns_handler.go b/pkg/controllers/management/globaldns/globaldns_handler.go index a2da6c8b7..22a6dde34 100644 --- a/pkg/controllers/management/globaldns/globaldns_handler.go +++ b/pkg/controllers/management/globaldns/globaldns_handler.go @@ -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" diff --git a/pkg/controllers/management/globaldns/globaldnsprovider_catalog_launcher.go b/pkg/controllers/management/globaldns/globaldnsprovider_catalog_launcher.go index 63e7f9c4c..91af030a0 100644 --- a/pkg/controllers/management/globaldns/globaldnsprovider_catalog_launcher.go +++ b/pkg/controllers/management/globaldns/globaldnsprovider_catalog_launcher.go @@ -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" diff --git a/pkg/controllers/management/globaldns/globaldnsprovider_secret_syncer.go b/pkg/controllers/management/globaldns/globaldnsprovider_secret_syncer.go index 1ac04b185..2a189a46b 100644 --- a/pkg/controllers/management/globaldns/globaldnsprovider_secret_syncer.go +++ b/pkg/controllers/management/globaldns/globaldnsprovider_secret_syncer.go @@ -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" diff --git a/pkg/controllers/management/k3supgrade/k3supgrade_handler.go b/pkg/controllers/management/k3supgrade/k3supgrade_handler.go index 707e6b121..0efbc8152 100644 --- a/pkg/controllers/management/k3supgrade/k3supgrade_handler.go +++ b/pkg/controllers/management/k3supgrade/k3supgrade_handler.go @@ -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" diff --git a/pkg/controllers/management/kontainerdrivermetadata/data.go b/pkg/controllers/management/kontainerdrivermetadata/data.go index 1e754e982..91057afdd 100644 --- a/pkg/controllers/management/kontainerdrivermetadata/data.go +++ b/pkg/controllers/management/kontainerdrivermetadata/data.go @@ -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" diff --git a/pkg/controllers/management/kontainerdrivermetadata/data_getter.go b/pkg/controllers/management/kontainerdrivermetadata/data_getter.go index 02a3cab31..3182ad0bd 100644 --- a/pkg/controllers/management/kontainerdrivermetadata/data_getter.go +++ b/pkg/controllers/management/kontainerdrivermetadata/data_getter.go @@ -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" diff --git a/pkg/controllers/management/kontainerdrivermetadata/metadata_handler.go b/pkg/controllers/management/kontainerdrivermetadata/metadata_handler.go index d2de319a3..8cc10aca6 100644 --- a/pkg/controllers/management/kontainerdrivermetadata/metadata_handler.go +++ b/pkg/controllers/management/kontainerdrivermetadata/metadata_handler.go @@ -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" ) diff --git a/pkg/controllers/management/multiclusterapp/controller_multiclusterapp.go b/pkg/controllers/management/multiclusterapp/controller_multiclusterapp.go index 39795e103..80f6d21de 100644 --- a/pkg/controllers/management/multiclusterapp/controller_multiclusterapp.go +++ b/pkg/controllers/management/multiclusterapp/controller_multiclusterapp.go @@ -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" diff --git a/pkg/controllers/management/multiclusterapp/enqueue.go b/pkg/controllers/management/multiclusterapp/enqueue.go index ad3ac4859..a2d3c3899 100644 --- a/pkg/controllers/management/multiclusterapp/enqueue.go +++ b/pkg/controllers/management/multiclusterapp/enqueue.go @@ -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" ) diff --git a/pkg/controllers/management/multiclusterapp/handler_multiclusterapp.go b/pkg/controllers/management/multiclusterapp/handler_multiclusterapp.go index 8ed85c265..b88a096a3 100644 --- a/pkg/controllers/management/multiclusterapp/handler_multiclusterapp.go +++ b/pkg/controllers/management/multiclusterapp/handler_multiclusterapp.go @@ -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" diff --git a/pkg/controllers/management/multiclusterapp/interval.go b/pkg/controllers/management/multiclusterapp/interval.go index 251c51c1a..5a43b5fae 100644 --- a/pkg/controllers/management/multiclusterapp/interval.go +++ b/pkg/controllers/management/multiclusterapp/interval.go @@ -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" ) diff --git a/pkg/controllers/management/node/controller.go b/pkg/controllers/management/node/controller.go index 5a832219b..b725f39a6 100644 --- a/pkg/controllers/management/node/controller.go +++ b/pkg/controllers/management/node/controller.go @@ -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" diff --git a/pkg/controllers/management/nodetemplate/nodetemplate.go b/pkg/controllers/management/nodetemplate/nodetemplate.go index 7f8b33bce..4ebce3d3a 100644 --- a/pkg/controllers/management/nodetemplate/nodetemplate.go +++ b/pkg/controllers/management/nodetemplate/nodetemplate.go @@ -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" diff --git a/pkg/controllers/managementagent/controllers.go b/pkg/controllers/managementagent/controllers.go index ecd79410d..6003e397a 100644 --- a/pkg/controllers/managementagent/controllers.go +++ b/pkg/controllers/managementagent/controllers.go @@ -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 { diff --git a/pkg/controllers/managementapi/catalog/catalog.go b/pkg/controllers/managementapi/catalog/catalog.go index 8bf99e4fa..06cad647a 100644 --- a/pkg/controllers/managementapi/catalog/catalog.go +++ b/pkg/controllers/managementapi/catalog/catalog.go @@ -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" diff --git a/pkg/controllers/managementapi/usercontrollers/usercontroller.go b/pkg/controllers/managementapi/usercontrollers/usercontroller.go index 17ff94a67..a14b996b6 100644 --- a/pkg/controllers/managementapi/usercontrollers/usercontroller.go +++ b/pkg/controllers/managementapi/usercontrollers/usercontroller.go @@ -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" diff --git a/pkg/controllers/managementuser/alert/deployer/deployer.go b/pkg/controllers/managementuser/alert/deployer/deployer.go index 4c20631da..03df285b2 100644 --- a/pkg/controllers/managementuser/alert/deployer/deployer.go +++ b/pkg/controllers/managementuser/alert/deployer/deployer.go @@ -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" diff --git a/pkg/controllers/managementuser/alert/deployer/upgradeimpl.go b/pkg/controllers/managementuser/alert/deployer/upgradeimpl.go index 875663e00..73f1bb6c2 100644 --- a/pkg/controllers/managementuser/alert/deployer/upgradeimpl.go +++ b/pkg/controllers/managementuser/alert/deployer/upgradeimpl.go @@ -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" diff --git a/pkg/controllers/managementuser/alert/statesyncer/statesyncer.go b/pkg/controllers/managementuser/alert/statesyncer/statesyncer.go index 3beb4588e..7f9ff64dd 100644 --- a/pkg/controllers/managementuser/alert/statesyncer/statesyncer.go +++ b/pkg/controllers/managementuser/alert/statesyncer/statesyncer.go @@ -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" diff --git a/pkg/controllers/managementuser/alert/watcher/node.go b/pkg/controllers/managementuser/alert/watcher/node.go index 254ac3a0d..dcb3f5c7e 100644 --- a/pkg/controllers/managementuser/alert/watcher/node.go +++ b/pkg/controllers/managementuser/alert/watcher/node.go @@ -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" diff --git a/pkg/controllers/managementuser/alert/watcher/pod.go b/pkg/controllers/managementuser/alert/watcher/pod.go index 05291528f..c163bf4c6 100644 --- a/pkg/controllers/managementuser/alert/watcher/pod.go +++ b/pkg/controllers/managementuser/alert/watcher/pod.go @@ -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" diff --git a/pkg/controllers/managementuser/alert/watcher/syscomponent.go b/pkg/controllers/managementuser/alert/watcher/syscomponent.go index 90ed9948b..ba67b4e20 100644 --- a/pkg/controllers/managementuser/alert/watcher/syscomponent.go +++ b/pkg/controllers/managementuser/alert/watcher/syscomponent.go @@ -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" diff --git a/pkg/controllers/managementuser/alert/watcher/workload.go b/pkg/controllers/managementuser/alert/watcher/workload.go index 81d7cbfd9..31e721a4f 100644 --- a/pkg/controllers/managementuser/alert/watcher/workload.go +++ b/pkg/controllers/managementuser/alert/watcher/workload.go @@ -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" ) diff --git a/pkg/controllers/managementuser/approuter/ingress_controller.go b/pkg/controllers/managementuser/approuter/ingress_controller.go index 073d0c998..8f51b450c 100644 --- a/pkg/controllers/managementuser/approuter/ingress_controller.go +++ b/pkg/controllers/managementuser/approuter/ingress_controller.go @@ -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" diff --git a/pkg/controllers/managementuser/cis/register.go b/pkg/controllers/managementuser/cis/register.go index 20fd455b7..e9651ddb0 100644 --- a/pkg/controllers/managementuser/cis/register.go +++ b/pkg/controllers/managementuser/cis/register.go @@ -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" ) diff --git a/pkg/controllers/managementuser/globaldns/user_cluster_globaldns_controller.go b/pkg/controllers/managementuser/globaldns/user_cluster_globaldns_controller.go index 5b6f006bb..2e7d44101 100644 --- a/pkg/controllers/managementuser/globaldns/user_cluster_globaldns_controller.go +++ b/pkg/controllers/managementuser/globaldns/user_cluster_globaldns_controller.go @@ -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" diff --git a/pkg/controllers/managementuser/globaldns/user_cluster_ingress.go b/pkg/controllers/managementuser/globaldns/user_cluster_ingress.go index 7fdb04cfa..d38790442 100644 --- a/pkg/controllers/managementuser/globaldns/user_cluster_ingress.go +++ b/pkg/controllers/managementuser/globaldns/user_cluster_ingress.go @@ -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" diff --git a/pkg/controllers/managementuser/healthsyncer/healthsyncer.go b/pkg/controllers/managementuser/healthsyncer/healthsyncer.go index 3ae8e5cf6..56ccc402e 100644 --- a/pkg/controllers/managementuser/healthsyncer/healthsyncer.go +++ b/pkg/controllers/managementuser/healthsyncer/healthsyncer.go @@ -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" diff --git a/pkg/controllers/managementuser/helm/common/common.go b/pkg/controllers/managementuser/helm/common/common.go index bed4b1ba0..d4062f053 100644 --- a/pkg/controllers/managementuser/helm/common/common.go +++ b/pkg/controllers/managementuser/helm/common/common.go @@ -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" ) diff --git a/pkg/controllers/managementuser/helm/controller.go b/pkg/controllers/managementuser/helm/controller.go index b5121c4eb..27659043d 100644 --- a/pkg/controllers/managementuser/helm/controller.go +++ b/pkg/controllers/managementuser/helm/controller.go @@ -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" diff --git a/pkg/controllers/managementuser/logging/deployer/deployer.go b/pkg/controllers/managementuser/logging/deployer/deployer.go index ada5a7c75..19ba9bf51 100644 --- a/pkg/controllers/managementuser/logging/deployer/deployer.go +++ b/pkg/controllers/managementuser/logging/deployer/deployer.go @@ -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" diff --git a/pkg/controllers/managementuser/logging/deployer/testerdeployer.go b/pkg/controllers/managementuser/logging/deployer/testerdeployer.go index f9c03d024..19930f466 100644 --- a/pkg/controllers/managementuser/logging/deployer/testerdeployer.go +++ b/pkg/controllers/managementuser/logging/deployer/testerdeployer.go @@ -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" ) diff --git a/pkg/controllers/managementuser/logging/deployer/upgradeimpl.go b/pkg/controllers/managementuser/logging/deployer/upgradeimpl.go index 18f040be6..3c86889a5 100644 --- a/pkg/controllers/managementuser/logging/deployer/upgradeimpl.go +++ b/pkg/controllers/managementuser/logging/deployer/upgradeimpl.go @@ -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" diff --git a/pkg/controllers/managementuser/logging/watcher/watcher.go b/pkg/controllers/managementuser/logging/watcher/watcher.go index 38dd33093..615d15f7d 100644 --- a/pkg/controllers/managementuser/logging/watcher/watcher.go +++ b/pkg/controllers/managementuser/logging/watcher/watcher.go @@ -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" diff --git a/pkg/controllers/managementuser/nodesyncer/nodessyncer.go b/pkg/controllers/managementuser/nodesyncer/nodessyncer.go index 054d0fbdc..276f86557 100644 --- a/pkg/controllers/managementuser/nodesyncer/nodessyncer.go +++ b/pkg/controllers/managementuser/nodesyncer/nodessyncer.go @@ -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" diff --git a/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/deploy.go b/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/deploy.go index 77a2ce1b2..3ba3c8400 100644 --- a/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/deploy.go +++ b/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/deploy.go @@ -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" diff --git a/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/registrycertsyncer.go b/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/registrycertsyncer.go index de99a522a..c5295bd2d 100644 --- a/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/registrycertsyncer.go +++ b/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/registrycertsyncer.go @@ -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" diff --git a/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/statesyncer.go b/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/statesyncer.go index d54417081..926ef492e 100644 --- a/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/statesyncer.go +++ b/pkg/controllers/managementuser/pipeline/controller/pipelineexecution/statesyncer.go @@ -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" diff --git a/pkg/controllers/managementuser/rbac/handler_base.go b/pkg/controllers/managementuser/rbac/handler_base.go index d5bf87313..a2e991863 100644 --- a/pkg/controllers/managementuser/rbac/handler_base.go +++ b/pkg/controllers/managementuser/rbac/handler_base.go @@ -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" diff --git a/pkg/controllers/managementuser/rbac/namespace_handler.go b/pkg/controllers/managementuser/rbac/namespace_handler.go index 5e6342cee..8ef4b10fa 100644 --- a/pkg/controllers/managementuser/rbac/namespace_handler.go +++ b/pkg/controllers/managementuser/rbac/namespace_handler.go @@ -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" diff --git a/pkg/controllers/managementuser/resourcequota/resource_quota_calculate_used.go b/pkg/controllers/managementuser/resourcequota/resource_quota_calculate_used.go index cca595103..3e2c7fca4 100644 --- a/pkg/controllers/managementuser/resourcequota/resource_quota_calculate_used.go +++ b/pkg/controllers/managementuser/resourcequota/resource_quota_calculate_used.go @@ -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" diff --git a/pkg/controllers/managementuser/resourcequota/resource_quota_sync.go b/pkg/controllers/managementuser/resourcequota/resource_quota_sync.go index 412e4437c..1beb95a63 100644 --- a/pkg/controllers/managementuser/resourcequota/resource_quota_sync.go +++ b/pkg/controllers/managementuser/resourcequota/resource_quota_sync.go @@ -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" diff --git a/pkg/crds/crds.go b/pkg/crds/dashboard/crds.go similarity index 98% rename from pkg/crds/crds.go rename to pkg/crds/dashboard/crds.go index c0d3fae9f..b614878bc 100644 --- a/pkg/crds/crds.go +++ b/pkg/crds/dashboard/crds.go @@ -1,4 +1,4 @@ -package crds +package dashboard import ( "context" diff --git a/pkg/data/management/global_namespace.go b/pkg/data/management/global_namespace.go index 5d162f381..10abf85d9 100644 --- a/pkg/data/management/global_namespace.go +++ b/pkg/data/management/global_namespace.go @@ -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" diff --git a/pkg/generated/norman/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go b/pkg/generated/norman/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go index ce14edce0..24a413b50 100644 --- a/pkg/generated/norman/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go +++ b/pkg/generated/norman/apiregistration.k8s.io/v1/zz_generated_api_service_controller.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" + v1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" ) var ( diff --git a/pkg/httpproxy/sign_utils.go b/pkg/httpproxy/sign_utils.go index 1eac5d0c3..5423bf32c 100644 --- a/pkg/httpproxy/sign_utils.go +++ b/pkg/httpproxy/sign_utils.go @@ -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" ) func getAuthData(auth string, secrets v1.SecretInterface, fields []string) (map[string]string, map[string]string, error) { diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index a961028ec..b9d45a7bb 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/rancher/rancher/pkg/auth/util" "github.com/rancher/rancher/pkg/settings" - "github.com/rancher/rancher/pkg/ticker" "github.com/rancher/rancher/pkg/types/config" + "github.com/rancher/wrangler/pkg/ticker" authV1 "k8s.io/api/authorization/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/pkg/monitoring/monitoring.go b/pkg/monitoring/monitoring.go index 75f570c72..e36ebd69e 100644 --- a/pkg/monitoring/monitoring.go +++ b/pkg/monitoring/monitoring.go @@ -12,8 +12,8 @@ import ( cutils "github.com/rancher/rancher/pkg/catalog/utils" versionutil "github.com/rancher/rancher/pkg/catalog/utils" mgmtv3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3" + ns "github.com/rancher/rancher/pkg/namespace" "github.com/rancher/rancher/pkg/ref" - ns "github.com/rancher/rancher/pkg/types/namespace" "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/types/namespace/namespace.go b/pkg/namespace/namespace.go similarity index 100% rename from pkg/types/namespace/namespace.go rename to pkg/namespace/namespace.go diff --git a/pkg/types/namespace/namespace_utils.go b/pkg/namespace/namespace_utils.go similarity index 100% rename from pkg/types/namespace/namespace_utils.go rename to pkg/namespace/namespace_utils.go diff --git a/pkg/types/peermanager/peermanager.go b/pkg/peermanager/peermanager.go similarity index 100% rename from pkg/types/peermanager/peermanager.go rename to pkg/peermanager/peermanager.go diff --git a/pkg/schemas/cluster.cattle.io/v3/schema.go b/pkg/schemas/cluster.cattle.io/v3/schema.go index 22d1d28c2..41a6a3aa4 100644 --- a/pkg/schemas/cluster.cattle.io/v3/schema.go +++ b/pkg/schemas/cluster.cattle.io/v3/schema.go @@ -7,7 +7,7 @@ import ( "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" v3 "github.com/rancher/rancher/pkg/apis/cluster.cattle.io/v3" - "github.com/rancher/rancher/pkg/types/factory" + "github.com/rancher/rancher/pkg/schemas/factory" v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" diff --git a/pkg/types/factory/schemas.go b/pkg/schemas/factory/schemas.go similarity index 94% rename from pkg/types/factory/schemas.go rename to pkg/schemas/factory/schemas.go index 2927abb8c..7aaa46f1c 100644 --- a/pkg/types/factory/schemas.go +++ b/pkg/schemas/factory/schemas.go @@ -4,7 +4,7 @@ import ( "github.com/rancher/norman/types" "github.com/rancher/norman/types/factory" m "github.com/rancher/norman/types/mapper" - "github.com/rancher/rancher/pkg/types/mapper" + "github.com/rancher/rancher/pkg/schemas/mapper" ) func Schemas(version *types.APIVersion) *types.Schemas { diff --git a/pkg/schemas/management.cattle.io/v3/schema.go b/pkg/schemas/management.cattle.io/v3/schema.go index 174124876..2599d8f8d 100644 --- a/pkg/schemas/management.cattle.io/v3/schema.go +++ b/pkg/schemas/management.cattle.io/v3/schema.go @@ -8,8 +8,8 @@ import ( "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3" - "github.com/rancher/rancher/pkg/types/factory" - "github.com/rancher/rancher/pkg/types/mapper" + "github.com/rancher/rancher/pkg/schemas/factory" + "github.com/rancher/rancher/pkg/schemas/mapper" v1 "k8s.io/api/core/v1" apiserverconfig "k8s.io/apiserver/pkg/apis/config" ) diff --git a/pkg/schemas/management.cattle.io/v3public/public_schema.go b/pkg/schemas/management.cattle.io/v3public/public_schema.go index 66ea85829..77f3af0bc 100644 --- a/pkg/schemas/management.cattle.io/v3public/public_schema.go +++ b/pkg/schemas/management.cattle.io/v3public/public_schema.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/norman/types" v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3" - "github.com/rancher/rancher/pkg/types/factory" + "github.com/rancher/rancher/pkg/schemas/factory" ) var ( diff --git a/pkg/types/mapper/container_ports.go b/pkg/schemas/mapper/container_ports.go similarity index 100% rename from pkg/types/mapper/container_ports.go rename to pkg/schemas/mapper/container_ports.go diff --git a/pkg/types/mapper/container_probe.go b/pkg/schemas/mapper/container_probe.go similarity index 100% rename from pkg/types/mapper/container_probe.go rename to pkg/schemas/mapper/container_probe.go diff --git a/pkg/types/mapper/container_status.go b/pkg/schemas/mapper/container_status.go similarity index 100% rename from pkg/types/mapper/container_status.go rename to pkg/schemas/mapper/container_status.go diff --git a/pkg/types/mapper/creator.go b/pkg/schemas/mapper/creator.go similarity index 100% rename from pkg/types/mapper/creator.go rename to pkg/schemas/mapper/creator.go diff --git a/pkg/types/mapper/credentialmapper.go b/pkg/schemas/mapper/credentialmapper.go similarity index 100% rename from pkg/types/mapper/credentialmapper.go rename to pkg/schemas/mapper/credentialmapper.go diff --git a/pkg/types/mapper/cross_version_object.go b/pkg/schemas/mapper/cross_version_object.go similarity index 100% rename from pkg/types/mapper/cross_version_object.go rename to pkg/schemas/mapper/cross_version_object.go diff --git a/pkg/types/mapper/drop_from_schema.go b/pkg/schemas/mapper/drop_from_schema.go similarity index 100% rename from pkg/types/mapper/drop_from_schema.go rename to pkg/schemas/mapper/drop_from_schema.go diff --git a/pkg/types/mapper/env.go b/pkg/schemas/mapper/env.go similarity index 100% rename from pkg/types/mapper/env.go rename to pkg/schemas/mapper/env.go diff --git a/pkg/types/mapper/init_container.go b/pkg/schemas/mapper/init_container.go similarity index 100% rename from pkg/types/mapper/init_container.go rename to pkg/schemas/mapper/init_container.go diff --git a/pkg/types/mapper/merge_list_by_index.go b/pkg/schemas/mapper/merge_list_by_index.go similarity index 100% rename from pkg/types/mapper/merge_list_by_index.go rename to pkg/schemas/mapper/merge_list_by_index.go diff --git a/pkg/types/mapper/merge_list_by_index_test.go b/pkg/schemas/mapper/merge_list_by_index_test.go similarity index 100% rename from pkg/types/mapper/merge_list_by_index_test.go rename to pkg/schemas/mapper/merge_list_by_index_test.go diff --git a/pkg/types/mapper/namespace.go b/pkg/schemas/mapper/namespace.go similarity index 100% rename from pkg/types/mapper/namespace.go rename to pkg/schemas/mapper/namespace.go diff --git a/pkg/types/mapper/namespace_reference.go b/pkg/schemas/mapper/namespace_reference.go similarity index 100% rename from pkg/types/mapper/namespace_reference.go rename to pkg/schemas/mapper/namespace_reference.go diff --git a/pkg/types/mapper/node_address.go b/pkg/schemas/mapper/node_address.go similarity index 100% rename from pkg/types/mapper/node_address.go rename to pkg/schemas/mapper/node_address.go diff --git a/pkg/types/mapper/os_info.go b/pkg/schemas/mapper/os_info.go similarity index 100% rename from pkg/types/mapper/os_info.go rename to pkg/schemas/mapper/os_info.go diff --git a/pkg/types/mapper/persistvolumeclaim.go b/pkg/schemas/mapper/persistvolumeclaim.go similarity index 100% rename from pkg/types/mapper/persistvolumeclaim.go rename to pkg/schemas/mapper/persistvolumeclaim.go diff --git a/pkg/types/mapper/scheduling.go b/pkg/schemas/mapper/scheduling.go similarity index 100% rename from pkg/types/mapper/scheduling.go rename to pkg/schemas/mapper/scheduling.go diff --git a/pkg/types/mapper/statefulset_spec.go b/pkg/schemas/mapper/statefulset_spec.go similarity index 100% rename from pkg/types/mapper/statefulset_spec.go rename to pkg/schemas/mapper/statefulset_spec.go diff --git a/pkg/types/mapper/status.go b/pkg/schemas/mapper/status.go similarity index 94% rename from pkg/types/mapper/status.go rename to pkg/schemas/mapper/status.go index 90e2ecdec..8e60d8881 100644 --- a/pkg/types/mapper/status.go +++ b/pkg/schemas/mapper/status.go @@ -2,7 +2,7 @@ package mapper import ( "github.com/rancher/norman/types" - "github.com/rancher/rancher/pkg/types/status" + "github.com/rancher/rancher/pkg/schemas/status" ) type Status struct { diff --git a/pkg/types/mapper/workload.go b/pkg/schemas/mapper/workload.go similarity index 100% rename from pkg/types/mapper/workload.go rename to pkg/schemas/mapper/workload.go diff --git a/pkg/schemas/project.cattle.io/v3/schema.go b/pkg/schemas/project.cattle.io/v3/schema.go index 2d6d16742..78649fa17 100644 --- a/pkg/schemas/project.cattle.io/v3/schema.go +++ b/pkg/schemas/project.cattle.io/v3/schema.go @@ -8,8 +8,8 @@ import ( "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" v3 "github.com/rancher/rancher/pkg/apis/project.cattle.io/v3" - "github.com/rancher/rancher/pkg/types/factory" - "github.com/rancher/rancher/pkg/types/mapper" + "github.com/rancher/rancher/pkg/schemas/factory" + "github.com/rancher/rancher/pkg/schemas/mapper" appsv1 "k8s.io/api/apps/v1" k8sappv1 "k8s.io/api/apps/v1" autoscaling "k8s.io/api/autoscaling/v2beta2" diff --git a/pkg/types/status/status.go b/pkg/schemas/status/status.go similarity index 100% rename from pkg/types/status/status.go rename to pkg/schemas/status/status.go diff --git a/pkg/systemaccount/systemaccount.go b/pkg/systemaccount/systemaccount.go index f36b3f140..b8811029a 100644 --- a/pkg/systemaccount/systemaccount.go +++ b/pkg/systemaccount/systemaccount.go @@ -8,7 +8,7 @@ import ( v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3" "github.com/rancher/rancher/pkg/ref" "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" errors2 "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/telemetry/telemetry.go b/pkg/telemetry/telemetry.go index c3d9d5912..558a60680 100644 --- a/pkg/telemetry/telemetry.go +++ b/pkg/telemetry/telemetry.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/rancher/rancher/pkg/settings" - "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" ) diff --git a/pkg/ticker/ticker.go b/pkg/ticker/ticker.go deleted file mode 100644 index ec6b9d668..000000000 --- a/pkg/ticker/ticker.go +++ /dev/null @@ -1,15 +0,0 @@ -package ticker - -import ( - "context" - "time" -) - -func Context(ctx context.Context, duration time.Duration) <-chan time.Time { - ticker := time.NewTicker(duration) - go func() { - <-ctx.Done() - ticker.Stop() - }() - return ticker.C -} diff --git a/pkg/tunnelserver/peermanager.go b/pkg/tunnelserver/peermanager.go index f2dbeb2a6..0d9b40696 100644 --- a/pkg/tunnelserver/peermanager.go +++ b/pkg/tunnelserver/peermanager.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/rancher/norman/types/set" + "github.com/rancher/rancher/pkg/peermanager" "github.com/rancher/rancher/pkg/settings" "github.com/rancher/rancher/pkg/types/config" - "github.com/rancher/rancher/pkg/types/peermanager" "github.com/rancher/remotedialer" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" diff --git a/pkg/types/config/context.go b/pkg/types/config/context.go index 9896dec56..01b43abce 100644 --- a/pkg/types/config/context.go +++ b/pkg/types/config/context.go @@ -34,12 +34,12 @@ import ( projectv3 "github.com/rancher/rancher/pkg/generated/norman/project.cattle.io/v3" rbacv1 "github.com/rancher/rancher/pkg/generated/norman/rbac.authorization.k8s.io/v1" storagev1 "github.com/rancher/rancher/pkg/generated/norman/storage.k8s.io/v1" + "github.com/rancher/rancher/pkg/peermanager" clusterSchema "github.com/rancher/rancher/pkg/schemas/cluster.cattle.io/v3" 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/dialer" - "github.com/rancher/rancher/pkg/types/peermanager" - "github.com/rancher/rancher/pkg/types/user" + "github.com/rancher/rancher/pkg/user" "github.com/rancher/wrangler/pkg/generated/controllers/rbac" wrbacv1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" "github.com/rancher/wrangler/pkg/schemes" diff --git a/pkg/types/user/manager.go b/pkg/user/manager.go similarity index 100% rename from pkg/types/user/manager.go rename to pkg/user/manager.go