diff --git a/apis/batch/v1/zz_generated_job_controller.go b/apis/batch/v1/zz_generated_job_controller.go index e44e0553..d812e4d8 100644 --- a/apis/batch/v1/zz_generated_job_controller.go +++ b/apis/batch/v1/zz_generated_job_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/batch/v1" + v1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/batch/v1/zz_generated_job_lifecycle_adapter.go b/apis/batch/v1/zz_generated_job_lifecycle_adapter.go index aeba79f2..1294f834 100644 --- a/apis/batch/v1/zz_generated_job_lifecycle_adapter.go +++ b/apis/batch/v1/zz_generated_job_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/batch/v1" + v1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/cluster.cattle.io/v3/schema/schema.go b/apis/cluster.cattle.io/v3/schema/schema.go index 165170a4..d70b6c14 100644 --- a/apis/cluster.cattle.io/v3/schema/schema.go +++ b/apis/cluster.cattle.io/v3/schema/schema.go @@ -6,9 +6,9 @@ import ( "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" - "github.com/rancher/types/apis/cluster.cattle.io/v3" + v3 "github.com/rancher/types/apis/cluster.cattle.io/v3" "github.com/rancher/types/factory" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" ) diff --git a/apis/core/v1/zz_generated_component_status_controller.go b/apis/core/v1/zz_generated_component_status_controller.go index cd205092..746b99e2 100644 --- a/apis/core/v1/zz_generated_component_status_controller.go +++ b/apis/core/v1/zz_generated_component_status_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go b/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go index d7b82aa6..1fadf330 100644 --- a/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_component_status_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_config_map_controller.go b/apis/core/v1/zz_generated_config_map_controller.go index f6ed3dc5..9ea5b5be 100644 --- a/apis/core/v1/zz_generated_config_map_controller.go +++ b/apis/core/v1/zz_generated_config_map_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go b/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go index 2b46adf9..d707c27d 100644 --- a/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_endpoints_controller.go b/apis/core/v1/zz_generated_endpoints_controller.go index 9ce0fdea..70e12715 100644 --- a/apis/core/v1/zz_generated_endpoints_controller.go +++ b/apis/core/v1/zz_generated_endpoints_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go b/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go index 9684bfa2..f4cfe481 100644 --- a/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_event_controller.go b/apis/core/v1/zz_generated_event_controller.go index 6f5c9e43..de893fb4 100644 --- a/apis/core/v1/zz_generated_event_controller.go +++ b/apis/core/v1/zz_generated_event_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_event_lifecycle_adapter.go b/apis/core/v1/zz_generated_event_lifecycle_adapter.go index 6ceda526..787dcc37 100644 --- a/apis/core/v1/zz_generated_event_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_event_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_limit_range_controller.go b/apis/core/v1/zz_generated_limit_range_controller.go index 9e4574d7..d9bfc5c7 100644 --- a/apis/core/v1/zz_generated_limit_range_controller.go +++ b/apis/core/v1/zz_generated_limit_range_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go b/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go index 639414a2..6cb9426b 100644 --- a/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_namespace_controller.go b/apis/core/v1/zz_generated_namespace_controller.go index e375d1ae..fc6b5b34 100644 --- a/apis/core/v1/zz_generated_namespace_controller.go +++ b/apis/core/v1/zz_generated_namespace_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go b/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go index 32e73829..81d1a333 100644 --- a/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_namespace_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_node_controller.go b/apis/core/v1/zz_generated_node_controller.go index 64bba4aa..77ffb431 100644 --- a/apis/core/v1/zz_generated_node_controller.go +++ b/apis/core/v1/zz_generated_node_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_node_lifecycle_adapter.go b/apis/core/v1/zz_generated_node_lifecycle_adapter.go index 7b9488ce..9cd3306a 100644 --- a/apis/core/v1/zz_generated_node_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_node_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_persistent_volume_claim_controller.go b/apis/core/v1/zz_generated_persistent_volume_claim_controller.go index f30a0bf5..30455ee8 100644 --- a/apis/core/v1/zz_generated_persistent_volume_claim_controller.go +++ b/apis/core/v1/zz_generated_persistent_volume_claim_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go b/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go index 7b33354f..beedf99d 100644 --- a/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_persistent_volume_claim_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_pod_controller.go b/apis/core/v1/zz_generated_pod_controller.go index fdb47a6d..3a279647 100644 --- a/apis/core/v1/zz_generated_pod_controller.go +++ b/apis/core/v1/zz_generated_pod_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_pod_lifecycle_adapter.go b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go index 6b2f8475..aa761ded 100644 --- a/apis/core/v1/zz_generated_pod_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_pod_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_replication_controller_controller.go b/apis/core/v1/zz_generated_replication_controller_controller.go index 667b77a7..6b5821b5 100644 --- a/apis/core/v1/zz_generated_replication_controller_controller.go +++ b/apis/core/v1/zz_generated_replication_controller_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go b/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go index 3cf986f6..88eb0d75 100644 --- a/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_replication_controller_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_resource_quota_controller.go b/apis/core/v1/zz_generated_resource_quota_controller.go index e0c86651..4b1317b6 100644 --- a/apis/core/v1/zz_generated_resource_quota_controller.go +++ b/apis/core/v1/zz_generated_resource_quota_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go b/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go index 350aa20d..ba25159b 100644 --- a/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_secret_controller.go b/apis/core/v1/zz_generated_secret_controller.go index 9e01728b..9289db7a 100644 --- a/apis/core/v1/zz_generated_secret_controller.go +++ b/apis/core/v1/zz_generated_secret_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_secret_lifecycle_adapter.go b/apis/core/v1/zz_generated_secret_lifecycle_adapter.go index 5233fdbc..c59a7f6a 100644 --- a/apis/core/v1/zz_generated_secret_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_secret_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_service_account_controller.go b/apis/core/v1/zz_generated_service_account_controller.go index 3130bb56..fbf10c03 100644 --- a/apis/core/v1/zz_generated_service_account_controller.go +++ b/apis/core/v1/zz_generated_service_account_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go b/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go index 0be5f4be..ca281c4f 100644 --- a/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/core/v1/zz_generated_service_controller.go b/apis/core/v1/zz_generated_service_controller.go index 8687cdad..143a9a15 100644 --- a/apis/core/v1/zz_generated_service_controller.go +++ b/apis/core/v1/zz_generated_service_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/core/v1/zz_generated_service_lifecycle_adapter.go b/apis/core/v1/zz_generated_service_lifecycle_adapter.go index 8f8152a1..37a28afd 100644 --- a/apis/core/v1/zz_generated_service_lifecycle_adapter.go +++ b/apis/core/v1/zz_generated_service_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/management.cattle.io/v3/authz_types.go b/apis/management.cattle.io/v3/authz_types.go index cfdab3f5..236e9e43 100644 --- a/apis/management.cattle.io/v3/authz_types.go +++ b/apis/management.cattle.io/v3/authz_types.go @@ -3,7 +3,7 @@ package v3 import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" extv1 "k8s.io/api/extensions/v1beta1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/apis/management.cattle.io/v3/backup_types.go b/apis/management.cattle.io/v3/backup_types.go index 78767ff7..175d7649 100644 --- a/apis/management.cattle.io/v3/backup_types.go +++ b/apis/management.cattle.io/v3/backup_types.go @@ -3,7 +3,7 @@ package v3 import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/management.cattle.io/v3/catalog_types.go b/apis/management.cattle.io/v3/catalog_types.go index 29a3b289..eb193fe9 100644 --- a/apis/management.cattle.io/v3/catalog_types.go +++ b/apis/management.cattle.io/v3/catalog_types.go @@ -3,7 +3,7 @@ package v3 import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index 9998b489..b6ee9ea6 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -7,7 +7,7 @@ import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" "github.com/sirupsen/logrus" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/version" ) diff --git a/apis/management.cattle.io/v3/compose_types.go b/apis/management.cattle.io/v3/compose_types.go index b60dc233..fd336116 100644 --- a/apis/management.cattle.io/v3/compose_types.go +++ b/apis/management.cattle.io/v3/compose_types.go @@ -2,7 +2,7 @@ package v3 import ( "github.com/rancher/norman/condition" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/management.cattle.io/v3/logging_types.go b/apis/management.cattle.io/v3/logging_types.go index 352f179d..c167e079 100644 --- a/apis/management.cattle.io/v3/logging_types.go +++ b/apis/management.cattle.io/v3/logging_types.go @@ -3,7 +3,7 @@ package v3 import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/management.cattle.io/v3/monitoring_types.go b/apis/management.cattle.io/v3/monitoring_types.go index a8398955..8eddecc8 100644 --- a/apis/management.cattle.io/v3/monitoring_types.go +++ b/apis/management.cattle.io/v3/monitoring_types.go @@ -3,7 +3,7 @@ package v3 import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/management.cattle.io/v3/multi_cluster_app.go b/apis/management.cattle.io/v3/multi_cluster_app.go index 13a5ab80..0ab4b4df 100644 --- a/apis/management.cattle.io/v3/multi_cluster_app.go +++ b/apis/management.cattle.io/v3/multi_cluster_app.go @@ -3,7 +3,7 @@ package v3 import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" - "github.com/rancher/types/apis/project.cattle.io/v3" + v3 "github.com/rancher/types/apis/project.cattle.io/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index 3d26cdd4..be75e170 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -5,10 +5,10 @@ import ( "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/rancher/types/factory" "github.com/rancher/types/mapper" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" ) var ( diff --git a/apis/management.cattle.io/v3public/schema/public_schema.go b/apis/management.cattle.io/v3public/schema/public_schema.go index 01e73e4c..d244e6bc 100644 --- a/apis/management.cattle.io/v3public/schema/public_schema.go +++ b/apis/management.cattle.io/v3public/schema/public_schema.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/rancher/norman/types" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/types/apis/management.cattle.io/v3" "github.com/rancher/types/apis/management.cattle.io/v3public" "github.com/rancher/types/factory" ) diff --git a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go index 0e10ce50..9a0055a2 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_controller.go @@ -3,7 +3,7 @@ package v1 import ( "context" - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" diff --git a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go index 497e8674..15788613 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_alertmanager_lifecycle_adapter.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go index d9db5d1e..16d67951 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_controller.go @@ -3,7 +3,7 @@ package v1 import ( "context" - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go index 2af85b53..4ba13e3c 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_lifecycle_adapter.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go index a3959a94..3066e7f7 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_controller.go @@ -3,7 +3,7 @@ package v1 import ( "context" - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" diff --git a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go index 3d99e4a2..97791f98 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_prometheus_rule_lifecycle_adapter.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go index da598318..a8d4d6ed 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_controller.go @@ -3,7 +3,7 @@ package v1 import ( "context" - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" diff --git a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go index 01800cec..e83b78ad 100644 --- a/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go +++ b/apis/monitoring.coreos.com/v1/zz_generated_service_monitor_lifecycle_adapter.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" + v1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/lifecycle" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go b/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go index 179568b0..4b768abb 100644 --- a/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go +++ b/apis/networking.k8s.io/v1/zz_generated_network_policy_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/networking/v1" + v1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go b/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go index c084ba6c..cd5fe36a 100644 --- a/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go +++ b/apis/networking.k8s.io/v1/zz_generated_network_policy_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/networking/v1" + v1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/project.cattle.io/v3/app_types.go b/apis/project.cattle.io/v3/app_types.go index e9f1f96b..132554cf 100644 --- a/apis/project.cattle.io/v3/app_types.go +++ b/apis/project.cattle.io/v3/app_types.go @@ -3,7 +3,7 @@ package v3 import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/project.cattle.io/v3/pipeline_types.go b/apis/project.cattle.io/v3/pipeline_types.go index 9950e71e..e4cab7a2 100644 --- a/apis/project.cattle.io/v3/pipeline_types.go +++ b/apis/project.cattle.io/v3/pipeline_types.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/norman/condition" "github.com/rancher/norman/types" "github.com/rancher/norman/types/convert" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/project.cattle.io/v3/schema/schema.go b/apis/project.cattle.io/v3/schema/schema.go index f8b8cebe..1f6ef189 100644 --- a/apis/project.cattle.io/v3/schema/schema.go +++ b/apis/project.cattle.io/v3/schema/schema.go @@ -6,13 +6,13 @@ import ( monitoringv1 "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1" "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" - "github.com/rancher/types/apis/project.cattle.io/v3" + v3 "github.com/rancher/types/apis/project.cattle.io/v3" "github.com/rancher/types/factory" "github.com/rancher/types/mapper" "k8s.io/api/apps/v1beta2" batchv1 "k8s.io/api/batch/v1" batchv1beta1 "k8s.io/api/batch/v1beta1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" ) diff --git a/apis/project.cattle.io/v3/schema/schema_secrets.go b/apis/project.cattle.io/v3/schema/schema_secrets.go index 2e42df15..12818915 100644 --- a/apis/project.cattle.io/v3/schema/schema_secrets.go +++ b/apis/project.cattle.io/v3/schema/schema_secrets.go @@ -4,8 +4,8 @@ import ( "github.com/rancher/norman/types" "github.com/rancher/norman/types/convert" m "github.com/rancher/norman/types/mapper" - "github.com/rancher/types/apis/project.cattle.io/v3" - "k8s.io/api/core/v1" + v3 "github.com/rancher/types/apis/project.cattle.io/v3" + v1 "k8s.io/api/core/v1" ) func secretTypes(schemas *types.Schemas) *types.Schemas { diff --git a/apis/project.cattle.io/v3/schema/types.go b/apis/project.cattle.io/v3/schema/types.go index f3e6333a..7c57c94f 100644 --- a/apis/project.cattle.io/v3/schema/types.go +++ b/apis/project.cattle.io/v3/schema/types.go @@ -3,7 +3,7 @@ package schema import ( "github.com/rancher/norman/types" m "github.com/rancher/norman/types/mapper" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go index 5b9b2970..d9a0ffe1 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go index 4709ecd5..07d2b437 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go index 1f429716..94381baf 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go index 77195826..1d7548b0 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go index 06c20c03..3392595a 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go index 2d88f98e..fe2e57dc 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_binding_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go index 0a42f775..aaedd469 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_controller.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/norman/controller" "github.com/rancher/norman/objectclient" "github.com/rancher/norman/resource" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go index d1e11d8f..e09ac89e 100644 --- a/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go +++ b/apis/rbac.authorization.k8s.io/v1/zz_generated_role_lifecycle_adapter.go @@ -2,7 +2,7 @@ package v1 import ( "github.com/rancher/norman/lifecycle" - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/main.go b/main.go index ec4c56d5..b0b0d6cf 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ import ( batchv1 "k8s.io/api/batch/v1" batchv1beta1 "k8s.io/api/batch/v1beta1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" extv1beta1 "k8s.io/api/extensions/v1beta1" knetworkingv1 "k8s.io/api/networking/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/mapper/env.go b/mapper/env.go index bd80532e..3675681f 100644 --- a/mapper/env.go +++ b/mapper/env.go @@ -5,7 +5,7 @@ import ( "github.com/rancher/norman/types" "github.com/rancher/norman/types/convert" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" ) type EnvironmentMapper struct { diff --git a/mapper/scheduling.go b/mapper/scheduling.go index a3505ed2..8b519da1 100644 --- a/mapper/scheduling.go +++ b/mapper/scheduling.go @@ -10,7 +10,7 @@ import ( "github.com/rancher/norman/types" "github.com/rancher/norman/types/convert" "github.com/rancher/norman/types/values" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" ) var ( diff --git a/user/manager.go b/user/manager.go index 182dbaeb..0bc82b0c 100644 --- a/user/manager.go +++ b/user/manager.go @@ -2,7 +2,7 @@ package user import ( "github.com/rancher/norman/types" - "github.com/rancher/types/apis/management.cattle.io/v3" + v3 "github.com/rancher/types/apis/management.cattle.io/v3" apitypes "k8s.io/apimachinery/pkg/types" )