From de7ab425b126953325969e751ce8f1b67b99660c Mon Sep 17 00:00:00 2001 From: rmweir Date: Tue, 11 Jun 2019 17:48:01 -0700 Subject: [PATCH] go generate --- apis/batch/v1/zz_generated_job_controller.go | 2 +- apis/batch/v1/zz_generated_job_lifecycle_adapter.go | 2 +- apis/cluster.cattle.io/v3/schema/schema.go | 4 ++-- apis/core/v1/zz_generated_component_status_controller.go | 2 +- .../v1/zz_generated_component_status_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_config_map_controller.go | 2 +- apis/core/v1/zz_generated_config_map_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_endpoints_controller.go | 2 +- apis/core/v1/zz_generated_endpoints_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_event_controller.go | 2 +- apis/core/v1/zz_generated_event_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_limit_range_controller.go | 2 +- apis/core/v1/zz_generated_limit_range_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_namespace_controller.go | 2 +- apis/core/v1/zz_generated_namespace_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_node_controller.go | 2 +- apis/core/v1/zz_generated_node_lifecycle_adapter.go | 2 +- .../v1/zz_generated_persistent_volume_claim_controller.go | 2 +- .../zz_generated_persistent_volume_claim_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_pod_controller.go | 2 +- apis/core/v1/zz_generated_pod_lifecycle_adapter.go | 2 +- .../core/v1/zz_generated_replication_controller_controller.go | 2 +- .../zz_generated_replication_controller_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_resource_quota_controller.go | 2 +- apis/core/v1/zz_generated_resource_quota_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_secret_controller.go | 2 +- apis/core/v1/zz_generated_secret_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_service_account_controller.go | 2 +- .../core/v1/zz_generated_service_account_lifecycle_adapter.go | 2 +- apis/core/v1/zz_generated_service_controller.go | 2 +- apis/core/v1/zz_generated_service_lifecycle_adapter.go | 2 +- apis/management.cattle.io/v3/authz_types.go | 2 +- apis/management.cattle.io/v3/backup_types.go | 2 +- apis/management.cattle.io/v3/catalog_types.go | 2 +- apis/management.cattle.io/v3/cluster_types.go | 2 +- apis/management.cattle.io/v3/compose_types.go | 2 +- apis/management.cattle.io/v3/logging_types.go | 2 +- apis/management.cattle.io/v3/monitoring_types.go | 2 +- apis/management.cattle.io/v3/multi_cluster_app.go | 2 +- apis/management.cattle.io/v3/schema/schema.go | 4 ++-- apis/management.cattle.io/v3public/schema/public_schema.go | 2 +- .../v1/zz_generated_alertmanager_controller.go | 2 +- .../v1/zz_generated_alertmanager_lifecycle_adapter.go | 2 +- .../v1/zz_generated_prometheus_controller.go | 2 +- .../v1/zz_generated_prometheus_lifecycle_adapter.go | 2 +- .../v1/zz_generated_prometheus_rule_controller.go | 2 +- .../v1/zz_generated_prometheus_rule_lifecycle_adapter.go | 2 +- .../v1/zz_generated_service_monitor_controller.go | 2 +- .../v1/zz_generated_service_monitor_lifecycle_adapter.go | 2 +- .../v1/zz_generated_network_policy_controller.go | 2 +- .../v1/zz_generated_network_policy_lifecycle_adapter.go | 2 +- apis/project.cattle.io/v3/app_types.go | 2 +- apis/project.cattle.io/v3/pipeline_types.go | 2 +- apis/project.cattle.io/v3/schema/schema.go | 4 ++-- apis/project.cattle.io/v3/schema/schema_secrets.go | 4 ++-- apis/project.cattle.io/v3/schema/types.go | 2 +- .../v1/zz_generated_cluster_role_binding_controller.go | 2 +- .../v1/zz_generated_cluster_role_binding_lifecycle_adapter.go | 2 +- .../v1/zz_generated_cluster_role_controller.go | 2 +- .../v1/zz_generated_cluster_role_lifecycle_adapter.go | 2 +- .../v1/zz_generated_role_binding_controller.go | 2 +- .../v1/zz_generated_role_binding_lifecycle_adapter.go | 2 +- .../v1/zz_generated_role_controller.go | 2 +- .../v1/zz_generated_role_lifecycle_adapter.go | 2 +- 64 files changed, 68 insertions(+), 68 deletions(-) diff --git a/apis/batch/v1/zz_generated_job_controller.go b/apis/batch/v1/zz_generated_job_controller.go index db0e0ee3..e0d098d7 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 ecb40590..eb3a33a1 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 6b8d207d..eb51f096 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 290bae53..d1ff0dd6 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 7e924252..e8c474f1 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 befc391c..40b94793 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 9ab1fdcb..526f4809 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 813fdc08..d308cb49 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 b803e754..85e887f7 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 8e2c1567..3a9339ea 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 764aa1b7..05d73441 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 197aa92d..eb300867 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 1f754ca4..555887d3 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 3bf12244..490e71e3 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 55f04d14..01c19012 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 25791dbd..6a16e1f1 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 cfa2aeaf..86412a2b 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 b26e278b..05cc8aa9 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 1d3589f7..a877158b 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 2236637a..897ffab5 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 45358b53..9684e4e5 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 897fd111..e9bec80f 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 96759d23..9c92e056 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 a7fc0fbc..70181190 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 b43c75c4..867462cc 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 9a7edd92..0281b112 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 4626ca89..5b6190fb 100644 --- a/apis/project.cattle.io/v3/schema/schema.go +++ b/apis/project.cattle.io/v3/schema/schema.go @@ -6,14 +6,14 @@ 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" autoscaling "k8s.io/api/autoscaling/v2beta2" 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 5416e932..524b25fe 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 9d2ebab2..e99b1875 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 09afa69e..8f54419b 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 f01527d4..85cba13d 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" )