From c37a11c5f9bc7e2f28a8fbf0516b7cc53c997326 Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Thu, 29 Apr 2021 07:27:28 +0000 Subject: [PATCH] move api to staging Signed-off-by: Roland.Ma --- Makefile | 19 +- cmd/controller-manager/app/controllers.go | 3 +- go.mod | 3 +- hack/generate_client.sh | 4 +- hack/generate_group.sh | 2 +- pkg/apis/addtoscheme_application_v1alpha1.go | 2 +- pkg/apis/addtoscheme_audting_v1alpha1.go | 2 +- pkg/apis/addtoscheme_cluster_v1alpha1.go | 2 +- pkg/apis/addtoscheme_devops_v1alpha1.go | 2 +- pkg/apis/addtoscheme_devops_v1alpha3.go | 2 +- pkg/apis/addtoscheme_iam_v1alpha2.go | 2 +- pkg/apis/addtoscheme_network_v1alpha1.go | 2 +- pkg/apis/addtoscheme_notification_v2beta1.go | 2 +- pkg/apis/addtoscheme_quota_v1alpha2.go | 2 +- pkg/apis/addtoscheme_servicemesh_v1alpha2.go | 2 +- pkg/apis/addtoscheme_storage_v1alpha1.go | 2 +- pkg/apis/addtoscheme_tenant_v1alpha1.go | 2 +- pkg/apis/addtoscheme_tenant_v1alpha2.go | 2 +- pkg/apis/addtoscheme_types_v1beta1.go | 2 +- pkg/apiserver/apiserver.go | 13 +- pkg/apiserver/auditing/types.go | 3 +- pkg/apiserver/auditing/types_test.go | 3 +- .../authenticators/basic/basic.go | 3 +- .../authenticators/jwttoken/jwt_token.go | 3 +- pkg/apiserver/authorization/rbac/rbac.go | 3 +- pkg/apiserver/authorization/rbac/rbac_test.go | 5 +- pkg/apiserver/config/config.go | 3 +- pkg/apiserver/config/config_test.go | 3 +- pkg/apiserver/dispatch/dispatch.go | 3 +- .../clientset/versioned/fake/register.go | 28 +- .../clientset/versioned/scheme/register.go | 28 +- .../v1alpha1/application_client.go | 2 +- .../v1alpha1/fake/fake_helmapplication.go | 2 +- .../fake/fake_helmapplicationversion.go | 2 +- .../v1alpha1/fake/fake_helmcategory.go | 2 +- .../v1alpha1/fake/fake_helmrelease.go | 2 +- .../v1alpha1/fake/fake_helmrepo.go | 2 +- .../application/v1alpha1/helmapplication.go | 2 +- .../v1alpha1/helmapplicationversion.go | 2 +- .../application/v1alpha1/helmcategory.go | 2 +- .../typed/application/v1alpha1/helmrelease.go | 2 +- .../typed/application/v1alpha1/helmrepo.go | 2 +- .../auditing/v1alpha1/auditing_client.go | 2 +- .../typed/auditing/v1alpha1/fake/fake_rule.go | 2 +- .../auditing/v1alpha1/fake/fake_webhook.go | 2 +- .../versioned/typed/auditing/v1alpha1/rule.go | 2 +- .../typed/auditing/v1alpha1/webhook.go | 2 +- .../typed/cluster/v1alpha1/cluster.go | 2 +- .../typed/cluster/v1alpha1/cluster_client.go | 2 +- .../cluster/v1alpha1/fake/fake_cluster.go | 2 +- .../typed/devops/v1alpha1/devops_client.go | 2 +- .../devops/v1alpha1/fake/fake_s2ibinary.go | 2 +- .../devops/v1alpha1/fake/fake_s2ibuilder.go | 2 +- .../v1alpha1/fake/fake_s2ibuildertemplate.go | 2 +- .../typed/devops/v1alpha1/fake/fake_s2irun.go | 2 +- .../typed/devops/v1alpha1/s2ibinary.go | 2 +- .../typed/devops/v1alpha1/s2ibuilder.go | 2 +- .../devops/v1alpha1/s2ibuildertemplate.go | 2 +- .../versioned/typed/devops/v1alpha1/s2irun.go | 2 +- .../typed/devops/v1alpha3/devops_client.go | 2 +- .../typed/devops/v1alpha3/devopsproject.go | 2 +- .../v1alpha3/fake/fake_devopsproject.go | 2 +- .../devops/v1alpha3/fake/fake_pipeline.go | 2 +- .../typed/devops/v1alpha3/pipeline.go | 2 +- .../iam/v1alpha2/fake/fake_globalrole.go | 2 +- .../v1alpha2/fake/fake_globalrolebinding.go | 2 +- .../typed/iam/v1alpha2/fake/fake_group.go | 2 +- .../iam/v1alpha2/fake/fake_groupbinding.go | 2 +- .../iam/v1alpha2/fake/fake_loginrecord.go | 2 +- .../typed/iam/v1alpha2/fake/fake_rolebase.go | 2 +- .../typed/iam/v1alpha2/fake/fake_user.go | 2 +- .../iam/v1alpha2/fake/fake_workspacerole.go | 2 +- .../fake/fake_workspacerolebinding.go | 2 +- .../typed/iam/v1alpha2/globalrole.go | 2 +- .../typed/iam/v1alpha2/globalrolebinding.go | 2 +- .../versioned/typed/iam/v1alpha2/group.go | 2 +- .../typed/iam/v1alpha2/groupbinding.go | 2 +- .../typed/iam/v1alpha2/iam_client.go | 2 +- .../typed/iam/v1alpha2/loginrecord.go | 2 +- .../versioned/typed/iam/v1alpha2/rolebase.go | 2 +- .../versioned/typed/iam/v1alpha2/user.go | 2 +- .../typed/iam/v1alpha2/workspacerole.go | 2 +- .../iam/v1alpha2/workspacerolebinding.go | 2 +- .../network/v1alpha1/fake/fake_ipamblock.go | 2 +- .../network/v1alpha1/fake/fake_ipamhandle.go | 2 +- .../network/v1alpha1/fake/fake_ippool.go | 2 +- .../fake/fake_namespacenetworkpolicy.go | 2 +- .../typed/network/v1alpha1/ipamblock.go | 2 +- .../typed/network/v1alpha1/ipamhandle.go | 2 +- .../typed/network/v1alpha1/ippool.go | 2 +- .../v1alpha1/namespacenetworkpolicy.go | 2 +- .../typed/network/v1alpha1/network_client.go | 2 +- .../typed/notification/v2beta1/config.go | 2 +- .../notification/v2beta1/fake/fake_config.go | 2 +- .../v2beta1/fake/fake_receiver.go | 2 +- .../v2beta1/notification_client.go | 2 +- .../typed/notification/v2beta1/receiver.go | 2 +- .../quota/v1alpha2/fake/fake_resourcequota.go | 2 +- .../typed/quota/v1alpha2/quota_client.go | 2 +- .../typed/quota/v1alpha2/resourcequota.go | 2 +- .../v1alpha2/fake/fake_servicepolicy.go | 2 +- .../v1alpha2/fake/fake_strategy.go | 2 +- .../v1alpha2/servicemesh_client.go | 2 +- .../servicemesh/v1alpha2/servicepolicy.go | 2 +- .../typed/servicemesh/v1alpha2/strategy.go | 2 +- .../fake/fake_provisionercapability.go | 2 +- .../fake/fake_storageclasscapability.go | 2 +- .../storage/v1alpha1/provisionercapability.go | 2 +- .../typed/storage/v1alpha1/storage_client.go | 2 +- .../v1alpha1/storageclasscapability.go | 2 +- .../tenant/v1alpha1/fake/fake_workspace.go | 2 +- .../typed/tenant/v1alpha1/tenant_client.go | 2 +- .../typed/tenant/v1alpha1/workspace.go | 2 +- .../v1alpha2/fake/fake_workspacetemplate.go | 2 +- .../typed/tenant/v1alpha2/tenant_client.go | 2 +- .../tenant/v1alpha2/workspacetemplate.go | 2 +- .../v1beta1/fake/fake_federatedapplication.go | 2 +- .../v1beta1/fake/fake_federatedclusterrole.go | 2 +- .../fake/fake_federatedclusterrolebinding.go | 2 +- .../v1beta1/fake/fake_federatedconfigmap.go | 2 +- .../v1beta1/fake/fake_federateddeployment.go | 2 +- .../types/v1beta1/fake/fake_federatedgroup.go | 2 +- .../fake/fake_federatedgroupbinding.go | 2 +- .../v1beta1/fake/fake_federatedingress.go | 2 +- .../types/v1beta1/fake/fake_federatedjob.go | 2 +- .../v1beta1/fake/fake_federatedlimitrange.go | 2 +- .../v1beta1/fake/fake_federatednamespace.go | 2 +- .../fake_federatedpersistentvolumeclaim.go | 2 +- .../fake/fake_federatedresourcequota.go | 2 +- .../v1beta1/fake/fake_federatedsecret.go | 2 +- .../v1beta1/fake/fake_federatedservice.go | 2 +- .../v1beta1/fake/fake_federatedstatefulset.go | 2 +- .../types/v1beta1/federatedapplication.go | 2 +- .../types/v1beta1/federatedclusterrole.go | 2 +- .../v1beta1/federatedclusterrolebinding.go | 2 +- .../typed/types/v1beta1/federatedconfigmap.go | 2 +- .../types/v1beta1/federateddeployment.go | 2 +- .../typed/types/v1beta1/federatedgroup.go | 2 +- .../types/v1beta1/federatedgroupbinding.go | 2 +- .../typed/types/v1beta1/federatedingress.go | 2 +- .../typed/types/v1beta1/federatedjob.go | 2 +- .../types/v1beta1/federatedlimitrange.go | 2 +- .../typed/types/v1beta1/federatednamespace.go | 2 +- .../v1beta1/federatedpersistentvolumeclaim.go | 2 +- .../types/v1beta1/federatedresourcequota.go | 2 +- .../typed/types/v1beta1/federatedsecret.go | 2 +- .../typed/types/v1beta1/federatedservice.go | 2 +- .../types/v1beta1/federatedstatefulset.go | 2 +- .../typed/types/v1beta1/types_client.go | 2 +- .../application/v1alpha1/helmapplication.go | 2 +- .../v1alpha1/helmapplicationversion.go | 2 +- .../application/v1alpha1/helmcategory.go | 2 +- .../application/v1alpha1/helmrelease.go | 2 +- .../application/v1alpha1/helmrepo.go | 2 +- .../auditing/v1alpha1/rule.go | 2 +- .../auditing/v1alpha1/webhook.go | 2 +- .../cluster/v1alpha1/cluster.go | 2 +- .../devops/v1alpha1/s2ibinary.go | 2 +- .../devops/v1alpha1/s2ibuilder.go | 2 +- .../devops/v1alpha1/s2ibuildertemplate.go | 2 +- .../devops/v1alpha1/s2irun.go | 2 +- .../devops/v1alpha3/devopsproject.go | 2 +- .../devops/v1alpha3/pipeline.go | 2 +- .../informers/externalversions/generic.go | 28 +- .../iam/v1alpha2/globalrole.go | 2 +- .../iam/v1alpha2/globalrolebinding.go | 2 +- .../externalversions/iam/v1alpha2/group.go | 2 +- .../iam/v1alpha2/groupbinding.go | 2 +- .../iam/v1alpha2/loginrecord.go | 2 +- .../externalversions/iam/v1alpha2/rolebase.go | 2 +- .../externalversions/iam/v1alpha2/user.go | 2 +- .../iam/v1alpha2/workspacerole.go | 2 +- .../iam/v1alpha2/workspacerolebinding.go | 2 +- .../network/v1alpha1/ipamblock.go | 2 +- .../network/v1alpha1/ipamhandle.go | 2 +- .../network/v1alpha1/ippool.go | 2 +- .../v1alpha1/namespacenetworkpolicy.go | 2 +- .../notification/v2beta1/config.go | 2 +- .../notification/v2beta1/receiver.go | 2 +- .../quota/v1alpha2/resourcequota.go | 2 +- .../servicemesh/v1alpha2/servicepolicy.go | 2 +- .../servicemesh/v1alpha2/strategy.go | 2 +- .../storage/v1alpha1/provisionercapability.go | 2 +- .../v1alpha1/storageclasscapability.go | 2 +- .../tenant/v1alpha1/workspace.go | 2 +- .../tenant/v1alpha2/workspacetemplate.go | 2 +- .../types/v1beta1/federatedapplication.go | 2 +- .../types/v1beta1/federatedclusterrole.go | 2 +- .../v1beta1/federatedclusterrolebinding.go | 2 +- .../types/v1beta1/federatedconfigmap.go | 2 +- .../types/v1beta1/federateddeployment.go | 2 +- .../types/v1beta1/federatedgroup.go | 2 +- .../types/v1beta1/federatedgroupbinding.go | 2 +- .../types/v1beta1/federatedingress.go | 2 +- .../types/v1beta1/federatedjob.go | 2 +- .../types/v1beta1/federatedlimitrange.go | 2 +- .../types/v1beta1/federatednamespace.go | 2 +- .../v1beta1/federatedpersistentvolumeclaim.go | 2 +- .../types/v1beta1/federatedresourcequota.go | 2 +- .../types/v1beta1/federatedsecret.go | 2 +- .../types/v1beta1/federatedservice.go | 2 +- .../types/v1beta1/federatedstatefulset.go | 2 +- .../application/v1alpha1/helmapplication.go | 2 +- .../v1alpha1/helmapplicationversion.go | 2 +- .../application/v1alpha1/helmcategory.go | 2 +- .../application/v1alpha1/helmrelease.go | 2 +- .../listers/application/v1alpha1/helmrepo.go | 2 +- pkg/client/listers/auditing/v1alpha1/rule.go | 2 +- .../listers/auditing/v1alpha1/webhook.go | 2 +- .../listers/cluster/v1alpha1/cluster.go | 2 +- .../listers/devops/v1alpha1/s2ibinary.go | 2 +- .../listers/devops/v1alpha1/s2ibuilder.go | 2 +- .../devops/v1alpha1/s2ibuildertemplate.go | 2 +- pkg/client/listers/devops/v1alpha1/s2irun.go | 2 +- .../listers/devops/v1alpha3/devopsproject.go | 2 +- .../listers/devops/v1alpha3/pipeline.go | 2 +- pkg/client/listers/iam/v1alpha2/globalrole.go | 2 +- .../listers/iam/v1alpha2/globalrolebinding.go | 2 +- pkg/client/listers/iam/v1alpha2/group.go | 2 +- .../listers/iam/v1alpha2/groupbinding.go | 2 +- .../listers/iam/v1alpha2/loginrecord.go | 2 +- pkg/client/listers/iam/v1alpha2/rolebase.go | 2 +- pkg/client/listers/iam/v1alpha2/user.go | 2 +- .../listers/iam/v1alpha2/workspacerole.go | 2 +- .../iam/v1alpha2/workspacerolebinding.go | 2 +- .../listers/network/v1alpha1/ipamblock.go | 2 +- .../listers/network/v1alpha1/ipamhandle.go | 2 +- pkg/client/listers/network/v1alpha1/ippool.go | 2 +- .../v1alpha1/namespacenetworkpolicy.go | 2 +- .../listers/notification/v2beta1/config.go | 2 +- .../listers/notification/v2beta1/receiver.go | 2 +- .../listers/quota/v1alpha2/resourcequota.go | 2 +- .../servicemesh/v1alpha2/servicepolicy.go | 2 +- .../listers/servicemesh/v1alpha2/strategy.go | 2 +- .../storage/v1alpha1/provisionercapability.go | 2 +- .../v1alpha1/storageclasscapability.go | 2 +- .../listers/tenant/v1alpha1/workspace.go | 2 +- .../tenant/v1alpha2/workspacetemplate.go | 2 +- .../types/v1beta1/federatedapplication.go | 2 +- .../types/v1beta1/federatedclusterrole.go | 2 +- .../v1beta1/federatedclusterrolebinding.go | 2 +- .../types/v1beta1/federatedconfigmap.go | 2 +- .../types/v1beta1/federateddeployment.go | 2 +- .../listers/types/v1beta1/federatedgroup.go | 2 +- .../types/v1beta1/federatedgroupbinding.go | 2 +- .../listers/types/v1beta1/federatedingress.go | 2 +- .../listers/types/v1beta1/federatedjob.go | 2 +- .../types/v1beta1/federatedlimitrange.go | 2 +- .../types/v1beta1/federatednamespace.go | 2 +- .../v1beta1/federatedpersistentvolumeclaim.go | 2 +- .../types/v1beta1/federatedresourcequota.go | 2 +- .../listers/types/v1beta1/federatedsecret.go | 2 +- .../listers/types/v1beta1/federatedservice.go | 2 +- .../types/v1beta1/federatedstatefulset.go | 2 +- .../application/application_controller.go | 3 +- pkg/controller/cluster/cluster_controller.go | 3 +- pkg/controller/cluster/join.go | 3 +- .../clusterrolebinding_controller.go | 3 +- .../destinationrule_controller.go | 2 +- .../destinationrule_controller_test.go | 3 +- .../devopscredential_controller.go | 3 +- .../devopscredential_controller_test.go | 2 +- .../devopsproject/devopsproject_controller.go | 3 +- .../devopsproject_controller_test.go | 6 +- .../globalrole/globalrole_controller.go | 3 +- .../globalrolebinding_controller.go | 3 +- pkg/controller/group/group_controller.go | 7 +- pkg/controller/group/group_controller_test.go | 7 +- .../groupbinding/groupbinding_controller.go | 5 +- .../groupbinding_controller_test.go | 7 +- .../loginrecord/loginrecord_controller.go | 3 +- .../loginrecord_controller_test.go | 3 +- .../namespace/namespace_controller.go | 5 +- .../namespace/namespace_controller_test.go | 3 +- .../network/ippool/ippool_controller.go | 5 +- .../network/ippool/ippool_controller_test.go | 3 +- .../nsnetworkpolicy_controller.go | 5 +- .../nsnetworkpolicy/nsnetworkpolicy_test.go | 5 +- .../nsnetworkpolicy/provider/ns_k8s.go | 2 +- .../notification/notification_controller.go | 7 +- .../notification_controller_suite_test.go | 3 +- .../notification_controller_test.go | 7 +- .../helm_application_controller.go | 3 +- .../helm_application_version_controller.go | 3 +- .../helmcategory/helm_category_controller.go | 3 +- .../helm_category_controller_test.go | 3 +- .../openpitrix/helmrelease/get_chart_data.go | 3 +- .../helmrelease/helm_release_controller.go | 5 +- .../helmrepo/helm_repo_controller.go | 3 +- .../helmrepo/helm_repo_controller_test.go | 3 +- .../pipeline/pipeline_controller.go | 3 +- .../pipeline/pipeline_controller_test.go | 3 +- pkg/controller/quota/accessor.go | 2 +- .../quota/resourcequota_controller.go | 5 +- pkg/controller/quota/util.go | 2 +- .../s2ibinary/s2ibinary_controller.go | 3 +- .../s2ibinary/s2ibinary_controller_test.go | 3 +- pkg/controller/s2irun/s2irun_controller.go | 3 +- .../s2irun/s2irun_controller_test.go | 3 +- .../serviceaccount_controller.go | 3 +- .../serviceaccount_controller_test.go | 3 +- .../capability/capability_controller.go | 3 +- .../capability/capability_controller_test.go | 3 +- .../storage/capability/csi_capability.go | 2 +- .../storage/capability/csi_capability_test.go | 2 +- pkg/controller/user/user_controller.go | 3 +- pkg/controller/user/user_controller_test.go | 3 +- pkg/controller/user/user_webhook.go | 2 +- .../virtualservice_controller.go | 3 +- .../virtualservice_controller_test.go | 3 +- .../workspace/workspace_controller.go | 3 +- .../workspace/workspace_controller_test.go | 2 +- .../workspacerole/workspacerole_controller.go | 7 +- .../workspacerole_controller_test.go | 6 +- .../workspacerolebinding_controller.go | 7 +- .../workspacerolebinding_controller_test.go | 6 +- .../workspacetemplate_controller.go | 11 +- ...workspacetemplate_controller_suite_test.go | 5 +- .../workspacetemplate_controller_test.go | 6 +- pkg/kapis/cluster/v1alpha1/handler.go | 3 +- pkg/kapis/cluster/v1alpha1/handler_test.go | 3 +- pkg/kapis/devops/v1alpha2/devops.go | 3 +- pkg/kapis/devops/v1alpha2/devops_test.go | 3 +- pkg/kapis/devops/v1alpha2/register.go | 3 +- pkg/kapis/devops/v1alpha3/handler.go | 3 +- pkg/kapis/devops/v1alpha3/register.go | 3 +- pkg/kapis/iam/v1alpha2/handler.go | 3 +- pkg/kapis/iam/v1alpha2/register.go | 3 +- pkg/kapis/oauth/handler.go | 3 +- pkg/kapis/openpitrix/v1/handler.go | 3 +- pkg/kapis/openpitrix/v2alpha1/register.go | 3 +- pkg/kapis/tenant/v1alpha2/handler.go | 5 +- pkg/kapis/tenant/v1alpha2/register.go | 5 +- pkg/models/auth/authenticator.go | 3 +- pkg/models/auth/login_recoder.go | 3 +- pkg/models/devops/devops.go | 7 +- pkg/models/devops/s2ibinary_handler.go | 3 +- pkg/models/devops/s2ibinary_handler_test.go | 3 +- pkg/models/iam/am/am.go | 5 +- pkg/models/iam/group/group.go | 5 +- pkg/models/iam/im/im.go | 3 +- pkg/models/kubeconfig/kubeconfig.go | 3 +- pkg/models/monitoring/monitoring.go | 3 +- pkg/models/notification/notification.go | 3 +- pkg/models/openpitrix/applications.go | 3 +- pkg/models/openpitrix/applicationversions.go | 3 +- pkg/models/openpitrix/attachments.go | 3 +- pkg/models/openpitrix/categories.go | 3 +- pkg/models/openpitrix/interface.go | 3 +- pkg/models/openpitrix/release.go | 3 +- pkg/models/openpitrix/repo_test.go | 3 +- pkg/models/openpitrix/repos.go | 3 +- pkg/models/openpitrix/utils.go | 3 +- .../openpitrix/v2alpha1/applications.go | 3 +- .../v2alpha1/applicationsversions.go | 3 +- pkg/models/openpitrix/v2alpha1/categories.go | 3 +- pkg/models/openpitrix/v2alpha1/release.go | 3 +- pkg/models/openpitrix/v2alpha1/repos.go | 3 +- .../s2buildertemplate/s2ibuildertemplate.go | 3 +- .../v1alpha2/s2ibuilder/s2ibuilder.go | 3 +- .../resources/v1alpha2/s2irun/s2irun.go | 3 +- .../v1alpha2/workspace/workspaces.go | 3 +- .../resources/v1alpha3/cluster/clusters.go | 3 +- .../v1alpha3/cluster/clusters_test.go | 3 +- .../v1alpha3/clusterrole/clusterroles.go | 3 +- .../resources/v1alpha3/devops/devops.go | 3 +- .../federatedapplications.go | 3 +- .../federatedconfigmap/federatedconfigmaps.go | 3 +- .../federateddeployments.go | 3 +- .../federatedingress/federatedingresses.go | 3 +- .../federatednamespace/federatednamespaces.go | 3 +- .../federatedpersistentvolumeclaims.go | 3 +- .../federatedsecret/federatedsecret.go | 3 +- .../federatedservice/federatedservices.go | 3 +- .../federatedstatefulsets.go | 3 +- .../v1alpha3/globalrole/globalroles.go | 3 +- .../v1alpha3/globalrole/globalroles_test.go | 3 +- .../globalrolebinding/globalrolebindings.go | 3 +- .../globalrolebindings_test.go | 3 +- pkg/models/resources/v1alpha3/group/group.go | 3 +- .../resources/v1alpha3/group/group_test.go | 3 +- .../v1alpha3/groupbinding/groupbinding.go | 3 +- .../groupbinding/groupbinding_test.go | 3 +- .../resources/v1alpha3/ippool/ippools.go | 3 +- .../resources/v1alpha3/ippool/ippools_test.go | 5 +- .../v1alpha3/loginrecord/loginrecords.go | 3 +- .../v1alpha3/loginrecord/loginrecords_test.go | 3 +- .../notification/notification_test.go | 3 +- .../openpitrix/application/applications.go | 3 +- .../applicationsversions.go | 3 +- .../v1alpha3/openpitrix/category/category.go | 3 +- .../openpitrix/helmrelease/releases.go | 3 +- .../v1alpha3/openpitrix/repo/repo.go | 3 +- .../resources/v1alpha3/resource/resource.go | 17 +- pkg/models/resources/v1alpha3/role/roles.go | 3 +- pkg/models/resources/v1alpha3/user/users.go | 5 +- .../resources/v1alpha3/user/users_test.go | 3 +- .../v1alpha3/workspace/workspaces.go | 3 +- .../v1alpha3/workspace/workspaces_test.go | 3 +- .../v1alpha3/workspacerole/workspaceroles.go | 5 +- .../workspacerole/workspaceroles_test.go | 3 +- .../workspacerolebindings.go | 3 +- .../workspacerolebindings_test.go | 3 +- .../workspacetemplate/workspacetemplates.go | 3 +- .../workspacetemplates_test.go | 3 +- pkg/models/tenant/devops.go | 5 +- pkg/models/tenant/metering.go | 3 +- pkg/models/tenant/resourcequota.go | 4 +- pkg/models/tenant/tenant.go | 11 +- pkg/models/tenant/tenent_test.go | 7 +- pkg/simple/client/devops/fake/fakedevops.go | 3 +- .../client/devops/jenkins/credential.go | 3 +- .../devops/jenkins/internal/bitbucket.go | 2 +- .../client/devops/jenkins/internal/git.go | 2 +- .../client/devops/jenkins/internal/github.go | 2 +- .../client/devops/jenkins/internal/gitlab.go | 2 +- .../client/devops/jenkins/internal/svn.go | 2 +- .../devops/jenkins/pipeline_internal.go | 3 +- .../devops/jenkins/pipeline_internal_test.go | 2 +- .../client/devops/jenkins/project_pipeline.go | 3 +- pkg/simple/client/devops/project_pipeline.go | 2 +- pkg/simple/client/ldap/interface.go | 3 +- pkg/simple/client/ldap/ldap.go | 3 +- pkg/simple/client/ldap/simple_ldap.go | 3 +- pkg/simple/client/ldap/simple_ldap_test.go | 2 +- .../clientset/versioned/fake/register.go | 2 +- .../clientset/versioned/scheme/register.go | 2 +- .../typed/network/calicov3/blockaffinity.go | 3 +- .../calicov3/fake/fake_blockaffinity.go | 2 +- .../network/calicov3/fake/fake_ipamblock.go | 2 +- .../network/calicov3/fake/fake_ippool.go | 2 +- .../typed/network/calicov3/ipamblock.go | 3 +- .../typed/network/calicov3/ippool.go | 3 +- .../typed/network/calicov3/network_client.go | 3 +- .../informers/externalversions/generic.go | 2 +- .../network/calicov3/blockaffinity.go | 3 +- .../network/calicov3/ipamblock.go | 3 +- .../network/calicov3/ippool.go | 3 +- .../listers/network/calicov3/blockaffinity.go | 2 +- .../listers/network/calicov3/ipamblock.go | 2 +- .../client/listers/network/calicov3/ippool.go | 2 +- .../client/network/ippool/calico/provider.go | 5 +- .../network/ippool/calico/provider_test.go | 5 +- .../client/network/ippool/ipam/interface.go | 2 +- pkg/simple/client/network/ippool/ipam/ipam.go | 3 +- .../client/network/ippool/ipam/ipam_test.go | 3 +- pkg/simple/client/network/ippool/provider.go | 3 +- .../client/network/ippool/provider_test.go | 3 +- pkg/simple/client/network/options.go | 2 +- .../openpitrix/helmrepoindex/load_chart.go | 3 +- .../openpitrix/helmrepoindex/repo_index.go | 3 +- .../helmrepoindex/repo_index_test.go | 2 +- pkg/utils/clusterclient/clusterclient.go | 3 +- pkg/utils/k8sutil/k8sutil.go | 4 +- pkg/utils/k8sutil/k8sutil_test.go | 2 +- pkg/utils/reposcache/repo_cahes.go | 3 +- staging/README.md | 1 + staging/publishing/rules.yaml | 8 + staging/src/kubesphere.io/api/CONTRIBUTING.md | 3 + staging/src/kubesphere.io/api/LICENSE | 201 ++++++ staging/src/kubesphere.io/api/OWNERS | 16 + staging/src/kubesphere.io/api/README.md | 7 + .../src/kubesphere.io/api}/application/OWNERS | 0 .../api}/application/crdinstall/install.go | 2 +- .../kubesphere.io/api}/application/group.go | 0 .../api}/application/v1alpha1/constants.go | 0 .../api}/application/v1alpha1/doc.go | 0 .../v1alpha1/helmapplication_types.go | 0 .../v1alpha1/helmapplicationversion_types.go | 0 .../v1alpha1/helmcategory_types.go | 0 .../application/v1alpha1/helmrelease_types.go | 0 .../application/v1alpha1/helmrepo_types.go | 0 .../api}/application/v1alpha1/register.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 .../src/kubesphere.io/api}/auditing/group.go | 0 .../api}/auditing/v1alpha1/doc.go | 0 .../api}/auditing/v1alpha1/register.go | 0 .../api}/auditing/v1alpha1/rule_types.go | 0 .../auditing/v1alpha1/v1alpha1_suite_test.go | 0 .../api}/auditing/v1alpha1/webhook_types.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../src/kubesphere.io/api}/cluster/group.go | 0 .../api}/cluster/v1alpha1/cluster_types.go | 0 .../api}/cluster/v1alpha1/doc.go | 2 +- .../cluster/v1alpha1/openapi_generated.go | 536 +++++++------- .../api}/cluster/v1alpha1/register.go | 0 .../cluster/v1alpha1/zz_generated.deepcopy.go | 0 .../src/kubesphere.io/api}/devops/OWNERS | 0 .../api}/devops/crdinstall/install.go | 4 +- .../src/kubesphere.io/api}/devops/group.go | 0 .../kubesphere.io/api}/devops/v1alpha1/doc.go | 2 +- .../api}/devops/v1alpha1/openapi_generated.go | 662 +++++++++--------- .../api}/devops/v1alpha1/register.go | 2 +- .../api}/devops/v1alpha1/s2ibinary_types.go | 0 .../devops/v1alpha1/s2ibinary_types_test.go | 0 .../api}/devops/v1alpha1/s2ibuilder_types.go | 0 .../devops/v1alpha1/s2ibuilder_types_test.go | 0 .../v1alpha1/s2ibuildertemplate_types.go | 0 .../v1alpha1/s2ibuildertemplate_types_test.go | 0 .../api}/devops/v1alpha1/s2irun_types.go | 0 .../api}/devops/v1alpha1/s2irun_types_test.go | 0 .../devops/v1alpha1/v1alpha1_suite_test.go | 0 .../devops/v1alpha1/zz_generated.deepcopy.go | 2 +- .../api}/devops/v1alpha3/credential_types.go | 0 .../devops/v1alpha3/devopsproject_types.go | 0 .../v1alpha3/devopsproject_types_test.go | 0 .../kubesphere.io/api}/devops/v1alpha3/doc.go | 2 +- .../api}/devops/v1alpha3/openapi_generated.go | 214 +++--- .../api}/devops/v1alpha3/pipeline_types.go | 0 .../devops/v1alpha3/pipeline_types_test.go | 0 .../api}/devops/v1alpha3/register.go | 2 +- .../devops/v1alpha3/v1alpha3_suite_test.go | 0 .../devops/v1alpha3/zz_generated.deepcopy.go | 0 staging/src/kubesphere.io/api/go.mod | 13 + staging/src/kubesphere.io/api/go.sum | 414 +++++++++++ .../src/kubesphere.io/api}/iam/group.go | 0 .../kubesphere.io/api}/iam/v1alpha2/doc.go | 2 +- .../api}/iam/v1alpha2/federated_types.go | 0 .../api}/iam/v1alpha2/group_test.go | 0 .../api}/iam/v1alpha2/group_types.go | 0 .../api}/iam/v1alpha2/groupbinding_test.go | 0 .../api}/iam/v1alpha2/groupbinding_types.go | 0 .../api}/iam/v1alpha2/register.go | 2 +- .../kubesphere.io/api}/iam/v1alpha2/types.go | 0 .../api}/iam/v1alpha2/types_test.go | 0 .../api}/iam/v1alpha2/v1alpha2_suite_test.go | 0 .../iam/v1alpha2/zz_generated.deepcopy.go | 2 +- .../src/kubesphere.io/api}/network/OWNERS | 0 .../network/calicov3/block_affinity_types.go | 0 .../api}/network/calicov3/doc.go | 0 .../api}/network/calicov3/ipamblock_types.go | 0 .../api}/network/calicov3/ippool_types.go | 0 .../api}/network/calicov3/register.go | 0 .../network/calicov3/zz_generated.deepcopy.go | 0 .../api}/network/crdinstall/install.go | 2 +- .../src/kubesphere.io/api}/network/group.go | 0 .../api}/network/v1alpha1/doc.go | 2 +- .../api}/network/v1alpha1/ipamblock_types.go | 0 .../network/v1alpha1/ipamblock_types_test.go | 0 .../api}/network/v1alpha1/ipamhandle_types.go | 0 .../network/v1alpha1/ipamhandle_types_test.go | 0 .../api}/network/v1alpha1/ippool_types.go | 0 .../network/v1alpha1/ippool_types_test.go | 0 .../v1alpha1/namespacenetworkpolicy_types.go | 0 .../namespacenetworkpolicy_types_test.go | 0 .../network/v1alpha1/openapi_generated.go | 230 +++--- .../api}/network/v1alpha1/register.go | 2 +- .../network/v1alpha1/v1alpha1_suite_test.go | 0 .../network/v1alpha1/zz_generated.deepcopy.go | 2 +- .../kubesphere.io/api}/notification/group.go | 0 .../api}/notification/v2beta1/config_types.go | 0 .../api}/notification/v2beta1/doc.go | 0 .../v2beta1/notificationmanager_types.go | 0 .../notification/v2beta1/receiver_types.go | 0 .../api}/notification/v2beta1/register.go | 0 .../api}/notification/v2beta1/types.go | 0 .../v2beta1/v2beta1_suite_test.go | 0 .../v2beta1/zz_generated.deepcopy.go | 2 +- .../src/kubesphere.io/api}/quota/group.go | 0 .../kubesphere.io/api}/quota/v1alpha2/doc.go | 2 +- .../api}/quota/v1alpha2/register.go | 2 +- .../api}/quota/v1alpha2/types.go | 0 .../api}/quota/v1alpha2/types_test.go | 0 .../quota/v1alpha2/v1alpha2_suite_test.go | 0 .../quota/v1alpha2/zz_generated.deepcopy.go | 0 .../api}/servicemesh/crdinstall/install.go | 2 +- .../kubesphere.io/api}/servicemesh/group.go | 0 .../api}/servicemesh/v1alpha2/doc.go | 2 +- .../servicemesh/v1alpha2/openapi_generated.go | 154 ++-- .../api}/servicemesh/v1alpha2/register.go | 2 +- .../v1alpha2/servicepolicy_types.go | 0 .../v1alpha2/servicepolicy_types_test.go | 0 .../servicemesh/v1alpha2/strategy_types.go | 0 .../v1alpha2/strategy_types_test.go | 0 .../v1alpha2/v1alpha2_suite_test.go | 0 .../v1alpha2/zz_generated.deepcopy.go | 2 +- .../api}/storage/crdinstall/install.go | 2 +- .../src/kubesphere.io/api}/storage/group.go | 0 .../api}/storage/v1alpha1/capability_types.go | 0 .../api}/storage/v1alpha1/doc.go | 2 +- .../api}/storage/v1alpha1/register.go | 2 +- .../storage/v1alpha1/zz_generated.deepcopy.go | 0 .../api}/tenant/crdinstall/install.go | 4 +- .../src/kubesphere.io/api}/tenant/group.go | 0 .../kubesphere.io/api}/tenant/v1alpha1/doc.go | 2 +- .../api}/tenant/v1alpha1/openapi_generated.go | 112 +-- .../api}/tenant/v1alpha1/register.go | 2 +- .../tenant/v1alpha1/v1alpha1_suite_test.go | 0 .../api}/tenant/v1alpha1/workspace_types.go | 0 .../tenant/v1alpha1/workspace_types_test.go | 0 .../tenant/v1alpha1/zz_generated.deepcopy.go | 0 .../kubesphere.io/api}/tenant/v1alpha2/doc.go | 2 +- .../api}/tenant/v1alpha2/register.go | 2 +- .../tenant/v1alpha2/v1alpha2_suite_test.go | 0 .../v1alpha2/workspacetemplate_types.go | 2 +- .../v1alpha2/workspacetemplate_types_test.go | 0 .../tenant/v1alpha2/zz_generated.deepcopy.go | 0 .../src/kubesphere.io/api}/types/group.go | 0 .../kubesphere.io/api}/types/v1beta1/doc.go | 2 +- .../v1beta1/federatedapplication_types.go | 0 .../v1beta1/federatedclusterrole_types.go | 0 .../federatedclusterrolebinding_types.go | 0 .../types/v1beta1/federatedconfigmap_types.go | 0 .../v1beta1/federateddeployment_types.go | 0 .../types/v1beta1/federatedgroup_types.go | 2 +- .../v1beta1/federatedgroupbinding_types.go | 2 +- .../types/v1beta1/federatedingress_types.go | 0 .../api}/types/v1beta1/federatedjob_types.go | 0 .../v1beta1/federatedlimitrange_types.go | 0 .../types/v1beta1/federatednamespace_types.go | 0 .../federatednotificationconfig_types.go | 2 +- .../federatednotificationreceiver_types.go | 2 +- .../federatedpersistentvolumeclaim_types.go | 0 .../v1beta1/federatedresourcequota_types.go | 0 .../types/v1beta1/federatedsecret_types.go | 0 .../types/v1beta1/federatedservice_types.go | 0 .../v1beta1/federatedstatefulset_types.go | 0 .../api}/types/v1beta1/federateduser_types.go | 2 +- .../types/v1beta1/federatedworkspace_types.go | 2 +- .../v1beta1/federatedworkspacerole_types.go | 0 .../federatedworkspacerolebinding_types.go | 0 .../api}/types/v1beta1/register.go | 2 +- .../kubesphere.io/api}/types/v1beta1/types.go | 0 .../types/v1beta1/zz_generated.deepcopy.go | 2 +- test/e2e/framework/iam/fixtures.go | 2 +- test/e2e/framework/workspace/fixtures.go | 6 +- test/e2e/groups.go | 3 +- test/e2e/help_test.go | 39 ++ test/e2e/workspaces.go | 3 +- tools/cmd/crd-doc-gen/main.go | 25 +- vendor/kubesphere.io/api | 1 + vendor/modules.txt | 21 + 632 files changed, 2493 insertions(+), 1585 deletions(-) create mode 100644 staging/src/kubesphere.io/api/CONTRIBUTING.md create mode 100644 staging/src/kubesphere.io/api/LICENSE create mode 100644 staging/src/kubesphere.io/api/OWNERS create mode 100644 staging/src/kubesphere.io/api/README.md rename {pkg/apis => staging/src/kubesphere.io/api}/application/OWNERS (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/crdinstall/install.go (93%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/constants.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/doc.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/helmapplication_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/helmapplicationversion_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/helmcategory_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/helmrelease_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/helmrepo_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/register.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/application/v1alpha1/zz_generated.deepcopy.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/auditing/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/auditing/v1alpha1/doc.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/auditing/v1alpha1/register.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/auditing/v1alpha1/rule_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/auditing/v1alpha1/v1alpha1_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/auditing/v1alpha1/webhook_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/auditing/v1alpha1/zz_generated.deepcopy.go (99%) rename {pkg/apis => staging/src/kubesphere.io/api}/cluster/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/cluster/v1alpha1/cluster_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/cluster/v1alpha1/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/cluster/v1alpha1/openapi_generated.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/cluster/v1alpha1/register.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/cluster/v1alpha1/zz_generated.deepcopy.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/OWNERS (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/crdinstall/install.go (87%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/openapi_generated.go (96%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/register.go (95%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2ibinary_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2ibinary_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2ibuilder_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2ibuilder_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2ibuildertemplate_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2ibuildertemplate_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2irun_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/s2irun_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/v1alpha1_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha1/zz_generated.deepcopy.go (99%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/credential_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/devopsproject_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/devopsproject_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/openapi_generated.go (93%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/pipeline_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/pipeline_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/register.go (95%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/v1alpha3_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/devops/v1alpha3/zz_generated.deepcopy.go (100%) create mode 100644 staging/src/kubesphere.io/api/go.mod create mode 100644 staging/src/kubesphere.io/api/go.sum rename {pkg/apis => staging/src/kubesphere.io/api}/iam/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/federated_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/group_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/group_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/groupbinding_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/groupbinding_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/register.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/v1alpha2_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/iam/v1alpha2/zz_generated.deepcopy.go (99%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/OWNERS (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/calicov3/block_affinity_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/calicov3/doc.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/calicov3/ipamblock_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/calicov3/ippool_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/calicov3/register.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/calicov3/zz_generated.deepcopy.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/crdinstall/install.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/ipamblock_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/ipamblock_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/ipamhandle_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/ipamhandle_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/ippool_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/ippool_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/namespacenetworkpolicy_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/namespacenetworkpolicy_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/openapi_generated.go (93%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/register.go (96%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/v1alpha1_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/network/v1alpha1/zz_generated.deepcopy.go (99%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/config_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/doc.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/notificationmanager_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/receiver_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/register.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/v2beta1_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/notification/v2beta1/zz_generated.deepcopy.go (99%) rename {pkg/apis => staging/src/kubesphere.io/api}/quota/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/quota/v1alpha2/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/quota/v1alpha2/register.go (96%) rename {pkg/apis => staging/src/kubesphere.io/api}/quota/v1alpha2/types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/quota/v1alpha2/types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/quota/v1alpha2/v1alpha2_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/quota/v1alpha2/zz_generated.deepcopy.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/crdinstall/install.go (91%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/openapi_generated.go (94%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/register.go (95%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/servicepolicy_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/servicepolicy_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/strategy_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/strategy_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/v1alpha2_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/servicemesh/v1alpha2/zz_generated.deepcopy.go (99%) rename {pkg/apis => staging/src/kubesphere.io/api}/storage/crdinstall/install.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/storage/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/storage/v1alpha1/capability_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/storage/v1alpha1/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/storage/v1alpha1/register.go (95%) rename {pkg/apis => staging/src/kubesphere.io/api}/storage/v1alpha1/zz_generated.deepcopy.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/crdinstall/install.go (88%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha1/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha1/openapi_generated.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha1/register.go (95%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha1/v1alpha1_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha1/workspace_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha1/workspace_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha1/zz_generated.deepcopy.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha2/doc.go (92%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha2/register.go (95%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha2/v1alpha2_suite_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha2/workspacetemplate_types.go (96%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha2/workspacetemplate_types_test.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/tenant/v1alpha2/zz_generated.deepcopy.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/group.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/doc.go (91%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedapplication_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedclusterrole_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedclusterrolebinding_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedconfigmap_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federateddeployment_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedgroup_types.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedgroupbinding_types.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedingress_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedjob_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedlimitrange_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatednamespace_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatednotificationconfig_types.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatednotificationreceiver_types.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedpersistentvolumeclaim_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedresourcequota_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedsecret_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedservice_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedstatefulset_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federateduser_types.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedworkspace_types.go (96%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedworkspacerole_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/federatedworkspacerolebinding_types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/register.go (97%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/types.go (100%) rename {pkg/apis => staging/src/kubesphere.io/api}/types/v1beta1/zz_generated.deepcopy.go (99%) create mode 100644 test/e2e/help_test.go create mode 120000 vendor/kubesphere.io/api diff --git a/Makefile b/Makefile index 2ea26f8a6d..22ec038f54 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) CRD_OPTIONS ?= "crd:trivialVersions=true" +GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 tenant:v1alpha2 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1 storage:v1alpha1 auditing:v1alpha1 types:v1beta1 quota:v1alpha2 application:v1alpha1 notification:v2beta1" + # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) GOBIN=$(shell go env GOPATH)/bin @@ -71,16 +73,15 @@ mockgen: mockgen -package=openpitrix -source=pkg/simple/client/openpitrix/openpitrix.go -destination=pkg/simple/client/openpitrix/mock.go deepcopy: - GO111MODULE=on go install -mod=vendor k8s.io/code-generator/cmd/deepcopy-gen - ${GOPATH}/bin/deepcopy-gen -i kubesphere.io/kubesphere/pkg/apis/... -h ./hack/boilerplate.go.txt -O zz_generated.deepcopy + hack/generate_group.sh "deepcopy" kubesphere.io/api kubesphere.io/api ${GV} --output-base=staging/src/ -h "hack/boilerplate.go.txt" openapi: - go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/tenant/v1alpha1 -p kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list - go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/servicemesh/v1alpha2 -p kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list - go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/api/networking/v1,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/util/intstr,./pkg/apis/network/v1alpha1 -p kubesphere.io/kubesphere/pkg/apis/network/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list - go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/devops/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list - go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/cluster/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list - go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/devops/v1alpha3,./vendor/k8s.io/apimachinery/pkg/runtime -p kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list + go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/tenant/v1alpha1 -p kubesphere.io/api/tenant/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list + go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/servicemesh/v1alpha2 -p kubesphere.io/api/servicemesh/v1alpha2 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list + go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/api/networking/v1,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/util/intstr,./pkg/apis/network/v1alpha1 -p kubesphere.io/api/network/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list + go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/devops/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/api/devops/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list + go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/cluster/v1alpha1,./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/api/core/v1 -p kubesphere.io/api/cluster/v1alpha1 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list + go run ./vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i ./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./pkg/apis/devops/v1alpha3,./vendor/k8s.io/apimachinery/pkg/runtime -p kubesphere.io/api/devops/v1alpha3 -h ./hack/boilerplate.go.txt --report-filename ./api/api-rules/violation_exceptions.list go run ./tools/cmd/crd-doc-gen/main.go go run ./tools/cmd/doc-gen/main.go # Build the docker image @@ -101,7 +102,7 @@ clean: # find or download controller-gen # download controller-gen if necessary clientset: - ./hack/generate_client.sh + ./hack/generate_client.sh ${GV} # Currently in the upgrade phase of controller tools. diff --git a/cmd/controller-manager/app/controllers.go b/cmd/controller-manager/app/controllers.go index 236e946494..ce0ee19254 100644 --- a/cmd/controller-manager/app/controllers.go +++ b/cmd/controller-manager/app/controllers.go @@ -23,7 +23,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/kubefed/pkg/controller/util" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/controller/certificatesigningrequest" "kubesphere.io/kubesphere/pkg/controller/cluster" diff --git a/go.mod b/go.mod index 4466f86546..c1e4816fbf 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,6 @@ require ( github.com/stretchr/testify v1.6.1 github.com/xanzy/ssh-agent v0.2.1 // indirect golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de - golang.org/x/net v0.0.0-20201224014010-6772e930b67b golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d google.golang.org/grpc v1.30.0 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect @@ -105,6 +104,7 @@ require ( k8s.io/kubectl v0.19.3 k8s.io/metrics v0.18.6 k8s.io/utils v0.0.0-20201005171033-6301aaf42dc7 + kubesphere.io/api v0.0.0 kubesphere.io/client-go v0.0.0 kubesphere.io/monitoring-dashboard v0.1.2 sigs.k8s.io/application v0.8.4-0.20201016185654-c8e2959e57a0 @@ -735,6 +735,7 @@ replace ( k8s.io/kubectl => k8s.io/kubectl v0.18.6 k8s.io/metrics => k8s.io/metrics v0.18.6 k8s.io/utils => k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 + kubesphere.io/api => ./staging/src/kubesphere.io/api kubesphere.io/client-go => ./staging/src/kubesphere.io/client-go kubesphere.io/monitoring-dashboard => kubesphere.io/monitoring-dashboard v0.1.2 rsc.io/binaryregexp => rsc.io/binaryregexp v0.2.0 diff --git a/hack/generate_client.sh b/hack/generate_client.sh index a012df988e..8cb55570b4 100755 --- a/hack/generate_client.sh +++ b/hack/generate_client.sh @@ -2,9 +2,9 @@ set -e -GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 tenant:v1alpha2 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1 storage:v1alpha1 auditing:v1alpha1 types:v1beta1 quota:v1alpha2 application:v1alpha1 notification:v2beta1" +GV="$1" rm -rf ./pkg/client -./hack/generate_group.sh "client,lister,informer" kubesphere.io/kubesphere/pkg/client kubesphere.io/kubesphere/pkg/apis "$GV" --output-base=./ -h "$PWD/hack/boilerplate.go.txt" +./hack/generate_group.sh "client,lister,informer" kubesphere.io/kubesphere/pkg/client kubesphere.io/api "${GV}" --output-base=./ -h "$PWD/hack/boilerplate.go.txt" mv kubesphere.io/kubesphere/pkg/client ./pkg/ rm -rf ./kubesphere.io diff --git a/hack/generate_group.sh b/hack/generate_group.sh index 4341dd2bfd..9e23f272bf 100755 --- a/hack/generate_group.sh +++ b/hack/generate_group.sh @@ -48,7 +48,7 @@ GROUPS_WITH_VERSIONS="$4" shift 4 -GO111MODULE=on go install -mod=vendor k8s.io/code-generator/cmd/{client-gen,lister-gen,informer-gen} +GO111MODULE=on go install -mod=vendor k8s.io/code-generator/cmd/{client-gen,lister-gen,informer-gen,deepcopy-gen} function codegen::join() { local IFS="$1"; shift; echo "$*"; } diff --git a/pkg/apis/addtoscheme_application_v1alpha1.go b/pkg/apis/addtoscheme_application_v1alpha1.go index b0f4571937..9812b7b391 100644 --- a/pkg/apis/addtoscheme_application_v1alpha1.go +++ b/pkg/apis/addtoscheme_application_v1alpha1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_audting_v1alpha1.go b/pkg/apis/addtoscheme_audting_v1alpha1.go index 16e1d6abac..7924c99901 100644 --- a/pkg/apis/addtoscheme_audting_v1alpha1.go +++ b/pkg/apis/addtoscheme_audting_v1alpha1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + "kubesphere.io/api/auditing/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_cluster_v1alpha1.go b/pkg/apis/addtoscheme_cluster_v1alpha1.go index f03a9de736..355dc55b27 100644 --- a/pkg/apis/addtoscheme_cluster_v1alpha1.go +++ b/pkg/apis/addtoscheme_cluster_v1alpha1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + "kubesphere.io/api/cluster/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_devops_v1alpha1.go b/pkg/apis/addtoscheme_devops_v1alpha1.go index 59b3e3112b..496276b94e 100644 --- a/pkg/apis/addtoscheme_devops_v1alpha1.go +++ b/pkg/apis/addtoscheme_devops_v1alpha1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + "kubesphere.io/api/devops/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_devops_v1alpha3.go b/pkg/apis/addtoscheme_devops_v1alpha3.go index 352d735148..a8e6bfd71f 100644 --- a/pkg/apis/addtoscheme_devops_v1alpha3.go +++ b/pkg/apis/addtoscheme_devops_v1alpha3.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - api "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + api "kubesphere.io/api/devops/v1alpha3" ) func init() { diff --git a/pkg/apis/addtoscheme_iam_v1alpha2.go b/pkg/apis/addtoscheme_iam_v1alpha2.go index a74ef9612a..ccf0484d8d 100644 --- a/pkg/apis/addtoscheme_iam_v1alpha2.go +++ b/pkg/apis/addtoscheme_iam_v1alpha2.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" ) func init() { diff --git a/pkg/apis/addtoscheme_network_v1alpha1.go b/pkg/apis/addtoscheme_network_v1alpha1.go index 7523f691b5..7de6a62a2c 100644 --- a/pkg/apis/addtoscheme_network_v1alpha1.go +++ b/pkg/apis/addtoscheme_network_v1alpha1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - api "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + api "kubesphere.io/api/network/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_notification_v2beta1.go b/pkg/apis/addtoscheme_notification_v2beta1.go index 139a3a4459..3d05d2d4c5 100644 --- a/pkg/apis/addtoscheme_notification_v2beta1.go +++ b/pkg/apis/addtoscheme_notification_v2beta1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + "kubesphere.io/api/notification/v2beta1" ) func init() { diff --git a/pkg/apis/addtoscheme_quota_v1alpha2.go b/pkg/apis/addtoscheme_quota_v1alpha2.go index fd3c3fd413..1f0fe14355 100644 --- a/pkg/apis/addtoscheme_quota_v1alpha2.go +++ b/pkg/apis/addtoscheme_quota_v1alpha2.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" ) func init() { diff --git a/pkg/apis/addtoscheme_servicemesh_v1alpha2.go b/pkg/apis/addtoscheme_servicemesh_v1alpha2.go index f2709d7ec8..3ae7b0fafc 100644 --- a/pkg/apis/addtoscheme_servicemesh_v1alpha2.go +++ b/pkg/apis/addtoscheme_servicemesh_v1alpha2.go @@ -19,7 +19,7 @@ package apis import ( "istio.io/client-go/pkg/apis/networking/v1alpha3" - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + "kubesphere.io/api/servicemesh/v1alpha2" appv1beta1 "sigs.k8s.io/application/api/v1beta1" ) diff --git a/pkg/apis/addtoscheme_storage_v1alpha1.go b/pkg/apis/addtoscheme_storage_v1alpha1.go index a76d5bb9e1..94b86bf0a2 100644 --- a/pkg/apis/addtoscheme_storage_v1alpha1.go +++ b/pkg/apis/addtoscheme_storage_v1alpha1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + storagev1alpha1 "kubesphere.io/api/storage/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_tenant_v1alpha1.go b/pkg/apis/addtoscheme_tenant_v1alpha1.go index abed94755f..7cca69b44f 100644 --- a/pkg/apis/addtoscheme_tenant_v1alpha1.go +++ b/pkg/apis/addtoscheme_tenant_v1alpha1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + "kubesphere.io/api/tenant/v1alpha1" ) func init() { diff --git a/pkg/apis/addtoscheme_tenant_v1alpha2.go b/pkg/apis/addtoscheme_tenant_v1alpha2.go index 1e533c294b..30d66b106b 100644 --- a/pkg/apis/addtoscheme_tenant_v1alpha2.go +++ b/pkg/apis/addtoscheme_tenant_v1alpha2.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) func init() { diff --git a/pkg/apis/addtoscheme_types_v1beta1.go b/pkg/apis/addtoscheme_types_v1beta1.go index 11a67049cd..0e907af0dd 100644 --- a/pkg/apis/addtoscheme_types_v1beta1.go +++ b/pkg/apis/addtoscheme_types_v1beta1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" ) func init() { diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index c26670a636..b459294a45 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -24,7 +24,7 @@ import ( rt "runtime" "time" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + "kubesphere.io/api/notification/v2beta1" openpitrixv2alpha1 "kubesphere.io/kubesphere/pkg/kapis/openpitrix/v2alpha1" @@ -39,11 +39,12 @@ import ( "k8s.io/klog" runtimecache "sigs.k8s.io/controller-runtime/pkg/cache" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - notificationv2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + notificationv2beta1 "kubesphere.io/api/notification/v2beta1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + audit "kubesphere.io/kubesphere/pkg/apiserver/auditing" "kubesphere.io/kubesphere/pkg/apiserver/authentication/authenticators/basic" "kubesphere.io/kubesphere/pkg/apiserver/authentication/authenticators/jwttoken" diff --git a/pkg/apiserver/auditing/types.go b/pkg/apiserver/auditing/types.go index f5dd635f0c..e3c2fe122e 100644 --- a/pkg/apiserver/auditing/types.go +++ b/pkg/apiserver/auditing/types.go @@ -34,7 +34,8 @@ import ( "k8s.io/apiserver/pkg/apis/audit" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + auditv1alpha1 "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/apiserver/auditing/types_test.go b/pkg/apiserver/auditing/types_test.go index d49cc4b746..084c75a246 100644 --- a/pkg/apiserver/auditing/types_test.go +++ b/pkg/apiserver/auditing/types_test.go @@ -33,7 +33,8 @@ import ( k8srequest "k8s.io/apiserver/pkg/endpoints/request" fakek8s "k8s.io/client-go/kubernetes/fake" - auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + auditingv1alpha1 "kubesphere.io/api/auditing/v1alpha1" + v1alpha12 "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" diff --git a/pkg/apiserver/authentication/authenticators/basic/basic.go b/pkg/apiserver/authentication/authenticators/basic/basic.go index a863b3ea59..41514861ab 100644 --- a/pkg/apiserver/authentication/authenticators/basic/basic.go +++ b/pkg/apiserver/authentication/authenticators/basic/basic.go @@ -21,7 +21,8 @@ import ( "k8s.io/klog" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/models/auth" diff --git a/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go b/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go index 5d9fbad270..5f5dde6e1f 100644 --- a/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go +++ b/pkg/apiserver/authentication/authenticators/jwttoken/jwt_token.go @@ -23,7 +23,8 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/models/auth" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/apiserver/authorization/rbac/rbac.go b/pkg/apiserver/authorization/rbac/rbac.go index f21de16c42..6e7700f501 100644 --- a/pkg/apiserver/authorization/rbac/rbac.go +++ b/pkg/apiserver/authorization/rbac/rbac.go @@ -26,7 +26,8 @@ import ( "github.com/open-policy-agent/opa/rego" "k8s.io/apiserver/pkg/authentication/serviceaccount" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/models/iam/am" diff --git a/pkg/apiserver/authorization/rbac/rbac_test.go b/pkg/apiserver/authorization/rbac/rbac_test.go index af37a78ed8..b3582f2764 100644 --- a/pkg/apiserver/authorization/rbac/rbac_test.go +++ b/pkg/apiserver/authorization/rbac/rbac_test.go @@ -29,8 +29,9 @@ import ( corev1 "k8s.io/api/core/v1" fakek8s "k8s.io/client-go/kubernetes/fake" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/request" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" diff --git a/pkg/apiserver/config/config.go b/pkg/apiserver/config/config.go index a4080d5eea..aaf1554264 100644 --- a/pkg/apiserver/config/config.go +++ b/pkg/apiserver/config/config.go @@ -23,7 +23,8 @@ import ( "github.com/spf13/viper" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" authorizationoptions "kubesphere.io/kubesphere/pkg/apiserver/authorization/options" "kubesphere.io/kubesphere/pkg/simple/client/alerting" diff --git a/pkg/apiserver/config/config_test.go b/pkg/apiserver/config/config_test.go index d0834cf285..f794cbb7ed 100644 --- a/pkg/apiserver/config/config_test.go +++ b/pkg/apiserver/config/config_test.go @@ -26,7 +26,8 @@ import ( "github.com/google/go-cmp/cmp" "gopkg.in/yaml.v2" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" authorizationoptions "kubesphere.io/kubesphere/pkg/apiserver/authorization/options" diff --git a/pkg/apiserver/dispatch/dispatch.go b/pkg/apiserver/dispatch/dispatch.go index 643b360369..f2ffe9d05f 100644 --- a/pkg/apiserver/dispatch/dispatch.go +++ b/pkg/apiserver/dispatch/dispatch.go @@ -27,7 +27,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/klog" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/kubesphere/pkg/apiserver/request" clusterinformer "kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/utils/clusterclient" diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index a4d2b972c9..aab326f02c 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -24,20 +24,20 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - notificationv2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" - storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" + auditingv1alpha1 "kubesphere.io/api/auditing/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + notificationv2beta1 "kubesphere.io/api/notification/v2beta1" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" + storagev1alpha1 "kubesphere.io/api/storage/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + typesv1beta1 "kubesphere.io/api/types/v1beta1" ) var scheme = runtime.NewScheme() diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 9813366c7c..a6ecfed2e0 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -24,20 +24,20 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - notificationv2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" - storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" + auditingv1alpha1 "kubesphere.io/api/auditing/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + notificationv2beta1 "kubesphere.io/api/notification/v2beta1" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" + storagev1alpha1 "kubesphere.io/api/storage/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + typesv1beta1 "kubesphere.io/api/types/v1beta1" ) var Scheme = runtime.NewScheme() diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go index 843b37cff0..fa6070ff0f 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplication.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplication.go index ee41b5c05f..b4d5e56d81 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplication.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplication.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // FakeHelmApplications implements HelmApplicationInterface diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplicationversion.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplicationversion.go index b99f6f728c..1f01359c3e 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplicationversion.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmapplicationversion.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // FakeHelmApplicationVersions implements HelmApplicationVersionInterface diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmcategory.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmcategory.go index 9ca22e44b9..10e05fb108 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmcategory.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmcategory.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // FakeHelmCategories implements HelmCategoryInterface diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrelease.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrelease.go index 07bd364ff5..0e51c3cca6 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrelease.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrelease.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // FakeHelmReleases implements HelmReleaseInterface diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrepo.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrepo.go index 38f9f3cf52..4973a10f53 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrepo.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_helmrepo.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // FakeHelmRepos implements HelmRepoInterface diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplication.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplication.go index 59f70e9f1f..dadb65310f 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplication.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplication.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplicationversion.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplicationversion.go index 93af23bc6d..bc4485f62b 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplicationversion.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmapplicationversion.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmcategory.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmcategory.go index 0317665e57..f4026aa37e 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmcategory.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmcategory.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrelease.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrelease.go index 761c6b6df1..77a1532982 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrelease.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrelease.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrepo.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrepo.go index c82a48f526..54fba62d73 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrepo.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/helmrepo.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/auditing_client.go b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/auditing_client.go index aaf7b7d078..55a8bbce36 100644 --- a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/auditing_client.go +++ b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/auditing_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + v1alpha1 "kubesphere.io/api/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_rule.go b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_rule.go index 16fe93dd6f..06ba1f8f3c 100644 --- a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_rule.go +++ b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_rule.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + v1alpha1 "kubesphere.io/api/auditing/v1alpha1" ) // FakeRules implements RuleInterface diff --git a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_webhook.go b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_webhook.go index 7fec47f889..0edfb3d441 100644 --- a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_webhook.go +++ b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/fake/fake_webhook.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + v1alpha1 "kubesphere.io/api/auditing/v1alpha1" ) // FakeWebhooks implements WebhookInterface diff --git a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/rule.go b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/rule.go index 080aa593ef..b732cee2d0 100644 --- a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/rule.go +++ b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/rule.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + v1alpha1 "kubesphere.io/api/auditing/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/webhook.go b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/webhook.go index 817b120a10..e3e79ffd45 100644 --- a/pkg/client/clientset/versioned/typed/auditing/v1alpha1/webhook.go +++ b/pkg/client/clientset/versioned/typed/auditing/v1alpha1/webhook.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + v1alpha1 "kubesphere.io/api/auditing/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster.go b/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster.go index a36e5826c8..6e8b107058 100644 --- a/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster.go +++ b/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + v1alpha1 "kubesphere.io/api/cluster/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster_client.go b/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster_client.go index f180849db4..bb9ccc1283 100644 --- a/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster_client.go +++ b/pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + v1alpha1 "kubesphere.io/api/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake/fake_cluster.go b/pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake/fake_cluster.go index d1f09cd26e..b2a48d8ca8 100644 --- a/pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake/fake_cluster.go +++ b/pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake/fake_cluster.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + v1alpha1 "kubesphere.io/api/cluster/v1alpha1" ) // FakeClusters implements ClusterInterface diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/devops_client.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/devops_client.go index fba4a48bd9..faee8d1b61 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/devops_client.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/devops_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibinary.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibinary.go index 1064f3bfc3..6cba97faaa 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibinary.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibinary.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // FakeS2iBinaries implements S2iBinaryInterface diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuilder.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuilder.go index cc14559da5..18897d0e20 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuilder.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuilder.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // FakeS2iBuilders implements S2iBuilderInterface diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuildertemplate.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuildertemplate.go index 23f6b00505..2701a27fce 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuildertemplate.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2ibuildertemplate.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // FakeS2iBuilderTemplates implements S2iBuilderTemplateInterface diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2irun.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2irun.go index e00b3d3d4b..c16c6480f0 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2irun.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake/fake_s2irun.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // FakeS2iRuns implements S2iRunInterface diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibinary.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibinary.go index 0f32295d0a..38ccf5e2a3 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibinary.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibinary.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuilder.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuilder.go index bfad5b45e5..38d2c5ab54 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuilder.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuilder.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuildertemplate.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuildertemplate.go index dee1f87555..003ca78a97 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuildertemplate.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2ibuildertemplate.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2irun.go b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2irun.go index 7b981826dd..15a1f4b91e 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2irun.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha1/s2irun.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha3/devops_client.go b/pkg/client/clientset/versioned/typed/devops/v1alpha3/devops_client.go index b5e14aa239..f6172e6de8 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha3/devops_client.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha3/devops_client.go @@ -20,7 +20,7 @@ package v1alpha3 import ( rest "k8s.io/client-go/rest" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha3/devopsproject.go b/pkg/client/clientset/versioned/typed/devops/v1alpha3/devopsproject.go index 74ff5192d8..a28250ee8f 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha3/devopsproject.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha3/devopsproject.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_devopsproject.go b/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_devopsproject.go index 35b8eb3f0b..720e3b9423 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_devopsproject.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_devopsproject.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" ) // FakeDevOpsProjects implements DevOpsProjectInterface diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_pipeline.go b/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_pipeline.go index cc2cb08893..1c2c74bf08 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_pipeline.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha3/fake/fake_pipeline.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" ) // FakePipelines implements PipelineInterface diff --git a/pkg/client/clientset/versioned/typed/devops/v1alpha3/pipeline.go b/pkg/client/clientset/versioned/typed/devops/v1alpha3/pipeline.go index c7d660c611..9e4f62b5e5 100644 --- a/pkg/client/clientset/versioned/typed/devops/v1alpha3/pipeline.go +++ b/pkg/client/clientset/versioned/typed/devops/v1alpha3/pipeline.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrole.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrole.go index 4ea40aa8fb..c9cc8f0db5 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrole.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrole.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeGlobalRoles implements GlobalRoleInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrolebinding.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrolebinding.go index afa54bb08c..fecb3a8cfa 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrolebinding.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_globalrolebinding.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeGlobalRoleBindings implements GlobalRoleBindingInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_group.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_group.go index 2d4a50ef45..e0e522fc4a 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_group.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_group.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeGroups implements GroupInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_groupbinding.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_groupbinding.go index 62148a7a2a..a13ab69bc5 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_groupbinding.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_groupbinding.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeGroupBindings implements GroupBindingInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_loginrecord.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_loginrecord.go index 717ca56d1b..5e724aadde 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_loginrecord.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_loginrecord.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeLoginRecords implements LoginRecordInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_rolebase.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_rolebase.go index 4dfa69638b..82be7080e4 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_rolebase.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_rolebase.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeRoleBases implements RoleBaseInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_user.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_user.go index ec132e29e3..20e4915349 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_user.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_user.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeUsers implements UserInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerole.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerole.go index 3d294d615e..76c59af47f 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerole.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerole.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeWorkspaceRoles implements WorkspaceRoleInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerolebinding.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerolebinding.go index ff7558ad6e..17b45b35f3 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerolebinding.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/fake/fake_workspacerolebinding.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // FakeWorkspaceRoleBindings implements WorkspaceRoleBindingInterface diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrole.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrole.go index 847866ad95..2cb7a8093b 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrole.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrole.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrolebinding.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrolebinding.go index a64191fffe..99ba9bc631 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrolebinding.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/globalrolebinding.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/group.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/group.go index 6cc8c051c6..1ca1485dc6 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/group.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/group.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/groupbinding.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/groupbinding.go index fdabbb1584..ae65ae5d0e 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/groupbinding.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/groupbinding.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/iam_client.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/iam_client.go index a0e925a870..dd3b490bcd 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/iam_client.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/iam_client.go @@ -20,7 +20,7 @@ package v1alpha2 import ( rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/loginrecord.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/loginrecord.go index d4143c43c9..f4d17f30f8 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/loginrecord.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/loginrecord.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/rolebase.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/rolebase.go index d3f361e031..28e94f06cb 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/rolebase.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/rolebase.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/user.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/user.go index d1c57eba4a..f7ecdcf507 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/user.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/user.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerole.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerole.go index 8242c1730c..309908ed72 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerole.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerole.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerolebinding.go b/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerolebinding.go index f4f6c5efbc..e8b975dbd6 100644 --- a/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerolebinding.go +++ b/pkg/client/clientset/versioned/typed/iam/v1alpha2/workspacerolebinding.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamblock.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamblock.go index ce2704cb58..948a23010b 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamblock.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamblock.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // FakeIPAMBlocks implements IPAMBlockInterface diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamhandle.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamhandle.go index 71a0ccc478..937aa701ef 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamhandle.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ipamhandle.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // FakeIPAMHandles implements IPAMHandleInterface diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ippool.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ippool.go index 49ac57cef5..735a23ed43 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ippool.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_ippool.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // FakeIPPools implements IPPoolInterface diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_namespacenetworkpolicy.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_namespacenetworkpolicy.go index af99554029..77e081c5f1 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_namespacenetworkpolicy.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/fake/fake_namespacenetworkpolicy.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // FakeNamespaceNetworkPolicies implements NamespaceNetworkPolicyInterface diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamblock.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamblock.go index e363cf597d..c0384d5ea6 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamblock.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamblock.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamhandle.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamhandle.go index 40b682daf4..b10c1dd9f2 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamhandle.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/ipamhandle.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/ippool.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/ippool.go index 1ebad7ea87..c4abd61576 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/ippool.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/ippool.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/namespacenetworkpolicy.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/namespacenetworkpolicy.go index 7a332ae90e..32853b018c 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/namespacenetworkpolicy.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/namespacenetworkpolicy.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/network/v1alpha1/network_client.go b/pkg/client/clientset/versioned/typed/network/v1alpha1/network_client.go index 63e456746b..44eaff40dc 100644 --- a/pkg/client/clientset/versioned/typed/network/v1alpha1/network_client.go +++ b/pkg/client/clientset/versioned/typed/network/v1alpha1/network_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/notification/v2beta1/config.go b/pkg/client/clientset/versioned/typed/notification/v2beta1/config.go index b85bcaa206..4f33a3e89b 100644 --- a/pkg/client/clientset/versioned/typed/notification/v2beta1/config.go +++ b/pkg/client/clientset/versioned/typed/notification/v2beta1/config.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + v2beta1 "kubesphere.io/api/notification/v2beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_config.go b/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_config.go index 57b7478464..3e26fd358b 100644 --- a/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_config.go +++ b/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_config.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + v2beta1 "kubesphere.io/api/notification/v2beta1" ) // FakeConfigs implements ConfigInterface diff --git a/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_receiver.go b/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_receiver.go index 4f887de8d8..bf8705aa2b 100644 --- a/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_receiver.go +++ b/pkg/client/clientset/versioned/typed/notification/v2beta1/fake/fake_receiver.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + v2beta1 "kubesphere.io/api/notification/v2beta1" ) // FakeReceivers implements ReceiverInterface diff --git a/pkg/client/clientset/versioned/typed/notification/v2beta1/notification_client.go b/pkg/client/clientset/versioned/typed/notification/v2beta1/notification_client.go index a494ff7581..05717b8913 100644 --- a/pkg/client/clientset/versioned/typed/notification/v2beta1/notification_client.go +++ b/pkg/client/clientset/versioned/typed/notification/v2beta1/notification_client.go @@ -20,7 +20,7 @@ package v2beta1 import ( rest "k8s.io/client-go/rest" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + v2beta1 "kubesphere.io/api/notification/v2beta1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/notification/v2beta1/receiver.go b/pkg/client/clientset/versioned/typed/notification/v2beta1/receiver.go index 24adee0006..a0b09069a8 100644 --- a/pkg/client/clientset/versioned/typed/notification/v2beta1/receiver.go +++ b/pkg/client/clientset/versioned/typed/notification/v2beta1/receiver.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + v2beta1 "kubesphere.io/api/notification/v2beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/quota/v1alpha2/fake/fake_resourcequota.go b/pkg/client/clientset/versioned/typed/quota/v1alpha2/fake/fake_resourcequota.go index 9e5f91b8dc..4bc885d28b 100644 --- a/pkg/client/clientset/versioned/typed/quota/v1alpha2/fake/fake_resourcequota.go +++ b/pkg/client/clientset/versioned/typed/quota/v1alpha2/fake/fake_resourcequota.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + v1alpha2 "kubesphere.io/api/quota/v1alpha2" ) // FakeResourceQuotas implements ResourceQuotaInterface diff --git a/pkg/client/clientset/versioned/typed/quota/v1alpha2/quota_client.go b/pkg/client/clientset/versioned/typed/quota/v1alpha2/quota_client.go index 1f4cb15c6d..13572f17d1 100644 --- a/pkg/client/clientset/versioned/typed/quota/v1alpha2/quota_client.go +++ b/pkg/client/clientset/versioned/typed/quota/v1alpha2/quota_client.go @@ -20,7 +20,7 @@ package v1alpha2 import ( rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + v1alpha2 "kubesphere.io/api/quota/v1alpha2" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/quota/v1alpha2/resourcequota.go b/pkg/client/clientset/versioned/typed/quota/v1alpha2/resourcequota.go index 7a631d405d..4e90d5e97b 100644 --- a/pkg/client/clientset/versioned/typed/quota/v1alpha2/resourcequota.go +++ b/pkg/client/clientset/versioned/typed/quota/v1alpha2/resourcequota.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + v1alpha2 "kubesphere.io/api/quota/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_servicepolicy.go b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_servicepolicy.go index a319d16764..c3571278be 100644 --- a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_servicepolicy.go +++ b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_servicepolicy.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + v1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" ) // FakeServicePolicies implements ServicePolicyInterface diff --git a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_strategy.go b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_strategy.go index 908751369e..06ac66c3c9 100644 --- a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_strategy.go +++ b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake/fake_strategy.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + v1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" ) // FakeStrategies implements StrategyInterface diff --git a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicemesh_client.go b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicemesh_client.go index 99196f1be5..01b77a8f58 100644 --- a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicemesh_client.go +++ b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicemesh_client.go @@ -20,7 +20,7 @@ package v1alpha2 import ( rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + v1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicepolicy.go b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicepolicy.go index fcbaee926c..ca532df6c1 100644 --- a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicepolicy.go +++ b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/servicepolicy.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + v1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/strategy.go b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/strategy.go index 30da370621..c1bb112d90 100644 --- a/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/strategy.go +++ b/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/strategy.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + v1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_provisionercapability.go b/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_provisionercapability.go index 5a178b166f..0bbdc207fa 100644 --- a/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_provisionercapability.go +++ b/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_provisionercapability.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + v1alpha1 "kubesphere.io/api/storage/v1alpha1" ) // FakeProvisionerCapabilities implements ProvisionerCapabilityInterface diff --git a/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_storageclasscapability.go b/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_storageclasscapability.go index d4736abcea..e4781fb00f 100644 --- a/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_storageclasscapability.go +++ b/pkg/client/clientset/versioned/typed/storage/v1alpha1/fake/fake_storageclasscapability.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + v1alpha1 "kubesphere.io/api/storage/v1alpha1" ) // FakeStorageClassCapabilities implements StorageClassCapabilityInterface diff --git a/pkg/client/clientset/versioned/typed/storage/v1alpha1/provisionercapability.go b/pkg/client/clientset/versioned/typed/storage/v1alpha1/provisionercapability.go index cb154722db..13de7af731 100644 --- a/pkg/client/clientset/versioned/typed/storage/v1alpha1/provisionercapability.go +++ b/pkg/client/clientset/versioned/typed/storage/v1alpha1/provisionercapability.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + v1alpha1 "kubesphere.io/api/storage/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/storage/v1alpha1/storage_client.go b/pkg/client/clientset/versioned/typed/storage/v1alpha1/storage_client.go index 47f512f634..d1500585e7 100644 --- a/pkg/client/clientset/versioned/typed/storage/v1alpha1/storage_client.go +++ b/pkg/client/clientset/versioned/typed/storage/v1alpha1/storage_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + v1alpha1 "kubesphere.io/api/storage/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/storage/v1alpha1/storageclasscapability.go b/pkg/client/clientset/versioned/typed/storage/v1alpha1/storageclasscapability.go index 83f595ad02..b9f5ca0879 100644 --- a/pkg/client/clientset/versioned/typed/storage/v1alpha1/storageclasscapability.go +++ b/pkg/client/clientset/versioned/typed/storage/v1alpha1/storageclasscapability.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + v1alpha1 "kubesphere.io/api/storage/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/tenant/v1alpha1/fake/fake_workspace.go b/pkg/client/clientset/versioned/typed/tenant/v1alpha1/fake/fake_workspace.go index dff4b1f2de..ee221a0d70 100644 --- a/pkg/client/clientset/versioned/typed/tenant/v1alpha1/fake/fake_workspace.go +++ b/pkg/client/clientset/versioned/typed/tenant/v1alpha1/fake/fake_workspace.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + v1alpha1 "kubesphere.io/api/tenant/v1alpha1" ) // FakeWorkspaces implements WorkspaceInterface diff --git a/pkg/client/clientset/versioned/typed/tenant/v1alpha1/tenant_client.go b/pkg/client/clientset/versioned/typed/tenant/v1alpha1/tenant_client.go index 75e1d077d0..48e7fb78f5 100644 --- a/pkg/client/clientset/versioned/typed/tenant/v1alpha1/tenant_client.go +++ b/pkg/client/clientset/versioned/typed/tenant/v1alpha1/tenant_client.go @@ -20,7 +20,7 @@ package v1alpha1 import ( rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + v1alpha1 "kubesphere.io/api/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/tenant/v1alpha1/workspace.go b/pkg/client/clientset/versioned/typed/tenant/v1alpha1/workspace.go index 408f1f5a2a..14df93b668 100644 --- a/pkg/client/clientset/versioned/typed/tenant/v1alpha1/workspace.go +++ b/pkg/client/clientset/versioned/typed/tenant/v1alpha1/workspace.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + v1alpha1 "kubesphere.io/api/tenant/v1alpha1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/tenant/v1alpha2/fake/fake_workspacetemplate.go b/pkg/client/clientset/versioned/typed/tenant/v1alpha2/fake/fake_workspacetemplate.go index 74170d7498..d3538a24d8 100644 --- a/pkg/client/clientset/versioned/typed/tenant/v1alpha2/fake/fake_workspacetemplate.go +++ b/pkg/client/clientset/versioned/typed/tenant/v1alpha2/fake/fake_workspacetemplate.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + v1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) // FakeWorkspaceTemplates implements WorkspaceTemplateInterface diff --git a/pkg/client/clientset/versioned/typed/tenant/v1alpha2/tenant_client.go b/pkg/client/clientset/versioned/typed/tenant/v1alpha2/tenant_client.go index f8dd43c726..d30c0e39da 100644 --- a/pkg/client/clientset/versioned/typed/tenant/v1alpha2/tenant_client.go +++ b/pkg/client/clientset/versioned/typed/tenant/v1alpha2/tenant_client.go @@ -20,7 +20,7 @@ package v1alpha2 import ( rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + v1alpha2 "kubesphere.io/api/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/tenant/v1alpha2/workspacetemplate.go b/pkg/client/clientset/versioned/typed/tenant/v1alpha2/workspacetemplate.go index cf82238131..f6a868e331 100644 --- a/pkg/client/clientset/versioned/typed/tenant/v1alpha2/workspacetemplate.go +++ b/pkg/client/clientset/versioned/typed/tenant/v1alpha2/workspacetemplate.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + v1alpha2 "kubesphere.io/api/tenant/v1alpha2" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedapplication.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedapplication.go index aed6a868e2..a8f7cb412b 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedapplication.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedapplication.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedApplications implements FederatedApplicationInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrole.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrole.go index 87540ee105..d811eaa6f4 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrole.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrole.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedClusterRoles implements FederatedClusterRoleInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrolebinding.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrolebinding.go index ddc5d95181..b9a609d36b 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrolebinding.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedclusterrolebinding.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedClusterRoleBindings implements FederatedClusterRoleBindingInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedconfigmap.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedconfigmap.go index 0e74d2c423..0d187a6524 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedconfigmap.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedconfigmap.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedConfigMaps implements FederatedConfigMapInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federateddeployment.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federateddeployment.go index 89bf229360..ede2c7758e 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federateddeployment.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federateddeployment.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedDeployments implements FederatedDeploymentInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroup.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroup.go index 01b7dfcdcd..1d5105a431 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroup.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroup.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedGroups implements FederatedGroupInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroupbinding.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroupbinding.go index 14eecd18f4..596b63b4fa 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroupbinding.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedgroupbinding.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedGroupBindings implements FederatedGroupBindingInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedingress.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedingress.go index df9d085cfe..fd0db8719c 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedingress.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedingress.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedIngresses implements FederatedIngressInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedjob.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedjob.go index 40c668461e..9e72a5d11a 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedjob.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedjob.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedJobs implements FederatedJobInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedlimitrange.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedlimitrange.go index 55468ab661..2b73c791b8 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedlimitrange.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedlimitrange.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedLimitRanges implements FederatedLimitRangeInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatednamespace.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatednamespace.go index cd1fbbdb4b..c4d2f2c521 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatednamespace.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatednamespace.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedNamespaces implements FederatedNamespaceInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedpersistentvolumeclaim.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedpersistentvolumeclaim.go index 6632f814bf..4699dd77ca 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedpersistentvolumeclaim.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedpersistentvolumeclaim.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedPersistentVolumeClaims implements FederatedPersistentVolumeClaimInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedresourcequota.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedresourcequota.go index 9453635fee..c0b8f29cf0 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedresourcequota.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedresourcequota.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedResourceQuotas implements FederatedResourceQuotaInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedsecret.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedsecret.go index 79afec3bf3..f03df6a5d7 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedsecret.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedsecret.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedSecrets implements FederatedSecretInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedservice.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedservice.go index d5c3c74b4b..1a2de27ee3 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedservice.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedservice.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedServices implements FederatedServiceInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedstatefulset.go b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedstatefulset.go index ba231fae40..bde67cc5a6 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedstatefulset.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/fake/fake_federatedstatefulset.go @@ -27,7 +27,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FakeFederatedStatefulSets implements FederatedStatefulSetInterface diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedapplication.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedapplication.go index 2b6baaa018..218e50139b 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedapplication.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedapplication.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrole.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrole.go index 62119d3160..1f16942bd3 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrole.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrole.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrolebinding.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrolebinding.go index 72a7ae4ada..16a407205c 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrolebinding.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedclusterrolebinding.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedconfigmap.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedconfigmap.go index ea4bb870f2..e6c287b364 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedconfigmap.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedconfigmap.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federateddeployment.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federateddeployment.go index 87edc88e25..a07c33ae5d 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federateddeployment.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federateddeployment.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroup.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroup.go index 1cc0e9ea52..2bb7fab18b 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroup.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroup.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroupbinding.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroupbinding.go index aa9acd3421..4bbb8ccfd8 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroupbinding.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedgroupbinding.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedingress.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedingress.go index a377911d4c..035ad71324 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedingress.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedingress.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedjob.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedjob.go index b5674fbf7a..1681db145e 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedjob.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedjob.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedlimitrange.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedlimitrange.go index d2bee64c99..0d6ecdaf0b 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedlimitrange.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedlimitrange.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatednamespace.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatednamespace.go index a9ca8be600..7f2add9910 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatednamespace.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatednamespace.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedpersistentvolumeclaim.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedpersistentvolumeclaim.go index 13a2b586fc..25f0480b08 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedpersistentvolumeclaim.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedpersistentvolumeclaim.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedresourcequota.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedresourcequota.go index c49850d022..8a8c248607 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedresourcequota.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedresourcequota.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedsecret.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedsecret.go index fe7efd827c..6a5da3bcb8 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedsecret.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedsecret.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedservice.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedservice.go index 551ce1d6c1..81ba79e151 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedservice.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedservice.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedstatefulset.go b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedstatefulset.go index 1ff7ba9c1f..94affaa614 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/federatedstatefulset.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/federatedstatefulset.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/clientset/versioned/typed/types/v1beta1/types_client.go b/pkg/client/clientset/versioned/typed/types/v1beta1/types_client.go index 5e90f3c566..7a48ea578d 100644 --- a/pkg/client/clientset/versioned/typed/types/v1beta1/types_client.go +++ b/pkg/client/clientset/versioned/typed/types/v1beta1/types_client.go @@ -20,7 +20,7 @@ package v1beta1 import ( rest "k8s.io/client-go/rest" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/client/informers/externalversions/application/v1alpha1/helmapplication.go b/pkg/client/informers/externalversions/application/v1alpha1/helmapplication.go index 6433c3dc81..3f1227f3d0 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/helmapplication.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/helmapplication.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/application/v1alpha1" diff --git a/pkg/client/informers/externalversions/application/v1alpha1/helmapplicationversion.go b/pkg/client/informers/externalversions/application/v1alpha1/helmapplicationversion.go index 7ff8b20daa..4f7fe320a9 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/helmapplicationversion.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/helmapplicationversion.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/application/v1alpha1" diff --git a/pkg/client/informers/externalversions/application/v1alpha1/helmcategory.go b/pkg/client/informers/externalversions/application/v1alpha1/helmcategory.go index c0e1d5e463..86530d1e3f 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/helmcategory.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/helmcategory.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/application/v1alpha1" diff --git a/pkg/client/informers/externalversions/application/v1alpha1/helmrelease.go b/pkg/client/informers/externalversions/application/v1alpha1/helmrelease.go index d41874a2ba..e0cd307953 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/helmrelease.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/helmrelease.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/application/v1alpha1" diff --git a/pkg/client/informers/externalversions/application/v1alpha1/helmrepo.go b/pkg/client/informers/externalversions/application/v1alpha1/helmrepo.go index 4319cb6743..c7dfb813ad 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/helmrepo.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/helmrepo.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/application/v1alpha1" diff --git a/pkg/client/informers/externalversions/auditing/v1alpha1/rule.go b/pkg/client/informers/externalversions/auditing/v1alpha1/rule.go index ed5d551276..b727559950 100644 --- a/pkg/client/informers/externalversions/auditing/v1alpha1/rule.go +++ b/pkg/client/informers/externalversions/auditing/v1alpha1/rule.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + auditingv1alpha1 "kubesphere.io/api/auditing/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/auditing/v1alpha1" diff --git a/pkg/client/informers/externalversions/auditing/v1alpha1/webhook.go b/pkg/client/informers/externalversions/auditing/v1alpha1/webhook.go index 69d1512b0a..5dc39e6094 100644 --- a/pkg/client/informers/externalversions/auditing/v1alpha1/webhook.go +++ b/pkg/client/informers/externalversions/auditing/v1alpha1/webhook.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + auditingv1alpha1 "kubesphere.io/api/auditing/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/auditing/v1alpha1" diff --git a/pkg/client/informers/externalversions/cluster/v1alpha1/cluster.go b/pkg/client/informers/externalversions/cluster/v1alpha1/cluster.go index faca839a0f..143659a9d0 100644 --- a/pkg/client/informers/externalversions/cluster/v1alpha1/cluster.go +++ b/pkg/client/informers/externalversions/cluster/v1alpha1/cluster.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1" diff --git a/pkg/client/informers/externalversions/devops/v1alpha1/s2ibinary.go b/pkg/client/informers/externalversions/devops/v1alpha1/s2ibinary.go index d2f63464e6..60beb10890 100644 --- a/pkg/client/informers/externalversions/devops/v1alpha1/s2ibinary.go +++ b/pkg/client/informers/externalversions/devops/v1alpha1/s2ibinary.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha1" diff --git a/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuilder.go b/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuilder.go index 8d243a4fc9..b1f37a2d8a 100644 --- a/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuilder.go +++ b/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuilder.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha1" diff --git a/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuildertemplate.go b/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuildertemplate.go index cfb1ab3ad0..3c3454dc2d 100644 --- a/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuildertemplate.go +++ b/pkg/client/informers/externalversions/devops/v1alpha1/s2ibuildertemplate.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha1" diff --git a/pkg/client/informers/externalversions/devops/v1alpha1/s2irun.go b/pkg/client/informers/externalversions/devops/v1alpha1/s2irun.go index 090e62ecb7..9685433eb3 100644 --- a/pkg/client/informers/externalversions/devops/v1alpha1/s2irun.go +++ b/pkg/client/informers/externalversions/devops/v1alpha1/s2irun.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha1" diff --git a/pkg/client/informers/externalversions/devops/v1alpha3/devopsproject.go b/pkg/client/informers/externalversions/devops/v1alpha3/devopsproject.go index 8943988cbb..d42c2fa6b2 100644 --- a/pkg/client/informers/externalversions/devops/v1alpha3/devopsproject.go +++ b/pkg/client/informers/externalversions/devops/v1alpha3/devopsproject.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha3 "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha3" diff --git a/pkg/client/informers/externalversions/devops/v1alpha3/pipeline.go b/pkg/client/informers/externalversions/devops/v1alpha3/pipeline.go index 6e41ea014c..2393a20a1c 100644 --- a/pkg/client/informers/externalversions/devops/v1alpha3/pipeline.go +++ b/pkg/client/informers/externalversions/devops/v1alpha3/pipeline.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha3 "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha3" diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 8ab0de6384..3d08ef2c9e 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -23,20 +23,20 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" - storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" + auditingv1alpha1 "kubesphere.io/api/auditing/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + v2beta1 "kubesphere.io/api/notification/v2beta1" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" + storagev1alpha1 "kubesphere.io/api/storage/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/globalrole.go b/pkg/client/informers/externalversions/iam/v1alpha2/globalrole.go index 9258a4770a..cf448db840 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/globalrole.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/globalrole.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/globalrolebinding.go b/pkg/client/informers/externalversions/iam/v1alpha2/globalrolebinding.go index 60192b1d7f..ccf8e247cd 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/globalrolebinding.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/globalrolebinding.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/group.go b/pkg/client/informers/externalversions/iam/v1alpha2/group.go index dcbc235508..7998a6cc93 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/group.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/group.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/groupbinding.go b/pkg/client/informers/externalversions/iam/v1alpha2/groupbinding.go index 3f894c5b77..9f851abf80 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/groupbinding.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/groupbinding.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/loginrecord.go b/pkg/client/informers/externalversions/iam/v1alpha2/loginrecord.go index cf9522b3a8..b696b08cdd 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/loginrecord.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/loginrecord.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/rolebase.go b/pkg/client/informers/externalversions/iam/v1alpha2/rolebase.go index 55bba9d1d6..b37bcadd59 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/rolebase.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/rolebase.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/user.go b/pkg/client/informers/externalversions/iam/v1alpha2/user.go index 73b0d208ed..b846493632 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/user.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/user.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/workspacerole.go b/pkg/client/informers/externalversions/iam/v1alpha2/workspacerole.go index 0f49f68c80..e001026391 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/workspacerole.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/workspacerole.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/iam/v1alpha2/workspacerolebinding.go b/pkg/client/informers/externalversions/iam/v1alpha2/workspacerolebinding.go index 36fc8c73e7..82a201e8b4 100644 --- a/pkg/client/informers/externalversions/iam/v1alpha2/workspacerolebinding.go +++ b/pkg/client/informers/externalversions/iam/v1alpha2/workspacerolebinding.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/client/informers/externalversions/network/v1alpha1/ipamblock.go b/pkg/client/informers/externalversions/network/v1alpha1/ipamblock.go index 594b0cfea9..c247a7e2a0 100644 --- a/pkg/client/informers/externalversions/network/v1alpha1/ipamblock.go +++ b/pkg/client/informers/externalversions/network/v1alpha1/ipamblock.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/network/v1alpha1" diff --git a/pkg/client/informers/externalversions/network/v1alpha1/ipamhandle.go b/pkg/client/informers/externalversions/network/v1alpha1/ipamhandle.go index 21296159c6..f136a0007c 100644 --- a/pkg/client/informers/externalversions/network/v1alpha1/ipamhandle.go +++ b/pkg/client/informers/externalversions/network/v1alpha1/ipamhandle.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/network/v1alpha1" diff --git a/pkg/client/informers/externalversions/network/v1alpha1/ippool.go b/pkg/client/informers/externalversions/network/v1alpha1/ippool.go index 7c2b89a2a8..1a34bb20ec 100644 --- a/pkg/client/informers/externalversions/network/v1alpha1/ippool.go +++ b/pkg/client/informers/externalversions/network/v1alpha1/ippool.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/network/v1alpha1" diff --git a/pkg/client/informers/externalversions/network/v1alpha1/namespacenetworkpolicy.go b/pkg/client/informers/externalversions/network/v1alpha1/namespacenetworkpolicy.go index 584802feb7..7e3682e397 100644 --- a/pkg/client/informers/externalversions/network/v1alpha1/namespacenetworkpolicy.go +++ b/pkg/client/informers/externalversions/network/v1alpha1/namespacenetworkpolicy.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/network/v1alpha1" diff --git a/pkg/client/informers/externalversions/notification/v2beta1/config.go b/pkg/client/informers/externalversions/notification/v2beta1/config.go index 17f576409a..92e3186313 100644 --- a/pkg/client/informers/externalversions/notification/v2beta1/config.go +++ b/pkg/client/informers/externalversions/notification/v2beta1/config.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - notificationv2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + notificationv2beta1 "kubesphere.io/api/notification/v2beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v2beta1 "kubesphere.io/kubesphere/pkg/client/listers/notification/v2beta1" diff --git a/pkg/client/informers/externalversions/notification/v2beta1/receiver.go b/pkg/client/informers/externalversions/notification/v2beta1/receiver.go index c984b7ec10..b3e7e59c29 100644 --- a/pkg/client/informers/externalversions/notification/v2beta1/receiver.go +++ b/pkg/client/informers/externalversions/notification/v2beta1/receiver.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - notificationv2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + notificationv2beta1 "kubesphere.io/api/notification/v2beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v2beta1 "kubesphere.io/kubesphere/pkg/client/listers/notification/v2beta1" diff --git a/pkg/client/informers/externalversions/quota/v1alpha2/resourcequota.go b/pkg/client/informers/externalversions/quota/v1alpha2/resourcequota.go index 349e491ba7..61fcdc7e02 100644 --- a/pkg/client/informers/externalversions/quota/v1alpha2/resourcequota.go +++ b/pkg/client/informers/externalversions/quota/v1alpha2/resourcequota.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/quota/v1alpha2" diff --git a/pkg/client/informers/externalversions/servicemesh/v1alpha2/servicepolicy.go b/pkg/client/informers/externalversions/servicemesh/v1alpha2/servicepolicy.go index a7596d5add..be637d0fd0 100644 --- a/pkg/client/informers/externalversions/servicemesh/v1alpha2/servicepolicy.go +++ b/pkg/client/informers/externalversions/servicemesh/v1alpha2/servicepolicy.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/servicemesh/v1alpha2" diff --git a/pkg/client/informers/externalversions/servicemesh/v1alpha2/strategy.go b/pkg/client/informers/externalversions/servicemesh/v1alpha2/strategy.go index 11b467abbe..3976323511 100644 --- a/pkg/client/informers/externalversions/servicemesh/v1alpha2/strategy.go +++ b/pkg/client/informers/externalversions/servicemesh/v1alpha2/strategy.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/servicemesh/v1alpha2" diff --git a/pkg/client/informers/externalversions/storage/v1alpha1/provisionercapability.go b/pkg/client/informers/externalversions/storage/v1alpha1/provisionercapability.go index 6227239d4b..905f5904cc 100644 --- a/pkg/client/informers/externalversions/storage/v1alpha1/provisionercapability.go +++ b/pkg/client/informers/externalversions/storage/v1alpha1/provisionercapability.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + storagev1alpha1 "kubesphere.io/api/storage/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/storage/v1alpha1" diff --git a/pkg/client/informers/externalversions/storage/v1alpha1/storageclasscapability.go b/pkg/client/informers/externalversions/storage/v1alpha1/storageclasscapability.go index 83023fb16b..147955c4bd 100644 --- a/pkg/client/informers/externalversions/storage/v1alpha1/storageclasscapability.go +++ b/pkg/client/informers/externalversions/storage/v1alpha1/storageclasscapability.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + storagev1alpha1 "kubesphere.io/api/storage/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/storage/v1alpha1" diff --git a/pkg/client/informers/externalversions/tenant/v1alpha1/workspace.go b/pkg/client/informers/externalversions/tenant/v1alpha1/workspace.go index dece3378de..20bd1cc29a 100644 --- a/pkg/client/informers/externalversions/tenant/v1alpha1/workspace.go +++ b/pkg/client/informers/externalversions/tenant/v1alpha1/workspace.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/tenant/v1alpha1" diff --git a/pkg/client/informers/externalversions/tenant/v1alpha2/workspacetemplate.go b/pkg/client/informers/externalversions/tenant/v1alpha2/workspacetemplate.go index af72e78e02..625458f486 100644 --- a/pkg/client/informers/externalversions/tenant/v1alpha2/workspacetemplate.go +++ b/pkg/client/informers/externalversions/tenant/v1alpha2/workspacetemplate.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1alpha2 "kubesphere.io/kubesphere/pkg/client/listers/tenant/v1alpha2" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedapplication.go b/pkg/client/informers/externalversions/types/v1beta1/federatedapplication.go index 62a0ce4520..b155b39299 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedapplication.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedapplication.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrole.go b/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrole.go index 3fa3b0a9cd..ca4ffd4647 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrole.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrole.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrolebinding.go b/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrolebinding.go index f749795207..891b455838 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrolebinding.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedclusterrolebinding.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedconfigmap.go b/pkg/client/informers/externalversions/types/v1beta1/federatedconfigmap.go index 301496b34e..9147da313a 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedconfigmap.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedconfigmap.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federateddeployment.go b/pkg/client/informers/externalversions/types/v1beta1/federateddeployment.go index b363635334..49fd8d8ce2 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federateddeployment.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federateddeployment.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedgroup.go b/pkg/client/informers/externalversions/types/v1beta1/federatedgroup.go index 978b069e95..3751538afc 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedgroup.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedgroup.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedgroupbinding.go b/pkg/client/informers/externalversions/types/v1beta1/federatedgroupbinding.go index 69d1859aca..ba1f2f3fe9 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedgroupbinding.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedgroupbinding.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedingress.go b/pkg/client/informers/externalversions/types/v1beta1/federatedingress.go index 744524a058..4981627876 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedingress.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedingress.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedjob.go b/pkg/client/informers/externalversions/types/v1beta1/federatedjob.go index 9f6f033659..4e1ddb0613 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedjob.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedjob.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedlimitrange.go b/pkg/client/informers/externalversions/types/v1beta1/federatedlimitrange.go index 4cabec4cc1..7a3dad0206 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedlimitrange.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedlimitrange.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatednamespace.go b/pkg/client/informers/externalversions/types/v1beta1/federatednamespace.go index 1d0fd26ac5..02ec5b4abf 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatednamespace.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatednamespace.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedpersistentvolumeclaim.go b/pkg/client/informers/externalversions/types/v1beta1/federatedpersistentvolumeclaim.go index 7815cb5596..0f9cf60f0c 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedpersistentvolumeclaim.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedpersistentvolumeclaim.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedresourcequota.go b/pkg/client/informers/externalversions/types/v1beta1/federatedresourcequota.go index 674072e78d..db508af3bd 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedresourcequota.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedresourcequota.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedsecret.go b/pkg/client/informers/externalversions/types/v1beta1/federatedsecret.go index 7afb645bd1..b13d7495e7 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedsecret.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedsecret.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedservice.go b/pkg/client/informers/externalversions/types/v1beta1/federatedservice.go index ae8d2082d3..74d22055b4 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedservice.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedservice.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/informers/externalversions/types/v1beta1/federatedstatefulset.go b/pkg/client/informers/externalversions/types/v1beta1/federatedstatefulset.go index ddefde7d01..18e793624d 100644 --- a/pkg/client/informers/externalversions/types/v1beta1/federatedstatefulset.go +++ b/pkg/client/informers/externalversions/types/v1beta1/federatedstatefulset.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces" v1beta1 "kubesphere.io/kubesphere/pkg/client/listers/types/v1beta1" diff --git a/pkg/client/listers/application/v1alpha1/helmapplication.go b/pkg/client/listers/application/v1alpha1/helmapplication.go index a6ed5e63c3..97b27c378c 100644 --- a/pkg/client/listers/application/v1alpha1/helmapplication.go +++ b/pkg/client/listers/application/v1alpha1/helmapplication.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // HelmApplicationLister helps list HelmApplications. diff --git a/pkg/client/listers/application/v1alpha1/helmapplicationversion.go b/pkg/client/listers/application/v1alpha1/helmapplicationversion.go index 65037fb5ea..5c7ade6ad5 100644 --- a/pkg/client/listers/application/v1alpha1/helmapplicationversion.go +++ b/pkg/client/listers/application/v1alpha1/helmapplicationversion.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // HelmApplicationVersionLister helps list HelmApplicationVersions. diff --git a/pkg/client/listers/application/v1alpha1/helmcategory.go b/pkg/client/listers/application/v1alpha1/helmcategory.go index 5b5841cf1f..3f3bce3e42 100644 --- a/pkg/client/listers/application/v1alpha1/helmcategory.go +++ b/pkg/client/listers/application/v1alpha1/helmcategory.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // HelmCategoryLister helps list HelmCategories. diff --git a/pkg/client/listers/application/v1alpha1/helmrelease.go b/pkg/client/listers/application/v1alpha1/helmrelease.go index 85ce5fcf77..1bb1c12fef 100644 --- a/pkg/client/listers/application/v1alpha1/helmrelease.go +++ b/pkg/client/listers/application/v1alpha1/helmrelease.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // HelmReleaseLister helps list HelmReleases. diff --git a/pkg/client/listers/application/v1alpha1/helmrepo.go b/pkg/client/listers/application/v1alpha1/helmrepo.go index 2641d7908c..432e2030e3 100644 --- a/pkg/client/listers/application/v1alpha1/helmrepo.go +++ b/pkg/client/listers/application/v1alpha1/helmrepo.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + v1alpha1 "kubesphere.io/api/application/v1alpha1" ) // HelmRepoLister helps list HelmRepos. diff --git a/pkg/client/listers/auditing/v1alpha1/rule.go b/pkg/client/listers/auditing/v1alpha1/rule.go index 9f7dc88962..e9ca327fd2 100644 --- a/pkg/client/listers/auditing/v1alpha1/rule.go +++ b/pkg/client/listers/auditing/v1alpha1/rule.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + v1alpha1 "kubesphere.io/api/auditing/v1alpha1" ) // RuleLister helps list Rules. diff --git a/pkg/client/listers/auditing/v1alpha1/webhook.go b/pkg/client/listers/auditing/v1alpha1/webhook.go index 6e484586df..c9a78496ce 100644 --- a/pkg/client/listers/auditing/v1alpha1/webhook.go +++ b/pkg/client/listers/auditing/v1alpha1/webhook.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" + v1alpha1 "kubesphere.io/api/auditing/v1alpha1" ) // WebhookLister helps list Webhooks. diff --git a/pkg/client/listers/cluster/v1alpha1/cluster.go b/pkg/client/listers/cluster/v1alpha1/cluster.go index 15f095b2a1..63b96c3bde 100644 --- a/pkg/client/listers/cluster/v1alpha1/cluster.go +++ b/pkg/client/listers/cluster/v1alpha1/cluster.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + v1alpha1 "kubesphere.io/api/cluster/v1alpha1" ) // ClusterLister helps list Clusters. diff --git a/pkg/client/listers/devops/v1alpha1/s2ibinary.go b/pkg/client/listers/devops/v1alpha1/s2ibinary.go index 28fbf5a7db..6a74ebd639 100644 --- a/pkg/client/listers/devops/v1alpha1/s2ibinary.go +++ b/pkg/client/listers/devops/v1alpha1/s2ibinary.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // S2iBinaryLister helps list S2iBinaries. diff --git a/pkg/client/listers/devops/v1alpha1/s2ibuilder.go b/pkg/client/listers/devops/v1alpha1/s2ibuilder.go index e446bd2ee2..7a98014332 100644 --- a/pkg/client/listers/devops/v1alpha1/s2ibuilder.go +++ b/pkg/client/listers/devops/v1alpha1/s2ibuilder.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // S2iBuilderLister helps list S2iBuilders. diff --git a/pkg/client/listers/devops/v1alpha1/s2ibuildertemplate.go b/pkg/client/listers/devops/v1alpha1/s2ibuildertemplate.go index 9bcc0784e2..495674db3f 100644 --- a/pkg/client/listers/devops/v1alpha1/s2ibuildertemplate.go +++ b/pkg/client/listers/devops/v1alpha1/s2ibuildertemplate.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // S2iBuilderTemplateLister helps list S2iBuilderTemplates. diff --git a/pkg/client/listers/devops/v1alpha1/s2irun.go b/pkg/client/listers/devops/v1alpha1/s2irun.go index 10f3c62123..5f27d5d773 100644 --- a/pkg/client/listers/devops/v1alpha1/s2irun.go +++ b/pkg/client/listers/devops/v1alpha1/s2irun.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + v1alpha1 "kubesphere.io/api/devops/v1alpha1" ) // S2iRunLister helps list S2iRuns. diff --git a/pkg/client/listers/devops/v1alpha3/devopsproject.go b/pkg/client/listers/devops/v1alpha3/devopsproject.go index 1530810579..d2c3070964 100644 --- a/pkg/client/listers/devops/v1alpha3/devopsproject.go +++ b/pkg/client/listers/devops/v1alpha3/devopsproject.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" ) // DevOpsProjectLister helps list DevOpsProjects. diff --git a/pkg/client/listers/devops/v1alpha3/pipeline.go b/pkg/client/listers/devops/v1alpha3/pipeline.go index a9a9baf378..00c76c9cec 100644 --- a/pkg/client/listers/devops/v1alpha3/pipeline.go +++ b/pkg/client/listers/devops/v1alpha3/pipeline.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + v1alpha3 "kubesphere.io/api/devops/v1alpha3" ) // PipelineLister helps list Pipelines. diff --git a/pkg/client/listers/iam/v1alpha2/globalrole.go b/pkg/client/listers/iam/v1alpha2/globalrole.go index f4b7a7882f..a03c34763b 100644 --- a/pkg/client/listers/iam/v1alpha2/globalrole.go +++ b/pkg/client/listers/iam/v1alpha2/globalrole.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // GlobalRoleLister helps list GlobalRoles. diff --git a/pkg/client/listers/iam/v1alpha2/globalrolebinding.go b/pkg/client/listers/iam/v1alpha2/globalrolebinding.go index df1fd3fa06..278154bfc1 100644 --- a/pkg/client/listers/iam/v1alpha2/globalrolebinding.go +++ b/pkg/client/listers/iam/v1alpha2/globalrolebinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // GlobalRoleBindingLister helps list GlobalRoleBindings. diff --git a/pkg/client/listers/iam/v1alpha2/group.go b/pkg/client/listers/iam/v1alpha2/group.go index ee61c76e8c..5c7bd6a24f 100644 --- a/pkg/client/listers/iam/v1alpha2/group.go +++ b/pkg/client/listers/iam/v1alpha2/group.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // GroupLister helps list Groups. diff --git a/pkg/client/listers/iam/v1alpha2/groupbinding.go b/pkg/client/listers/iam/v1alpha2/groupbinding.go index 002baa1cf0..a72927b278 100644 --- a/pkg/client/listers/iam/v1alpha2/groupbinding.go +++ b/pkg/client/listers/iam/v1alpha2/groupbinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // GroupBindingLister helps list GroupBindings. diff --git a/pkg/client/listers/iam/v1alpha2/loginrecord.go b/pkg/client/listers/iam/v1alpha2/loginrecord.go index 8a11c3e162..c5eb4dc7e1 100644 --- a/pkg/client/listers/iam/v1alpha2/loginrecord.go +++ b/pkg/client/listers/iam/v1alpha2/loginrecord.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // LoginRecordLister helps list LoginRecords. diff --git a/pkg/client/listers/iam/v1alpha2/rolebase.go b/pkg/client/listers/iam/v1alpha2/rolebase.go index 433d5013f0..81e136e346 100644 --- a/pkg/client/listers/iam/v1alpha2/rolebase.go +++ b/pkg/client/listers/iam/v1alpha2/rolebase.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // RoleBaseLister helps list RoleBases. diff --git a/pkg/client/listers/iam/v1alpha2/user.go b/pkg/client/listers/iam/v1alpha2/user.go index 1454fe64a0..4e0920377a 100644 --- a/pkg/client/listers/iam/v1alpha2/user.go +++ b/pkg/client/listers/iam/v1alpha2/user.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // UserLister helps list Users. diff --git a/pkg/client/listers/iam/v1alpha2/workspacerole.go b/pkg/client/listers/iam/v1alpha2/workspacerole.go index 7edaaf024d..e94a4ad67e 100644 --- a/pkg/client/listers/iam/v1alpha2/workspacerole.go +++ b/pkg/client/listers/iam/v1alpha2/workspacerole.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // WorkspaceRoleLister helps list WorkspaceRoles. diff --git a/pkg/client/listers/iam/v1alpha2/workspacerolebinding.go b/pkg/client/listers/iam/v1alpha2/workspacerolebinding.go index 20f83a34b8..e4684cf06a 100644 --- a/pkg/client/listers/iam/v1alpha2/workspacerolebinding.go +++ b/pkg/client/listers/iam/v1alpha2/workspacerolebinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" ) // WorkspaceRoleBindingLister helps list WorkspaceRoleBindings. diff --git a/pkg/client/listers/network/v1alpha1/ipamblock.go b/pkg/client/listers/network/v1alpha1/ipamblock.go index 4b74d26671..8039d46cfd 100644 --- a/pkg/client/listers/network/v1alpha1/ipamblock.go +++ b/pkg/client/listers/network/v1alpha1/ipamblock.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // IPAMBlockLister helps list IPAMBlocks. diff --git a/pkg/client/listers/network/v1alpha1/ipamhandle.go b/pkg/client/listers/network/v1alpha1/ipamhandle.go index a0796c975e..ca426eeab2 100644 --- a/pkg/client/listers/network/v1alpha1/ipamhandle.go +++ b/pkg/client/listers/network/v1alpha1/ipamhandle.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // IPAMHandleLister helps list IPAMHandles. diff --git a/pkg/client/listers/network/v1alpha1/ippool.go b/pkg/client/listers/network/v1alpha1/ippool.go index 9cf51c6ee9..d4393fd27b 100644 --- a/pkg/client/listers/network/v1alpha1/ippool.go +++ b/pkg/client/listers/network/v1alpha1/ippool.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // IPPoolLister helps list IPPools. diff --git a/pkg/client/listers/network/v1alpha1/namespacenetworkpolicy.go b/pkg/client/listers/network/v1alpha1/namespacenetworkpolicy.go index 02709fb29b..bc794f4345 100644 --- a/pkg/client/listers/network/v1alpha1/namespacenetworkpolicy.go +++ b/pkg/client/listers/network/v1alpha1/namespacenetworkpolicy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + v1alpha1 "kubesphere.io/api/network/v1alpha1" ) // NamespaceNetworkPolicyLister helps list NamespaceNetworkPolicies. diff --git a/pkg/client/listers/notification/v2beta1/config.go b/pkg/client/listers/notification/v2beta1/config.go index 00755435f3..0877076a74 100644 --- a/pkg/client/listers/notification/v2beta1/config.go +++ b/pkg/client/listers/notification/v2beta1/config.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + v2beta1 "kubesphere.io/api/notification/v2beta1" ) // ConfigLister helps list Configs. diff --git a/pkg/client/listers/notification/v2beta1/receiver.go b/pkg/client/listers/notification/v2beta1/receiver.go index 14d2498eac..d99e905be4 100644 --- a/pkg/client/listers/notification/v2beta1/receiver.go +++ b/pkg/client/listers/notification/v2beta1/receiver.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + v2beta1 "kubesphere.io/api/notification/v2beta1" ) // ReceiverLister helps list Receivers. diff --git a/pkg/client/listers/quota/v1alpha2/resourcequota.go b/pkg/client/listers/quota/v1alpha2/resourcequota.go index bae73d47f7..9278802716 100644 --- a/pkg/client/listers/quota/v1alpha2/resourcequota.go +++ b/pkg/client/listers/quota/v1alpha2/resourcequota.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + v1alpha2 "kubesphere.io/api/quota/v1alpha2" ) // ResourceQuotaLister helps list ResourceQuotas. diff --git a/pkg/client/listers/servicemesh/v1alpha2/servicepolicy.go b/pkg/client/listers/servicemesh/v1alpha2/servicepolicy.go index 7ad24d429b..e133683c3b 100644 --- a/pkg/client/listers/servicemesh/v1alpha2/servicepolicy.go +++ b/pkg/client/listers/servicemesh/v1alpha2/servicepolicy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + v1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" ) // ServicePolicyLister helps list ServicePolicies. diff --git a/pkg/client/listers/servicemesh/v1alpha2/strategy.go b/pkg/client/listers/servicemesh/v1alpha2/strategy.go index b47894bc59..5b9d0a5742 100644 --- a/pkg/client/listers/servicemesh/v1alpha2/strategy.go +++ b/pkg/client/listers/servicemesh/v1alpha2/strategy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + v1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" ) // StrategyLister helps list Strategies. diff --git a/pkg/client/listers/storage/v1alpha1/provisionercapability.go b/pkg/client/listers/storage/v1alpha1/provisionercapability.go index 2a460c9381..ebe0e9a29b 100644 --- a/pkg/client/listers/storage/v1alpha1/provisionercapability.go +++ b/pkg/client/listers/storage/v1alpha1/provisionercapability.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + v1alpha1 "kubesphere.io/api/storage/v1alpha1" ) // ProvisionerCapabilityLister helps list ProvisionerCapabilities. diff --git a/pkg/client/listers/storage/v1alpha1/storageclasscapability.go b/pkg/client/listers/storage/v1alpha1/storageclasscapability.go index 06ddae78d2..38a5c456e9 100644 --- a/pkg/client/listers/storage/v1alpha1/storageclasscapability.go +++ b/pkg/client/listers/storage/v1alpha1/storageclasscapability.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + v1alpha1 "kubesphere.io/api/storage/v1alpha1" ) // StorageClassCapabilityLister helps list StorageClassCapabilities. diff --git a/pkg/client/listers/tenant/v1alpha1/workspace.go b/pkg/client/listers/tenant/v1alpha1/workspace.go index ab79a1c144..0ca64b3302 100644 --- a/pkg/client/listers/tenant/v1alpha1/workspace.go +++ b/pkg/client/listers/tenant/v1alpha1/workspace.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + v1alpha1 "kubesphere.io/api/tenant/v1alpha1" ) // WorkspaceLister helps list Workspaces. diff --git a/pkg/client/listers/tenant/v1alpha2/workspacetemplate.go b/pkg/client/listers/tenant/v1alpha2/workspacetemplate.go index 29a7a5d31b..565492a500 100644 --- a/pkg/client/listers/tenant/v1alpha2/workspacetemplate.go +++ b/pkg/client/listers/tenant/v1alpha2/workspacetemplate.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + v1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) // WorkspaceTemplateLister helps list WorkspaceTemplates. diff --git a/pkg/client/listers/types/v1beta1/federatedapplication.go b/pkg/client/listers/types/v1beta1/federatedapplication.go index 8ee7ffd0ba..7cf19bc0a4 100644 --- a/pkg/client/listers/types/v1beta1/federatedapplication.go +++ b/pkg/client/listers/types/v1beta1/federatedapplication.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedApplicationLister helps list FederatedApplications. diff --git a/pkg/client/listers/types/v1beta1/federatedclusterrole.go b/pkg/client/listers/types/v1beta1/federatedclusterrole.go index 03f3081aa4..e1f7fc891a 100644 --- a/pkg/client/listers/types/v1beta1/federatedclusterrole.go +++ b/pkg/client/listers/types/v1beta1/federatedclusterrole.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedClusterRoleLister helps list FederatedClusterRoles. diff --git a/pkg/client/listers/types/v1beta1/federatedclusterrolebinding.go b/pkg/client/listers/types/v1beta1/federatedclusterrolebinding.go index 769465b2e1..22459fb4d2 100644 --- a/pkg/client/listers/types/v1beta1/federatedclusterrolebinding.go +++ b/pkg/client/listers/types/v1beta1/federatedclusterrolebinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedClusterRoleBindingLister helps list FederatedClusterRoleBindings. diff --git a/pkg/client/listers/types/v1beta1/federatedconfigmap.go b/pkg/client/listers/types/v1beta1/federatedconfigmap.go index abc6ce6a0f..30ed24462b 100644 --- a/pkg/client/listers/types/v1beta1/federatedconfigmap.go +++ b/pkg/client/listers/types/v1beta1/federatedconfigmap.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedConfigMapLister helps list FederatedConfigMaps. diff --git a/pkg/client/listers/types/v1beta1/federateddeployment.go b/pkg/client/listers/types/v1beta1/federateddeployment.go index 1754c35d6d..6c42fb5ce9 100644 --- a/pkg/client/listers/types/v1beta1/federateddeployment.go +++ b/pkg/client/listers/types/v1beta1/federateddeployment.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedDeploymentLister helps list FederatedDeployments. diff --git a/pkg/client/listers/types/v1beta1/federatedgroup.go b/pkg/client/listers/types/v1beta1/federatedgroup.go index e979ec28cc..67e95f80b2 100644 --- a/pkg/client/listers/types/v1beta1/federatedgroup.go +++ b/pkg/client/listers/types/v1beta1/federatedgroup.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedGroupLister helps list FederatedGroups. diff --git a/pkg/client/listers/types/v1beta1/federatedgroupbinding.go b/pkg/client/listers/types/v1beta1/federatedgroupbinding.go index 4844151117..4196a3574f 100644 --- a/pkg/client/listers/types/v1beta1/federatedgroupbinding.go +++ b/pkg/client/listers/types/v1beta1/federatedgroupbinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedGroupBindingLister helps list FederatedGroupBindings. diff --git a/pkg/client/listers/types/v1beta1/federatedingress.go b/pkg/client/listers/types/v1beta1/federatedingress.go index 77ddda3b08..4b8d877ee0 100644 --- a/pkg/client/listers/types/v1beta1/federatedingress.go +++ b/pkg/client/listers/types/v1beta1/federatedingress.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedIngressLister helps list FederatedIngresses. diff --git a/pkg/client/listers/types/v1beta1/federatedjob.go b/pkg/client/listers/types/v1beta1/federatedjob.go index 1dd28760cf..d59f34aebc 100644 --- a/pkg/client/listers/types/v1beta1/federatedjob.go +++ b/pkg/client/listers/types/v1beta1/federatedjob.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedJobLister helps list FederatedJobs. diff --git a/pkg/client/listers/types/v1beta1/federatedlimitrange.go b/pkg/client/listers/types/v1beta1/federatedlimitrange.go index 7cd3c8a365..2c2aa937e8 100644 --- a/pkg/client/listers/types/v1beta1/federatedlimitrange.go +++ b/pkg/client/listers/types/v1beta1/federatedlimitrange.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedLimitRangeLister helps list FederatedLimitRanges. diff --git a/pkg/client/listers/types/v1beta1/federatednamespace.go b/pkg/client/listers/types/v1beta1/federatednamespace.go index 9fb4fb3dc6..58677c76c7 100644 --- a/pkg/client/listers/types/v1beta1/federatednamespace.go +++ b/pkg/client/listers/types/v1beta1/federatednamespace.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedNamespaceLister helps list FederatedNamespaces. diff --git a/pkg/client/listers/types/v1beta1/federatedpersistentvolumeclaim.go b/pkg/client/listers/types/v1beta1/federatedpersistentvolumeclaim.go index 21e958c7bb..2b9d73cd75 100644 --- a/pkg/client/listers/types/v1beta1/federatedpersistentvolumeclaim.go +++ b/pkg/client/listers/types/v1beta1/federatedpersistentvolumeclaim.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedPersistentVolumeClaimLister helps list FederatedPersistentVolumeClaims. diff --git a/pkg/client/listers/types/v1beta1/federatedresourcequota.go b/pkg/client/listers/types/v1beta1/federatedresourcequota.go index 54fac83b57..d3c239f7cf 100644 --- a/pkg/client/listers/types/v1beta1/federatedresourcequota.go +++ b/pkg/client/listers/types/v1beta1/federatedresourcequota.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedResourceQuotaLister helps list FederatedResourceQuotas. diff --git a/pkg/client/listers/types/v1beta1/federatedsecret.go b/pkg/client/listers/types/v1beta1/federatedsecret.go index 6d995c6acf..abca168e4c 100644 --- a/pkg/client/listers/types/v1beta1/federatedsecret.go +++ b/pkg/client/listers/types/v1beta1/federatedsecret.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedSecretLister helps list FederatedSecrets. diff --git a/pkg/client/listers/types/v1beta1/federatedservice.go b/pkg/client/listers/types/v1beta1/federatedservice.go index 3dd23d3595..adde0f3b60 100644 --- a/pkg/client/listers/types/v1beta1/federatedservice.go +++ b/pkg/client/listers/types/v1beta1/federatedservice.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedServiceLister helps list FederatedServices. diff --git a/pkg/client/listers/types/v1beta1/federatedstatefulset.go b/pkg/client/listers/types/v1beta1/federatedstatefulset.go index f524c8da4d..d01ce736c7 100644 --- a/pkg/client/listers/types/v1beta1/federatedstatefulset.go +++ b/pkg/client/listers/types/v1beta1/federatedstatefulset.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1beta1 "kubesphere.io/api/types/v1beta1" ) // FederatedStatefulSetLister helps list FederatedStatefulSets. diff --git a/pkg/controller/application/application_controller.go b/pkg/controller/application/application_controller.go index e5fcc4a3af..b64451f928 100644 --- a/pkg/controller/application/application_controller.go +++ b/pkg/controller/application/application_controller.go @@ -44,7 +44,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" + "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" ) diff --git a/pkg/controller/cluster/cluster_controller.go b/pkg/controller/cluster/cluster_controller.go index 27cba0f09c..1a011a041d 100644 --- a/pkg/controller/cluster/cluster_controller.go +++ b/pkg/controller/cluster/cluster_controller.go @@ -47,7 +47,8 @@ import ( "k8s.io/klog" fedv1b1 "sigs.k8s.io/kubefed/pkg/apis/core/v1beta1" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + clusterclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1" clusterinformer "kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1" clusterlister "kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1" diff --git a/pkg/controller/cluster/join.go b/pkg/controller/cluster/join.go index ba2fc92158..2d25742200 100644 --- a/pkg/controller/cluster/join.go +++ b/pkg/controller/cluster/join.go @@ -39,7 +39,8 @@ import ( fedv1b1 "sigs.k8s.io/kubefed/pkg/apis/core/v1beta1" "sigs.k8s.io/kubefed/pkg/kubefedctl/util" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tenant/v1alpha1" ) diff --git a/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go b/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go index 1f4382a47d..0e590a0f9e 100644 --- a/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go +++ b/pkg/controller/clusterrolebinding/clusterrolebinding_controller.go @@ -36,7 +36,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/models/kubectl" ) diff --git a/pkg/controller/destinationrule/destinationrule_controller.go b/pkg/controller/destinationrule/destinationrule_controller.go index fe36057bf1..4e080a9dfb 100644 --- a/pkg/controller/destinationrule/destinationrule_controller.go +++ b/pkg/controller/destinationrule/destinationrule_controller.go @@ -40,7 +40,7 @@ import ( v1core "k8s.io/client-go/kubernetes/typed/core/v1" log "k8s.io/klog" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" istioclientset "istio.io/client-go/pkg/clientset/versioned" istioinformers "istio.io/client-go/pkg/informers/externalversions/networking/v1alpha3" diff --git a/pkg/controller/destinationrule/destinationrule_controller_test.go b/pkg/controller/destinationrule/destinationrule_controller_test.go index f49ded3acc..80a72249ad 100644 --- a/pkg/controller/destinationrule/destinationrule_controller_test.go +++ b/pkg/controller/destinationrule/destinationrule_controller_test.go @@ -34,7 +34,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + "kubesphere.io/api/servicemesh/v1alpha2" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" diff --git a/pkg/controller/devopscredential/devopscredential_controller.go b/pkg/controller/devopscredential/devopscredential_controller.go index 6e5c6788ac..6b9bdd4515 100644 --- a/pkg/controller/devopscredential/devopscredential_controller.go +++ b/pkg/controller/devopscredential/devopscredential_controller.go @@ -40,7 +40,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/controller/utils" diff --git a/pkg/controller/devopscredential/devopscredential_controller_test.go b/pkg/controller/devopscredential/devopscredential_controller_test.go index d7491e328b..35009d6670 100644 --- a/pkg/controller/devopscredential/devopscredential_controller_test.go +++ b/pkg/controller/devopscredential/devopscredential_controller_test.go @@ -38,7 +38,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - devops "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devops "kubesphere.io/api/devops/v1alpha3" ) var ( diff --git a/pkg/controller/devopsproject/devopsproject_controller.go b/pkg/controller/devopsproject/devopsproject_controller.go index 6ac4bcf207..39e9d1a147 100644 --- a/pkg/controller/devopsproject/devopsproject_controller.go +++ b/pkg/controller/devopsproject/devopsproject_controller.go @@ -40,7 +40,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" tenantv1alpha1informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/tenant/v1alpha1" tenantv1alpha1listers "kubesphere.io/kubesphere/pkg/client/listers/tenant/v1alpha1" diff --git a/pkg/controller/devopsproject/devopsproject_controller_test.go b/pkg/controller/devopsproject/devopsproject_controller_test.go index 8d3d1ee7cf..9b367475fa 100644 --- a/pkg/controller/devopsproject/devopsproject_controller_test.go +++ b/pkg/controller/devopsproject/devopsproject_controller_test.go @@ -23,7 +23,8 @@ import ( v1 "k8s.io/api/core/v1" - devopsprojects "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsprojects "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/constants" fakeDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops/fake" @@ -37,7 +38,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - devops "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devops "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ) diff --git a/pkg/controller/globalrole/globalrole_controller.go b/pkg/controller/globalrole/globalrole_controller.go index fb3d8f6fbb..4193ef31e9 100644 --- a/pkg/controller/globalrole/globalrole_controller.go +++ b/pkg/controller/globalrole/globalrole_controller.go @@ -39,7 +39,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/controller/globalrolebinding/globalrolebinding_controller.go b/pkg/controller/globalrolebinding/globalrolebinding_controller.go index 783ac91aaf..13daa6a57c 100644 --- a/pkg/controller/globalrolebinding/globalrolebinding_controller.go +++ b/pkg/controller/globalrolebinding/globalrolebinding_controller.go @@ -37,7 +37,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/controller/group/group_controller.go b/pkg/controller/group/group_controller.go index 9596c44050..1b6dc51930 100644 --- a/pkg/controller/group/group_controller.go +++ b/pkg/controller/group/group_controller.go @@ -38,9 +38,10 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iam1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + iam1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + fedv1beta1types "kubesphere.io/api/types/v1beta1" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" fedv1beta1informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/types/v1beta1" diff --git a/pkg/controller/group/group_controller_test.go b/pkg/controller/group/group_controller_test.go index 68472429f9..e7729945f1 100644 --- a/pkg/controller/group/group_controller_test.go +++ b/pkg/controller/group/group_controller_test.go @@ -34,9 +34,10 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + fedv1beta1types "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/controller/groupbinding/groupbinding_controller.go b/pkg/controller/groupbinding/groupbinding_controller.go index 10fe7d4100..16de688828 100644 --- a/pkg/controller/groupbinding/groupbinding_controller.go +++ b/pkg/controller/groupbinding/groupbinding_controller.go @@ -37,8 +37,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + fedv1beta1types "kubesphere.io/api/types/v1beta1" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" fedv1beta1informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/types/v1beta1" diff --git a/pkg/controller/groupbinding/groupbinding_controller_test.go b/pkg/controller/groupbinding/groupbinding_controller_test.go index fa787bf390..dbca3e9da0 100644 --- a/pkg/controller/groupbinding/groupbinding_controller_test.go +++ b/pkg/controller/groupbinding/groupbinding_controller_test.go @@ -35,9 +35,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - fedv1beta1types "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + v1alpha2 "kubesphere.io/api/iam/v1alpha2" + fedv1beta1types "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/controller/loginrecord/loginrecord_controller.go b/pkg/controller/loginrecord/loginrecord_controller.go index 84d3b8ee0e..76f4ddabad 100644 --- a/pkg/controller/loginrecord/loginrecord_controller.go +++ b/pkg/controller/loginrecord/loginrecord_controller.go @@ -35,7 +35,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam/v1alpha2" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" diff --git a/pkg/controller/loginrecord/loginrecord_controller_test.go b/pkg/controller/loginrecord/loginrecord_controller_test.go index 3311608965..50c0d5dbf7 100644 --- a/pkg/controller/loginrecord/loginrecord_controller_test.go +++ b/pkg/controller/loginrecord/loginrecord_controller_test.go @@ -30,8 +30,9 @@ import ( clienttesting "k8s.io/client-go/testing" "sigs.k8s.io/controller-runtime/pkg/envtest/printer" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/apis" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ) diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index af2a2c3310..680a90ee29 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -38,8 +38,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 18959bc7b7..6464fd1f33 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -26,7 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/controller/network/ippool/ippool_controller.go b/pkg/controller/network/ippool/ippool_controller.go index 5594e5c9a6..a8f46eef1b 100644 --- a/pkg/controller/network/ippool/ippool_controller.go +++ b/pkg/controller/network/ippool/ippool_controller.go @@ -41,8 +41,9 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" networkInformer "kubesphere.io/kubesphere/pkg/client/informers/externalversions/network/v1alpha1" diff --git a/pkg/controller/network/ippool/ippool_controller_test.go b/pkg/controller/network/ippool/ippool_controller_test.go index 893e222466..d7ea59cb65 100644 --- a/pkg/controller/network/ippool/ippool_controller_test.go +++ b/pkg/controller/network/ippool/ippool_controller_test.go @@ -29,7 +29,8 @@ import ( k8sfake "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/v1alpha1" + ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/controller/network/utils" diff --git a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go index 607a4804fa..ec9507c5de 100644 --- a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go +++ b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_controller.go @@ -38,8 +38,9 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - workspacev1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + "kubesphere.io/api/network/v1alpha1" + workspacev1alpha1 "kubesphere.io/api/tenant/v1alpha1" + ksnetclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/network/v1alpha1" nspolicy "kubesphere.io/kubesphere/pkg/client/informers/externalversions/network/v1alpha1" workspace "kubesphere.io/kubesphere/pkg/client/informers/externalversions/tenant/v1alpha1" diff --git a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go index ebca31551c..17c7f783c0 100644 --- a/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go +++ b/pkg/controller/network/nsnetworkpolicy/nsnetworkpolicy_test.go @@ -31,8 +31,9 @@ import ( kubefake "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" - netv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - wkspv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + netv1alpha1 "kubesphere.io/api/network/v1alpha1" + wkspv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" nsnppolicyinformer "kubesphere.io/kubesphere/pkg/client/informers/externalversions/network/v1alpha1" diff --git a/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go b/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go index a3db0b29c6..e28ae91ca8 100644 --- a/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go +++ b/pkg/controller/network/nsnetworkpolicy/provider/ns_k8s.go @@ -36,7 +36,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/v1alpha1" ) const ( diff --git a/pkg/controller/notification/notification_controller.go b/pkg/controller/notification/notification_controller.go index b2ab84c90d..f20f786849 100644 --- a/pkg/controller/notification/notification_controller.go +++ b/pkg/controller/notification/notification_controller.go @@ -41,9 +41,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/api/notification/v2beta1" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/controller/notification/notification_controller_suite_test.go b/pkg/controller/notification/notification_controller_suite_test.go index 077000e384..eb214c14cc 100644 --- a/pkg/controller/notification/notification_controller_suite_test.go +++ b/pkg/controller/notification/notification_controller_suite_test.go @@ -27,8 +27,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/envtest/printer" + "kubesphere.io/api/notification/v2beta1" + "kubesphere.io/kubesphere/pkg/apis" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" ) func TestSource(t *testing.T) { diff --git a/pkg/controller/notification/notification_controller_test.go b/pkg/controller/notification/notification_controller_test.go index a9dda73d1b..76b82a65ed 100644 --- a/pkg/controller/notification/notification_controller_test.go +++ b/pkg/controller/notification/notification_controller_test.go @@ -29,9 +29,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/api/notification/v2beta1" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/controller/openpitrix/helmapplication/helm_application_controller.go b/pkg/controller/openpitrix/helmapplication/helm_application_controller.go index f1cd4d61ee..ecdde558ee 100644 --- a/pkg/controller/openpitrix/helmapplication/helm_application_controller.go +++ b/pkg/controller/openpitrix/helmapplication/helm_application_controller.go @@ -29,7 +29,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) diff --git a/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go b/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go index e2f5f8d418..ad79955cf8 100644 --- a/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go +++ b/pkg/controller/openpitrix/helmapplication/helm_application_version_controller.go @@ -30,7 +30,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) diff --git a/pkg/controller/openpitrix/helmcategory/helm_category_controller.go b/pkg/controller/openpitrix/helmcategory/helm_category_controller.go index 06f8160d3c..efaf587c37 100644 --- a/pkg/controller/openpitrix/helmcategory/helm_category_controller.go +++ b/pkg/controller/openpitrix/helmcategory/helm_category_controller.go @@ -36,7 +36,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) diff --git a/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go b/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go index 19b0bbb5f0..b0e62fde7e 100644 --- a/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go +++ b/pkg/controller/openpitrix/helmcategory/helm_category_controller_test.go @@ -25,7 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/idutils" ) diff --git a/pkg/controller/openpitrix/helmrelease/get_chart_data.go b/pkg/controller/openpitrix/helmrelease/get_chart_data.go index 7f3e117ff9..35f0c7f1b5 100644 --- a/pkg/controller/openpitrix/helmrelease/get_chart_data.go +++ b/pkg/controller/openpitrix/helmrelease/get_chart_data.go @@ -24,7 +24,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" ) diff --git a/pkg/controller/openpitrix/helmrelease/helm_release_controller.go b/pkg/controller/openpitrix/helmrelease/helm_release_controller.go index ca30f8a0c3..2c95c52bc5 100644 --- a/pkg/controller/openpitrix/helmrelease/helm_release_controller.go +++ b/pkg/controller/openpitrix/helmrelease/helm_release_controller.go @@ -34,8 +34,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmwrapper" diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go index d8148ad42e..aa17da9dfb 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go @@ -35,7 +35,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" "kubesphere.io/kubesphere/pkg/utils/sliceutil" ) diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go index 26372de885..bb3be042da 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller_test.go @@ -25,7 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/utils/idutils" ) diff --git a/pkg/controller/pipeline/pipeline_controller.go b/pkg/controller/pipeline/pipeline_controller.go index 21ec162143..0169da1311 100644 --- a/pkg/controller/pipeline/pipeline_controller.go +++ b/pkg/controller/pipeline/pipeline_controller.go @@ -39,7 +39,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" devopsinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/devops/v1alpha3" devopslisters "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha3" diff --git a/pkg/controller/pipeline/pipeline_controller_test.go b/pkg/controller/pipeline/pipeline_controller_test.go index 3fb3d43c48..a7718c5c3a 100644 --- a/pkg/controller/pipeline/pipeline_controller_test.go +++ b/pkg/controller/pipeline/pipeline_controller_test.go @@ -37,7 +37,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - devops "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devops "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ) diff --git a/pkg/controller/quota/accessor.go b/pkg/controller/quota/accessor.go index a31dd0ece8..378a1a1b45 100644 --- a/pkg/controller/quota/accessor.go +++ b/pkg/controller/quota/accessor.go @@ -26,7 +26,7 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" lru "github.com/hashicorp/golang-lru" diff --git a/pkg/controller/quota/resourcequota_controller.go b/pkg/controller/quota/resourcequota_controller.go index a5411d6de2..4b1bd15a41 100644 --- a/pkg/controller/quota/resourcequota_controller.go +++ b/pkg/controller/quota/resourcequota_controller.go @@ -39,11 +39,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + evaluatorcore "kubesphere.io/kubesphere/kube/pkg/quota/v1/evaluator/core" "kubesphere.io/kubesphere/kube/pkg/quota/v1/generic" "kubesphere.io/kubesphere/kube/pkg/quota/v1/install" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/sliceutil" diff --git a/pkg/controller/quota/util.go b/pkg/controller/quota/util.go index 4d46dbaad0..90ca4e4de0 100644 --- a/pkg/controller/quota/util.go +++ b/pkg/controller/quota/util.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" ) // Following code copied from github.com/openshift/library-go/pkg/quota/quotautil diff --git a/pkg/controller/s2ibinary/s2ibinary_controller.go b/pkg/controller/s2ibinary/s2ibinary_controller.go index 78a8d37353..f39238c842 100644 --- a/pkg/controller/s2ibinary/s2ibinary_controller.go +++ b/pkg/controller/s2ibinary/s2ibinary_controller.go @@ -37,7 +37,8 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/sliceutil" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + devopsclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" devopsinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/devops/v1alpha1" devopslisters "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha1" diff --git a/pkg/controller/s2ibinary/s2ibinary_controller_test.go b/pkg/controller/s2ibinary/s2ibinary_controller_test.go index e49b3859ca..ca173bcef8 100644 --- a/pkg/controller/s2ibinary/s2ibinary_controller_test.go +++ b/pkg/controller/s2ibinary/s2ibinary_controller_test.go @@ -32,7 +32,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - s2i "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + s2i "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ) diff --git a/pkg/controller/s2irun/s2irun_controller.go b/pkg/controller/s2irun/s2irun_controller.go index 9e540f373c..4680e1c5ca 100644 --- a/pkg/controller/s2irun/s2irun_controller.go +++ b/pkg/controller/s2irun/s2irun_controller.go @@ -37,7 +37,8 @@ import ( "kubesphere.io/kubesphere/pkg/utils/sliceutil" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + devopsclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" devopsinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/devops/v1alpha1" devopslisters "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha1" diff --git a/pkg/controller/s2irun/s2irun_controller_test.go b/pkg/controller/s2irun/s2irun_controller_test.go index d3a64e8cf7..bd62f56bc6 100644 --- a/pkg/controller/s2irun/s2irun_controller_test.go +++ b/pkg/controller/s2irun/s2irun_controller_test.go @@ -30,7 +30,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - s2i "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + s2i "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ) diff --git a/pkg/controller/serviceaccount/serviceaccount_controller.go b/pkg/controller/serviceaccount/serviceaccount_controller.go index 0ef7aad726..47c5994119 100644 --- a/pkg/controller/serviceaccount/serviceaccount_controller.go +++ b/pkg/controller/serviceaccount/serviceaccount_controller.go @@ -31,7 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" ) diff --git a/pkg/controller/serviceaccount/serviceaccount_controller_test.go b/pkg/controller/serviceaccount/serviceaccount_controller_test.go index 5ed62f1024..87f53c4b3d 100644 --- a/pkg/controller/serviceaccount/serviceaccount_controller_test.go +++ b/pkg/controller/serviceaccount/serviceaccount_controller_test.go @@ -33,7 +33,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/utils/k8sutil" ) diff --git a/pkg/controller/storage/capability/capability_controller.go b/pkg/controller/storage/capability/capability_controller.go index 7a944d9494..345d68488e 100644 --- a/pkg/controller/storage/capability/capability_controller.go +++ b/pkg/controller/storage/capability/capability_controller.go @@ -50,7 +50,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog" - capability "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + capability "kubesphere.io/api/storage/v1alpha1" + crdscheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" capabilityclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/storage/v1alpha1" capabilityinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/storage/v1alpha1" diff --git a/pkg/controller/storage/capability/capability_controller_test.go b/pkg/controller/storage/capability/capability_controller_test.go index 475c7c11e0..7026e65154 100644 --- a/pkg/controller/storage/capability/capability_controller_test.go +++ b/pkg/controller/storage/capability/capability_controller_test.go @@ -42,7 +42,8 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" - ksv1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + ksv1alpha1 "kubesphere.io/api/storage/v1alpha1" + ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" ) diff --git a/pkg/controller/storage/capability/csi_capability.go b/pkg/controller/storage/capability/csi_capability.go index 625d5bb030..65daeb0c14 100644 --- a/pkg/controller/storage/capability/csi_capability.go +++ b/pkg/controller/storage/capability/csi_capability.go @@ -29,7 +29,7 @@ import ( "google.golang.org/grpc/connectivity" "google.golang.org/grpc/keepalive" - "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + "kubesphere.io/api/storage/v1alpha1" ) const ( diff --git a/pkg/controller/storage/capability/csi_capability_test.go b/pkg/controller/storage/capability/csi_capability_test.go index 0636d279af..ab795e1911 100644 --- a/pkg/controller/storage/capability/csi_capability_test.go +++ b/pkg/controller/storage/capability/csi_capability_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/rand" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + "kubesphere.io/api/storage/v1alpha1" ) var DefaultControllerRPCType = []csi.ControllerServiceCapability_RPC_Type{ diff --git a/pkg/controller/user/user_controller.go b/pkg/controller/user/user_controller.go index ad5907bca1..25e3d53ff4 100644 --- a/pkg/controller/user/user_controller.go +++ b/pkg/controller/user/user_controller.go @@ -48,7 +48,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" kubespherescheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" diff --git a/pkg/controller/user/user_controller_test.go b/pkg/controller/user/user_controller_test.go index 9608926c8a..582e12811f 100644 --- a/pkg/controller/user/user_controller_test.go +++ b/pkg/controller/user/user_controller_test.go @@ -31,7 +31,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/controller/user/user_webhook.go b/pkg/controller/user/user_webhook.go index 93a8775c48..bd54e7bffe 100644 --- a/pkg/controller/user/user_webhook.go +++ b/pkg/controller/user/user_webhook.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/api/iam/v1alpha2" ) type EmailValidator struct { diff --git a/pkg/controller/virtualservice/virtualservice_controller.go b/pkg/controller/virtualservice/virtualservice_controller.go index 0a44890863..60cec89319 100644 --- a/pkg/controller/virtualservice/virtualservice_controller.go +++ b/pkg/controller/virtualservice/virtualservice_controller.go @@ -44,7 +44,8 @@ import ( "k8s.io/client-go/util/workqueue" log "k8s.io/klog" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" + servicemeshclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" servicemeshinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/servicemesh/v1alpha2" servicemeshlisters "kubesphere.io/kubesphere/pkg/client/listers/servicemesh/v1alpha2" diff --git a/pkg/controller/virtualservice/virtualservice_controller_test.go b/pkg/controller/virtualservice/virtualservice_controller_test.go index 2385cb4d44..60125cae35 100644 --- a/pkg/controller/virtualservice/virtualservice_controller_test.go +++ b/pkg/controller/virtualservice/virtualservice_controller_test.go @@ -34,7 +34,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + "kubesphere.io/api/servicemesh/v1alpha2" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/controller/utils/servicemesh" diff --git a/pkg/controller/workspace/workspace_controller.go b/pkg/controller/workspace/workspace_controller.go index 2d155a2fca..553470c9fc 100644 --- a/pkg/controller/workspace/workspace_controller.go +++ b/pkg/controller/workspace/workspace_controller.go @@ -29,7 +29,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" diff --git a/pkg/controller/workspace/workspace_controller_test.go b/pkg/controller/workspace/workspace_controller_test.go index def41e2cfe..129a02885e 100644 --- a/pkg/controller/workspace/workspace_controller_test.go +++ b/pkg/controller/workspace/workspace_controller_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" ) var _ = Describe("Workspace", func() { diff --git a/pkg/controller/workspacerole/workspacerole_controller.go b/pkg/controller/workspacerole/workspacerole_controller.go index bccedab5f4..82ee66bbdc 100644 --- a/pkg/controller/workspacerole/workspacerole_controller.go +++ b/pkg/controller/workspacerole/workspacerole_controller.go @@ -33,9 +33,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" diff --git a/pkg/controller/workspacerole/workspacerole_controller_test.go b/pkg/controller/workspacerole/workspacerole_controller_test.go index ff26530084..5b44d10a7a 100644 --- a/pkg/controller/workspacerole/workspacerole_controller_test.go +++ b/pkg/controller/workspacerole/workspacerole_controller_test.go @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) var _ = Describe("WorkspaceRole", func() { diff --git a/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go b/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go index 5c072ce8d4..590a68150e 100644 --- a/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go +++ b/pkg/controller/workspacerolebinding/workspacerolebinding_controller.go @@ -33,9 +33,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/k8sutil" diff --git a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go index 687ab0f442..ed8bdcfa95 100644 --- a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go +++ b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) var _ = Describe("WorkspaceRoleBinding", func() { diff --git a/pkg/controller/workspacetemplate/workspacetemplate_controller.go b/pkg/controller/workspacetemplate/workspacetemplate_controller.go index a4a6a98797..7cd15fd8ff 100644 --- a/pkg/controller/workspacetemplate/workspacetemplate_controller.go +++ b/pkg/controller/workspacetemplate/workspacetemplate_controller.go @@ -36,11 +36,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + "kubesphere.io/api/application/v1alpha1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/constants" controllerutils "kubesphere.io/kubesphere/pkg/controller/utils/controller" "kubesphere.io/kubesphere/pkg/utils/sliceutil" diff --git a/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go b/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go index fab1724d4f..52d6ca193c 100644 --- a/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go +++ b/pkg/controller/workspacetemplate/workspacetemplate_controller_suite_test.go @@ -23,9 +23,10 @@ import ( "k8s.io/klog/klogr" logf "sigs.k8s.io/controller-runtime/pkg/log" + helmappscheme "kubesphere.io/api/application/v1alpha1" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/apis" - helmappscheme "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go b/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go index e574079e8f..58fa3039df 100644 --- a/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go +++ b/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go @@ -32,9 +32,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) var reconciler *Reconciler diff --git a/pkg/kapis/cluster/v1alpha1/handler.go b/pkg/kapis/cluster/v1alpha1/handler.go index 7a230a5d49..b60123d806 100644 --- a/pkg/kapis/cluster/v1alpha1/handler.go +++ b/pkg/kapis/cluster/v1alpha1/handler.go @@ -43,8 +43,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" + "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/config" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" clusterlister "kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1" diff --git a/pkg/kapis/cluster/v1alpha1/handler_test.go b/pkg/kapis/cluster/v1alpha1/handler_test.go index 57fb147810..570ce4338e 100644 --- a/pkg/kapis/cluster/v1alpha1/handler_test.go +++ b/pkg/kapis/cluster/v1alpha1/handler_test.go @@ -37,7 +37,8 @@ import ( "k8s.io/client-go/tools/clientcmd" "sigs.k8s.io/controller-runtime/pkg/envtest" - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/version" diff --git a/pkg/kapis/devops/v1alpha2/devops.go b/pkg/kapis/devops/v1alpha2/devops.go index 5050bb3606..482f1e7ae3 100644 --- a/pkg/kapis/devops/v1alpha2/devops.go +++ b/pkg/kapis/devops/v1alpha2/devops.go @@ -28,8 +28,9 @@ import ( log "k8s.io/klog" "k8s.io/klog/v2" + "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/kapis/devops/v1alpha2/devops_test.go b/pkg/kapis/devops/v1alpha2/devops_test.go index 0822349747..7801f8adda 100644 --- a/pkg/kapis/devops/v1alpha2/devops_test.go +++ b/pkg/kapis/devops/v1alpha2/devops_test.go @@ -4,7 +4,8 @@ import ( "strings" "testing" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/models/devops" ) diff --git a/pkg/kapis/devops/v1alpha2/register.go b/pkg/kapis/devops/v1alpha2/register.go index 91f280a58c..a06fdbd6dc 100644 --- a/pkg/kapis/devops/v1alpha2/register.go +++ b/pkg/kapis/devops/v1alpha2/register.go @@ -28,7 +28,8 @@ import ( "k8s.io/apimachinery/pkg/util/proxy" "k8s.io/klog" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/kapis/devops/v1alpha3/handler.go b/pkg/kapis/devops/v1alpha3/handler.go index 783ed2e335..66e7c60ac7 100644 --- a/pkg/kapis/devops/v1alpha3/handler.go +++ b/pkg/kapis/devops/v1alpha3/handler.go @@ -24,8 +24,9 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/query" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/kapis/devops/v1alpha3/register.go b/pkg/kapis/devops/v1alpha3/register.go index 15c63bccf3..7e9deadf70 100644 --- a/pkg/kapis/devops/v1alpha3/register.go +++ b/pkg/kapis/devops/v1alpha3/register.go @@ -28,8 +28,9 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" + "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/runtime" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/kapis/iam/v1alpha2/handler.go b/pkg/kapis/iam/v1alpha2/handler.go index 24ddb72602..9bb58077b8 100644 --- a/pkg/kapis/iam/v1alpha2/handler.go +++ b/pkg/kapis/iam/v1alpha2/handler.go @@ -30,8 +30,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/query" apirequest "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/kapis/iam/v1alpha2/register.go b/pkg/kapis/iam/v1alpha2/register.go index fc85db1880..84279f8c49 100644 --- a/pkg/kapis/iam/v1alpha2/register.go +++ b/pkg/kapis/iam/v1alpha2/register.go @@ -27,8 +27,9 @@ import ( v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime/schema" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models/iam/am" diff --git a/pkg/kapis/oauth/handler.go b/pkg/kapis/oauth/handler.go index ac3b37d132..6a32b155eb 100644 --- a/pkg/kapis/oauth/handler.go +++ b/pkg/kapis/oauth/handler.go @@ -29,8 +29,9 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/kapis/openpitrix/v1/handler.go b/pkg/kapis/openpitrix/v1/handler.go index 8a7c77f421..ebd17e0336 100644 --- a/pkg/kapis/openpitrix/v1/handler.go +++ b/pkg/kapis/openpitrix/v1/handler.go @@ -28,8 +28,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/kapis/openpitrix/v2alpha1/register.go b/pkg/kapis/openpitrix/v2alpha1/register.go index 46162f1530..1e421e803f 100644 --- a/pkg/kapis/openpitrix/v2alpha1/register.go +++ b/pkg/kapis/openpitrix/v2alpha1/register.go @@ -20,8 +20,9 @@ import ( restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/kapis/tenant/v1alpha2/handler.go b/pkg/kapis/tenant/v1alpha2/handler.go index 9c132ebfb3..1b4c5fbc94 100644 --- a/pkg/kapis/tenant/v1alpha2/handler.go +++ b/pkg/kapis/tenant/v1alpha2/handler.go @@ -28,12 +28,13 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" auditingv1alpha1 "kubesphere.io/kubesphere/pkg/api/auditing/v1alpha1" eventsv1alpha1 "kubesphere.io/kubesphere/pkg/api/events/v1alpha1" loggingv1alpha2 "kubesphere.io/kubesphere/pkg/api/logging/v1alpha2" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/kapis/tenant/v1alpha2/register.go b/pkg/kapis/tenant/v1alpha2/register.go index 82697cae39..14415c44a3 100644 --- a/pkg/kapis/tenant/v1alpha2/register.go +++ b/pkg/kapis/tenant/v1alpha2/register.go @@ -29,12 +29,13 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" auditingv1alpha1 "kubesphere.io/kubesphere/pkg/api/auditing/v1alpha1" eventsv1alpha1 "kubesphere.io/kubesphere/pkg/api/events/v1alpha1" loggingv1alpha2 "kubesphere.io/kubesphere/pkg/api/logging/v1alpha2" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/runtime" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/models/auth/authenticator.go b/pkg/models/auth/authenticator.go index 1553410425..6c63bc0293 100644 --- a/pkg/models/auth/authenticator.go +++ b/pkg/models/auth/authenticator.go @@ -33,7 +33,8 @@ import ( authuser "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/models/auth/login_recoder.go b/pkg/models/auth/login_recoder.go index 939c06bfd3..165f5fc915 100644 --- a/pkg/models/auth/login_recoder.go +++ b/pkg/models/auth/login_recoder.go @@ -24,7 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" iamv1alpha2listers "kubesphere.io/kubesphere/pkg/client/listers/iam/v1alpha2" ) diff --git a/pkg/models/devops/devops.go b/pkg/models/devops/devops.go index 25db633f80..74dc55cfc4 100644 --- a/pkg/models/devops/devops.go +++ b/pkg/models/devops/devops.go @@ -38,10 +38,11 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/api/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/devops/s2ibinary_handler.go b/pkg/models/devops/s2ibinary_handler.go index ff17bc280d..be60b7ddf5 100644 --- a/pkg/models/devops/s2ibinary_handler.go +++ b/pkg/models/devops/s2ibinary_handler.go @@ -31,7 +31,8 @@ import ( "k8s.io/client-go/util/retry" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/simple/client/s3" diff --git a/pkg/models/devops/s2ibinary_handler_test.go b/pkg/models/devops/s2ibinary_handler_test.go index ae0655f094..aaeb7cdfb5 100644 --- a/pkg/models/devops/s2ibinary_handler_test.go +++ b/pkg/models/devops/s2ibinary_handler_test.go @@ -29,7 +29,8 @@ import ( "k8s.io/apimachinery/pkg/watch" clientgotesting "k8s.io/client-go/testing" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" fakeS3 "kubesphere.io/kubesphere/pkg/simple/client/s3/fake" diff --git a/pkg/models/iam/am/am.go b/pkg/models/iam/am/am.go index 24385db896..41a596ce57 100644 --- a/pkg/models/iam/am/am.go +++ b/pkg/models/iam/am/am.go @@ -29,9 +29,10 @@ import ( listersv1 "k8s.io/client-go/listers/core/v1" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" devopslisters "kubesphere.io/kubesphere/pkg/client/listers/devops/v1alpha3" diff --git a/pkg/models/iam/group/group.go b/pkg/models/iam/group/group.go index 532ecf4090..e249ca2758 100644 --- a/pkg/models/iam/group/group.go +++ b/pkg/models/iam/group/group.go @@ -30,9 +30,10 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/informers" diff --git a/pkg/models/iam/im/im.go b/pkg/models/iam/im/im.go index 4d646904cc..43874520e3 100644 --- a/pkg/models/iam/im/im.go +++ b/pkg/models/iam/im/im.go @@ -22,8 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options" "kubesphere.io/kubesphere/pkg/apiserver/query" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" diff --git a/pkg/models/kubeconfig/kubeconfig.go b/pkg/models/kubeconfig/kubeconfig.go index edff4e7beb..ae9aeb3eba 100644 --- a/pkg/models/kubeconfig/kubeconfig.go +++ b/pkg/models/kubeconfig/kubeconfig.go @@ -40,7 +40,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/pkiutil" diff --git a/pkg/models/monitoring/monitoring.go b/pkg/models/monitoring/monitoring.go index 9ea32b13cf..d8816166e4 100644 --- a/pkg/models/monitoring/monitoring.go +++ b/pkg/models/monitoring/monitoring.go @@ -31,7 +31,8 @@ import ( "sigs.k8s.io/application/api/v1beta1" appv1beta1 "sigs.k8s.io/application/api/v1beta1" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/models/notification/notification.go b/pkg/models/notification/notification.go index 7a75cbe85b..6c99d14317 100644 --- a/pkg/models/notification/notification.go +++ b/pkg/models/notification/notification.go @@ -13,8 +13,9 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog" + "kubesphere.io/api/notification/v2beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/models/openpitrix/applications.go b/pkg/models/openpitrix/applications.go index f9a8563300..3191f6990b 100644 --- a/pkg/models/openpitrix/applications.go +++ b/pkg/models/openpitrix/applications.go @@ -30,7 +30,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" v1alpha13 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/openpitrix/applicationversions.go b/pkg/models/openpitrix/applicationversions.go index 4671551f54..91554bf35a 100644 --- a/pkg/models/openpitrix/applicationversions.go +++ b/pkg/models/openpitrix/applicationversions.go @@ -41,7 +41,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/models" "kubesphere.io/kubesphere/pkg/server/params" diff --git a/pkg/models/openpitrix/attachments.go b/pkg/models/openpitrix/attachments.go index 799dfba4ef..39627c32ac 100644 --- a/pkg/models/openpitrix/attachments.go +++ b/pkg/models/openpitrix/attachments.go @@ -19,7 +19,8 @@ import ( "github.com/go-openapi/strfmt" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/simple/client/s3" "kubesphere.io/kubesphere/pkg/utils/idutils" ) diff --git a/pkg/models/openpitrix/categories.go b/pkg/models/openpitrix/categories.go index 2d5a35421b..9afddb966b 100644 --- a/pkg/models/openpitrix/categories.go +++ b/pkg/models/openpitrix/categories.go @@ -25,7 +25,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" typed_v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/openpitrix/interface.go b/pkg/models/openpitrix/interface.go index 3f6804490a..eb025f3212 100644 --- a/pkg/models/openpitrix/interface.go +++ b/pkg/models/openpitrix/interface.go @@ -23,7 +23,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" ks_informers "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/simple/client/s3" diff --git a/pkg/models/openpitrix/release.go b/pkg/models/openpitrix/release.go index 6902ef4c88..99eb2c01c6 100644 --- a/pkg/models/openpitrix/release.go +++ b/pkg/models/openpitrix/release.go @@ -35,7 +35,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" typed_v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/openpitrix/repo_test.go b/pkg/models/openpitrix/repo_test.go index d29ef8d8b5..c44fe5666b 100644 --- a/pkg/models/openpitrix/repo_test.go +++ b/pkg/models/openpitrix/repo_test.go @@ -24,7 +24,8 @@ import ( fakek8s "k8s.io/client-go/kubernetes/fake" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/informers" diff --git a/pkg/models/openpitrix/repos.go b/pkg/models/openpitrix/repos.go index fb55e3e1b0..849bf2ee51 100644 --- a/pkg/models/openpitrix/repos.go +++ b/pkg/models/openpitrix/repos.go @@ -30,7 +30,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/clientset/versioned" typed_v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/application/v1alpha1" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/openpitrix/utils.go b/pkg/models/openpitrix/utils.go index 576252973a..e848989ad0 100644 --- a/pkg/models/openpitrix/utils.go +++ b/pkg/models/openpitrix/utils.go @@ -30,7 +30,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/resource" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" diff --git a/pkg/models/openpitrix/v2alpha1/applications.go b/pkg/models/openpitrix/v2alpha1/applications.go index f556d54dca..efa7b89b67 100644 --- a/pkg/models/openpitrix/v2alpha1/applications.go +++ b/pkg/models/openpitrix/v2alpha1/applications.go @@ -18,8 +18,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/models/openpitrix/v2alpha1/applicationsversions.go b/pkg/models/openpitrix/v2alpha1/applicationsversions.go index 3ec746e8a7..65c38fa8fa 100644 --- a/pkg/models/openpitrix/v2alpha1/applicationsversions.go +++ b/pkg/models/openpitrix/v2alpha1/applicationsversions.go @@ -18,8 +18,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/constants" ) diff --git a/pkg/models/openpitrix/v2alpha1/categories.go b/pkg/models/openpitrix/v2alpha1/categories.go index f418e366f5..6eb2e3cb5b 100644 --- a/pkg/models/openpitrix/v2alpha1/categories.go +++ b/pkg/models/openpitrix/v2alpha1/categories.go @@ -16,8 +16,9 @@ package v2alpha1 import ( "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" resources "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/openpitrix/v2alpha1/release.go b/pkg/models/openpitrix/v2alpha1/release.go index 63a2a616a2..8426846af4 100644 --- a/pkg/models/openpitrix/v2alpha1/release.go +++ b/pkg/models/openpitrix/v2alpha1/release.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/models/openpitrix/v2alpha1/repos.go b/pkg/models/openpitrix/v2alpha1/repos.go index d622b95330..725d26ca6e 100644 --- a/pkg/models/openpitrix/v2alpha1/repos.go +++ b/pkg/models/openpitrix/v2alpha1/repos.go @@ -20,8 +20,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go b/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go index 257676f7a7..0693582819 100644 --- a/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go +++ b/pkg/models/resources/v1alpha2/s2buildertemplate/s2ibuildertemplate.go @@ -17,7 +17,8 @@ limitations under the License. package s2buildertemplate import ( - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" diff --git a/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go b/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go index b1b839e9df..64d7ca06df 100644 --- a/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go +++ b/pkg/models/resources/v1alpha2/s2ibuilder/s2ibuilder.go @@ -19,7 +19,8 @@ package s2ibuilder import ( "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" diff --git a/pkg/models/resources/v1alpha2/s2irun/s2irun.go b/pkg/models/resources/v1alpha2/s2irun/s2irun.go index 5459cc9bbf..9e88cac1aa 100644 --- a/pkg/models/resources/v1alpha2/s2irun/s2irun.go +++ b/pkg/models/resources/v1alpha2/s2irun/s2irun.go @@ -21,7 +21,8 @@ import ( "k8s.io/apimachinery/pkg/labels" - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" + "kubesphere.io/api/devops/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" "kubesphere.io/kubesphere/pkg/server/params" diff --git a/pkg/models/resources/v1alpha2/workspace/workspaces.go b/pkg/models/resources/v1alpha2/workspace/workspaces.go index c6c680630c..617dc4fd05 100644 --- a/pkg/models/resources/v1alpha2/workspace/workspaces.go +++ b/pkg/models/resources/v1alpha2/workspace/workspaces.go @@ -17,7 +17,8 @@ limitations under the License. package workspace import ( - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha2" diff --git a/pkg/models/resources/v1alpha3/cluster/clusters.go b/pkg/models/resources/v1alpha3/cluster/clusters.go index 4a9400efd6..c705676602 100644 --- a/pkg/models/resources/v1alpha3/cluster/clusters.go +++ b/pkg/models/resources/v1alpha3/cluster/clusters.go @@ -19,8 +19,9 @@ package cluster import ( "k8s.io/apimachinery/pkg/runtime" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/cluster/clusters_test.go b/pkg/models/resources/v1alpha3/cluster/clusters_test.go index 8c47b5207a..dd37dce878 100644 --- a/pkg/models/resources/v1alpha3/cluster/clusters_test.go +++ b/pkg/models/resources/v1alpha3/cluster/clusters_test.go @@ -23,8 +23,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go b/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go index c3fd2282e1..35292c0c3c 100644 --- a/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go +++ b/pkg/models/resources/v1alpha3/clusterrole/clusterroles.go @@ -25,8 +25,9 @@ import ( "k8s.io/client-go/informers" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" ) diff --git a/pkg/models/resources/v1alpha3/devops/devops.go b/pkg/models/resources/v1alpha3/devops/devops.go index d19a2901fb..378e082671 100644 --- a/pkg/models/resources/v1alpha3/devops/devops.go +++ b/pkg/models/resources/v1alpha3/devops/devops.go @@ -19,8 +19,9 @@ package devops import ( "k8s.io/apimachinery/pkg/runtime" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/api" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go b/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go index 0b86293c51..11349c4537 100644 --- a/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go +++ b/pkg/models/resources/v1alpha3/federatedapplication/federatedapplications.go @@ -19,8 +19,9 @@ package federatedapplication import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go b/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go index 499e08f3d3..799a74e683 100644 --- a/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go +++ b/pkg/models/resources/v1alpha3/federatedconfigmap/federatedconfigmaps.go @@ -19,8 +19,9 @@ package federatedconfigmap import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go b/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go index 2e1a1a5ee7..8176cdcb78 100644 --- a/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go +++ b/pkg/models/resources/v1alpha3/federateddeployment/federateddeployments.go @@ -19,8 +19,9 @@ package federateddeployment import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go b/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go index 396c0cf9d1..13ba1a1df0 100644 --- a/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go +++ b/pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go @@ -18,8 +18,9 @@ package federatedingress import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go b/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go index a1f5c65dd8..314c2f869d 100644 --- a/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go +++ b/pkg/models/resources/v1alpha3/federatednamespace/federatednamespaces.go @@ -19,8 +19,9 @@ package federatednamespace import ( "k8s.io/apimachinery/pkg/runtime" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go b/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go index 1f4d6b65e1..ba4ebc9129 100644 --- a/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go +++ b/pkg/models/resources/v1alpha3/federatedpersistentvolumeclaim/federatedpersistentvolumeclaims.go @@ -19,8 +19,9 @@ package federatedpersistentvolumeclaim import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go b/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go index 92cde11d56..e5c871eda8 100644 --- a/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go +++ b/pkg/models/resources/v1alpha3/federatedsecret/federatedsecret.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go b/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go index ab21751706..83b0f607cb 100644 --- a/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go +++ b/pkg/models/resources/v1alpha3/federatedservice/federatedservices.go @@ -19,8 +19,9 @@ package federatedservice import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go b/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go index 20cb028742..4f92782c28 100644 --- a/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go +++ b/pkg/models/resources/v1alpha3/federatedstatefulset/federatedstatefulsets.go @@ -19,8 +19,9 @@ package federatedstatefulset import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/globalrole/globalroles.go b/pkg/models/resources/v1alpha3/globalrole/globalroles.go index e59c64ff1f..eac8b4cd28 100644 --- a/pkg/models/resources/v1alpha3/globalrole/globalroles.go +++ b/pkg/models/resources/v1alpha3/globalrole/globalroles.go @@ -23,8 +23,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go b/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go index a756d02f36..0915378300 100644 --- a/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go +++ b/pkg/models/resources/v1alpha3/globalrole/globalroles_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go index c6216da53d..a3f84c577e 100644 --- a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go +++ b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings.go @@ -19,8 +19,9 @@ package globalrolebinding import ( "k8s.io/apimachinery/pkg/runtime" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go index 5ede15eff3..713a9ff242 100644 --- a/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go +++ b/pkg/models/resources/v1alpha3/globalrolebinding/globalrolebindings_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/group/group.go b/pkg/models/resources/v1alpha3/group/group.go index fe361705af..face3374e0 100644 --- a/pkg/models/resources/v1alpha3/group/group.go +++ b/pkg/models/resources/v1alpha3/group/group.go @@ -19,8 +19,9 @@ package group import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/group/group_test.go b/pkg/models/resources/v1alpha3/group/group_test.go index 2229c3b3ba..a390fc0bfe 100644 --- a/pkg/models/resources/v1alpha3/group/group_test.go +++ b/pkg/models/resources/v1alpha3/group/group_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go b/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go index c5b117358c..cf2a9c6532 100644 --- a/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go +++ b/pkg/models/resources/v1alpha3/groupbinding/groupbinding.go @@ -19,8 +19,9 @@ package groupbinding import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go b/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go index 61b29b1147..62b18f1984 100644 --- a/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go +++ b/pkg/models/resources/v1alpha3/groupbinding/groupbinding_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/ippool/ippools.go b/pkg/models/resources/v1alpha3/ippool/ippools.go index b6322251ae..0aa5d5e5f7 100644 --- a/pkg/models/resources/v1alpha3/ippool/ippools.go +++ b/pkg/models/resources/v1alpha3/ippool/ippools.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" k8sinformers "k8s.io/client-go/informers" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/models/resources/v1alpha3/ippool/ippools_test.go b/pkg/models/resources/v1alpha3/ippool/ippools_test.go index 2405259cc9..411df882b3 100644 --- a/pkg/models/resources/v1alpha3/ippool/ippools_test.go +++ b/pkg/models/resources/v1alpha3/ippool/ippools_test.go @@ -25,9 +25,10 @@ import ( k8sinformers "k8s.io/client-go/informers" k8sfake "k8s.io/client-go/kubernetes/fake" + "kubesphere.io/api/network/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go b/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go index 36c74e6881..3384f53e3b 100644 --- a/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go +++ b/pkg/models/resources/v1alpha3/loginrecord/loginrecords.go @@ -19,8 +19,9 @@ package loginrecord import ( "k8s.io/apimachinery/pkg/runtime" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go b/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go index 3f01d5cb7c..ea8ce337a1 100644 --- a/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go +++ b/pkg/models/resources/v1alpha3/loginrecord/loginrecords_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/notification/notification_test.go b/pkg/models/resources/v1alpha3/notification/notification_test.go index 828bbe9f39..9bcc2389e6 100644 --- a/pkg/models/resources/v1alpha3/notification/notification_test.go +++ b/pkg/models/resources/v1alpha3/notification/notification_test.go @@ -27,8 +27,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" + "kubesphere.io/api/notification/v2beta1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/openpitrix/application/applications.go b/pkg/models/resources/v1alpha3/openpitrix/application/applications.go index 3153c20ca5..6925f06338 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/application/applications.go +++ b/pkg/models/resources/v1alpha3/openpitrix/application/applications.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go b/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go index 4a0201c91a..33dee153b8 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go +++ b/pkg/models/resources/v1alpha3/openpitrix/applicationversion/applicationsversions.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/openpitrix/category/category.go b/pkg/models/resources/v1alpha3/openpitrix/category/category.go index 9fec3861f8..6687cc38c2 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/category/category.go +++ b/pkg/models/resources/v1alpha3/openpitrix/category/category.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go b/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go index 343533774b..dac37efa71 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go +++ b/pkg/models/resources/v1alpha3/openpitrix/helmrelease/releases.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go b/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go index 6236228fdb..c06a8a7df8 100644 --- a/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go +++ b/pkg/models/resources/v1alpha3/openpitrix/repo/repo.go @@ -21,8 +21,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/resource/resource.go b/pkg/models/resources/v1alpha3/resource/resource.go index 072eb1f3c5..fd5e400e4b 100644 --- a/pkg/models/resources/v1alpha3/resource/resource.go +++ b/pkg/models/resources/v1alpha3/resource/resource.go @@ -26,15 +26,16 @@ import ( monitoringdashboardv1alpha1 "kubesphere.io/monitoring-dashboard/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/cache" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + notificationv2beta1 "kubesphere.io/api/notification/v2beta1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - notificationv2beta1 "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/role/roles.go b/pkg/models/resources/v1alpha3/role/roles.go index 3cf69c46a2..ae23b07b37 100644 --- a/pkg/models/resources/v1alpha3/role/roles.go +++ b/pkg/models/resources/v1alpha3/role/roles.go @@ -25,8 +25,9 @@ import ( "k8s.io/client-go/informers" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" ) diff --git a/pkg/models/resources/v1alpha3/user/users.go b/pkg/models/resources/v1alpha3/user/users.go index 715303cadd..7a7251395b 100644 --- a/pkg/models/resources/v1alpha3/user/users.go +++ b/pkg/models/resources/v1alpha3/user/users.go @@ -23,9 +23,10 @@ import ( k8sinformers "k8s.io/client-go/informers" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/user/users_test.go b/pkg/models/resources/v1alpha3/user/users_test.go index 46ab0055f6..3226ce42e6 100644 --- a/pkg/models/resources/v1alpha3/user/users_test.go +++ b/pkg/models/resources/v1alpha3/user/users_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/workspace/workspaces.go b/pkg/models/resources/v1alpha3/workspace/workspaces.go index 08d3d72fe8..c733860de9 100644 --- a/pkg/models/resources/v1alpha3/workspace/workspaces.go +++ b/pkg/models/resources/v1alpha3/workspace/workspaces.go @@ -19,8 +19,9 @@ package workspace import ( "k8s.io/apimachinery/pkg/runtime" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/workspace/workspaces_test.go b/pkg/models/resources/v1alpha3/workspace/workspaces_test.go index 6c40d58e55..da14bc1286 100644 --- a/pkg/models/resources/v1alpha3/workspace/workspaces_test.go +++ b/pkg/models/resources/v1alpha3/workspace/workspaces_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go index 640d5f5df6..b2b65556f6 100644 --- a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go +++ b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles.go @@ -23,9 +23,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go index ffe1b36706..5a56df4416 100644 --- a/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go +++ b/pkg/models/resources/v1alpha3/workspacerole/workspaceroles_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go index fcfd076ae7..1191b8b5e0 100644 --- a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go +++ b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings.go @@ -19,8 +19,9 @@ package workspacerolebinding import ( "k8s.io/apimachinery/pkg/runtime" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go index 96dc6241da..9c95a431e8 100644 --- a/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go +++ b/pkg/models/resources/v1alpha3/workspacerolebinding/workspacerolebindings_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go index 78b44c1d13..45c6576d02 100644 --- a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go +++ b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates.go @@ -19,8 +19,9 @@ package workspacetemplate import ( "k8s.io/apimachinery/pkg/runtime" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3" diff --git a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go index 98ad3aedbb..2861747e8b 100644 --- a/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go +++ b/pkg/models/resources/v1alpha3/workspacetemplate/workspacetemplates_test.go @@ -22,8 +22,9 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" informers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" diff --git a/pkg/models/tenant/devops.go b/pkg/models/tenant/devops.go index c8447a50b1..24b541214b 100644 --- a/pkg/models/tenant/devops.go +++ b/pkg/models/tenant/devops.go @@ -25,9 +25,10 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + "kubesphere.io/kubesphere/pkg/api" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/models/tenant/metering.go b/pkg/models/tenant/metering.go index 25f2ab4dde..57da981fc7 100644 --- a/pkg/models/tenant/metering.go +++ b/pkg/models/tenant/metering.go @@ -19,9 +19,10 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" meteringv1alpha1 "kubesphere.io/kubesphere/pkg/api/metering/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/models/tenant/resourcequota.go b/pkg/models/tenant/resourcequota.go index e11c54df55..a0f72f0342 100644 --- a/pkg/models/tenant/resourcequota.go +++ b/pkg/models/tenant/resourcequota.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" ) func (t *tenantOperator) CreateWorkspaceResourceQuota(workspace string, quota *quotav1alpha2.ResourceQuota) (*quotav1alpha2.ResourceQuota, error) { diff --git a/pkg/models/tenant/tenant.go b/pkg/models/tenant/tenant.go index 1b4b6c19af..4ac9f96dce 100644 --- a/pkg/models/tenant/tenant.go +++ b/pkg/models/tenant/tenant.go @@ -36,16 +36,17 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + quotav1alpha2 "kubesphere.io/api/quota/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + typesv1beta1 "kubesphere.io/api/types/v1beta1" + "kubesphere.io/kubesphere/pkg/api" auditingv1alpha1 "kubesphere.io/kubesphere/pkg/api/auditing/v1alpha1" eventsv1alpha1 "kubesphere.io/kubesphere/pkg/api/events/v1alpha1" loggingv1alpha2 "kubesphere.io/kubesphere/pkg/api/logging/v1alpha2" meteringv1alpha1 "kubesphere.io/kubesphere/pkg/api/metering/v1alpha1" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - quotav1alpha2 "kubesphere.io/kubesphere/pkg/apis/quota/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - typesv1beta1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/request" diff --git a/pkg/models/tenant/tenent_test.go b/pkg/models/tenant/tenent_test.go index 2e2ac6654c..6fa83cc011 100644 --- a/pkg/models/tenant/tenent_test.go +++ b/pkg/models/tenant/tenent_test.go @@ -30,10 +30,11 @@ import ( "k8s.io/apiserver/pkg/authentication/user" fakek8s "k8s.io/client-go/kubernetes/fake" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/authorization/rbac" "kubesphere.io/kubesphere/pkg/apiserver/query" fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" diff --git a/pkg/simple/client/devops/fake/fakedevops.go b/pkg/simple/client/devops/fake/fakedevops.go index 25fa6b8309..06df70d649 100644 --- a/pkg/simple/client/devops/fake/fakedevops.go +++ b/pkg/simple/client/devops/fake/fakedevops.go @@ -26,7 +26,8 @@ import ( "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) diff --git a/pkg/simple/client/devops/jenkins/credential.go b/pkg/simple/client/devops/jenkins/credential.go index 4c0fd9637a..dc1fec01d7 100644 --- a/pkg/simple/client/devops/jenkins/credential.go +++ b/pkg/simple/client/devops/jenkins/credential.go @@ -23,7 +23,8 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) diff --git a/pkg/simple/client/devops/jenkins/internal/bitbucket.go b/pkg/simple/client/devops/jenkins/internal/bitbucket.go index a361ace24e..725b66d60c 100644 --- a/pkg/simple/client/devops/jenkins/internal/bitbucket.go +++ b/pkg/simple/client/devops/jenkins/internal/bitbucket.go @@ -7,7 +7,7 @@ import ( "github.com/beevik/etree" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" ) func AppendBitbucketServerSourceToEtree(source *etree.Element, gitSource *devopsv1alpha3.BitbucketServerSource) { diff --git a/pkg/simple/client/devops/jenkins/internal/git.go b/pkg/simple/client/devops/jenkins/internal/git.go index 48ca6f30d1..b07a3946e2 100644 --- a/pkg/simple/client/devops/jenkins/internal/git.go +++ b/pkg/simple/client/devops/jenkins/internal/git.go @@ -6,7 +6,7 @@ import ( "github.com/beevik/etree" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" ) func AppendGitSourceToEtree(source *etree.Element, gitSource *devopsv1alpha3.GitSource) { diff --git a/pkg/simple/client/devops/jenkins/internal/github.go b/pkg/simple/client/devops/jenkins/internal/github.go index 7b539b60aa..d2f43ee7a3 100644 --- a/pkg/simple/client/devops/jenkins/internal/github.go +++ b/pkg/simple/client/devops/jenkins/internal/github.go @@ -7,7 +7,7 @@ import ( "github.com/beevik/etree" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" ) func AppendGithubSourceToEtree(source *etree.Element, githubSource *devopsv1alpha3.GithubSource) { diff --git a/pkg/simple/client/devops/jenkins/internal/gitlab.go b/pkg/simple/client/devops/jenkins/internal/gitlab.go index 3a09d964e9..71e5e86ac0 100644 --- a/pkg/simple/client/devops/jenkins/internal/gitlab.go +++ b/pkg/simple/client/devops/jenkins/internal/gitlab.go @@ -7,7 +7,7 @@ import ( "github.com/beevik/etree" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" ) func AppendGitlabSourceToEtree(source *etree.Element, gitSource *devopsv1alpha3.GitlabSource) { diff --git a/pkg/simple/client/devops/jenkins/internal/svn.go b/pkg/simple/client/devops/jenkins/internal/svn.go index e4d2e8d894..c7b854d9ea 100644 --- a/pkg/simple/client/devops/jenkins/internal/svn.go +++ b/pkg/simple/client/devops/jenkins/internal/svn.go @@ -4,7 +4,7 @@ import ( "github.com/beevik/etree" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" ) func AppendSvnSourceToEtree(source *etree.Element, svnSource *devopsv1alpha3.SvnSource) { diff --git a/pkg/simple/client/devops/jenkins/pipeline_internal.go b/pkg/simple/client/devops/jenkins/pipeline_internal.go index 7e0d47fff2..f611b90177 100644 --- a/pkg/simple/client/devops/jenkins/pipeline_internal.go +++ b/pkg/simple/client/devops/jenkins/pipeline_internal.go @@ -24,7 +24,8 @@ import ( "github.com/beevik/etree" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins/internal" ) diff --git a/pkg/simple/client/devops/jenkins/pipeline_internal_test.go b/pkg/simple/client/devops/jenkins/pipeline_internal_test.go index 82b469f4e4..b0b496b284 100644 --- a/pkg/simple/client/devops/jenkins/pipeline_internal_test.go +++ b/pkg/simple/client/devops/jenkins/pipeline_internal_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" ) func Test_NoScmPipelineConfig(t *testing.T) { diff --git a/pkg/simple/client/devops/jenkins/project_pipeline.go b/pkg/simple/client/devops/jenkins/project_pipeline.go index 6b38a3e8cc..188a12213f 100644 --- a/pkg/simple/client/devops/jenkins/project_pipeline.go +++ b/pkg/simple/client/devops/jenkins/project_pipeline.go @@ -23,7 +23,8 @@ import ( "github.com/emicklei/go-restful" "k8s.io/klog" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/simple/client/devops" ) diff --git a/pkg/simple/client/devops/project_pipeline.go b/pkg/simple/client/devops/project_pipeline.go index 15fb4d6aae..00b2a0b8ea 100644 --- a/pkg/simple/client/devops/project_pipeline.go +++ b/pkg/simple/client/devops/project_pipeline.go @@ -16,7 +16,7 @@ limitations under the License. package devops -import "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" +import "kubesphere.io/api/devops/v1alpha3" type ProjectPipelineOperator interface { CreateProjectPipeline(projectId string, pipeline *v1alpha3.Pipeline) (string, error) diff --git a/pkg/simple/client/ldap/interface.go b/pkg/simple/client/ldap/interface.go index 805870af2a..7c5afcbd90 100644 --- a/pkg/simple/client/ldap/interface.go +++ b/pkg/simple/client/ldap/interface.go @@ -17,8 +17,9 @@ limitations under the License. package ldap import ( + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" ) diff --git a/pkg/simple/client/ldap/ldap.go b/pkg/simple/client/ldap/ldap.go index 0025f5bf6c..ece318de35 100644 --- a/pkg/simple/client/ldap/ldap.go +++ b/pkg/simple/client/ldap/ldap.go @@ -27,8 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/server/errors" ) diff --git a/pkg/simple/client/ldap/simple_ldap.go b/pkg/simple/client/ldap/simple_ldap.go index c80908c406..3b28bec12e 100644 --- a/pkg/simple/client/ldap/simple_ldap.go +++ b/pkg/simple/client/ldap/simple_ldap.go @@ -19,8 +19,9 @@ package ldap import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/pkg/api" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" "kubesphere.io/kubesphere/pkg/apiserver/query" ) diff --git a/pkg/simple/client/ldap/simple_ldap_test.go b/pkg/simple/client/ldap/simple_ldap_test.go index 76a203e632..7ca4ecad2a 100644 --- a/pkg/simple/client/ldap/simple_ldap_test.go +++ b/pkg/simple/client/ldap/simple_ldap_test.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" ) func TestSimpleLdap(t *testing.T) { diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go index 13af2667f4..5759d4919e 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go @@ -25,7 +25,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - crdcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + crdcalicov3 "kubesphere.io/api/network/calicov3" ) var scheme = runtime.NewScheme() diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go index d7fb09d8aa..04ea2eba27 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go @@ -25,7 +25,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - crdcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + crdcalicov3 "kubesphere.io/api/network/calicov3" ) var Scheme = runtime.NewScheme() diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go index 35aeeab661..c1c94a8f0f 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go @@ -27,7 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" + scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go index ccb50de147..99307cc1c6 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" ) // FakeBlockAffinities implements BlockAffinityInterface diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go index a85a856d02..c6d6a041bf 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" ) // FakeIPAMBlocks implements IPAMBlockInterface diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go index e948a4b250..fd460aeccc 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" ) // FakeIPPools implements IPPoolInterface diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go index d468734614..e34abed2de 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go @@ -27,7 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" + scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go index 8139643b60..fc737844fe 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go @@ -27,7 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" + scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go index 6583f18432..0477b42568 100644 --- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go +++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go @@ -21,7 +21,8 @@ package calicov3 import ( rest "k8s.io/client-go/rest" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" + "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme" ) diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go index a8600e1762..a76356d73a 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go index 2b4b49aaf1..6d00a20411 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go @@ -27,7 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + networkcalicov3 "kubesphere.io/api/network/calicov3" + versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces" calicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3" diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go index bb0e404e6b..446ff3923f 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go @@ -27,7 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + networkcalicov3 "kubesphere.io/api/network/calicov3" + versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces" calicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3" diff --git a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go index 083cf82b51..1d2453d3ae 100644 --- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go @@ -27,7 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + networkcalicov3 "kubesphere.io/api/network/calicov3" + versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned" internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces" calicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3" diff --git a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go index 72735a5cdf..7428270b78 100644 --- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go +++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" ) // BlockAffinityLister helps list BlockAffinities. diff --git a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go index c519f8d311..f15fc12f42 100644 --- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go +++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" ) // IPAMBlockLister helps list IPAMBlocks. diff --git a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go index 6b0fa075ac..17ee07418e 100644 --- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go +++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3" + calicov3 "kubesphere.io/api/network/calicov3" ) // IPPoolLister helps list IPPools. diff --git a/pkg/simple/client/network/ippool/calico/provider.go b/pkg/simple/client/network/ippool/calico/provider.go index 63591b271b..b886cc019a 100644 --- a/pkg/simple/client/network/ippool/calico/provider.go +++ b/pkg/simple/client/network/ippool/calico/provider.go @@ -44,8 +44,9 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "kubesphere.io/kubesphere/pkg/apis/network/calicov3" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/calicov3" + "kubesphere.io/api/network/v1alpha1" + kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" "kubesphere.io/kubesphere/pkg/constants" diff --git a/pkg/simple/client/network/ippool/calico/provider_test.go b/pkg/simple/client/network/ippool/calico/provider_test.go index 1f7fee1f0b..2ae647805b 100644 --- a/pkg/simple/client/network/ippool/calico/provider_test.go +++ b/pkg/simple/client/network/ippool/calico/provider_test.go @@ -20,14 +20,15 @@ import ( "flag" "testing" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/v1alpha1" + ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/constants" calicofake "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake" diff --git a/pkg/simple/client/network/ippool/ipam/interface.go b/pkg/simple/client/network/ippool/ipam/interface.go index 1de2d62476..a35448112f 100644 --- a/pkg/simple/client/network/ippool/ipam/interface.go +++ b/pkg/simple/client/network/ippool/ipam/interface.go @@ -19,7 +19,7 @@ package ipam import ( "github.com/containernetworking/cni/pkg/types/current" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/v1alpha1" ) // ipam.Interface has methods to perform IP address management. diff --git a/pkg/simple/client/network/ippool/ipam/ipam.go b/pkg/simple/client/network/ippool/ipam/ipam.go index 4bdb649075..aedb29eff8 100644 --- a/pkg/simple/client/network/ippool/ipam/ipam.go +++ b/pkg/simple/client/network/ippool/ipam/ipam.go @@ -35,7 +35,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/v1alpha1" + kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme" "kubesphere.io/kubesphere/pkg/simple/client/network/utils" diff --git a/pkg/simple/client/network/ippool/ipam/ipam_test.go b/pkg/simple/client/network/ippool/ipam/ipam_test.go index 9df13d8387..d82737a4b0 100644 --- a/pkg/simple/client/network/ippool/ipam/ipam_test.go +++ b/pkg/simple/client/network/ippool/ipam/ipam_test.go @@ -27,7 +27,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/v1alpha1" + ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" ) diff --git a/pkg/simple/client/network/ippool/provider.go b/pkg/simple/client/network/ippool/provider.go index a1b088154e..2a943b6045 100644 --- a/pkg/simple/client/network/ippool/provider.go +++ b/pkg/simple/client/network/ippool/provider.go @@ -23,7 +23,8 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/util/workqueue" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/simple/client/k8s" calicoclient "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico" diff --git a/pkg/simple/client/network/ippool/provider_test.go b/pkg/simple/client/network/ippool/provider_test.go index 72b6c80426..c0206f5818 100644 --- a/pkg/simple/client/network/ippool/provider_test.go +++ b/pkg/simple/client/network/ippool/provider_test.go @@ -22,7 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + "kubesphere.io/api/network/v1alpha1" + fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/ipam" ) diff --git a/pkg/simple/client/network/options.go b/pkg/simple/client/network/options.go index d71f127e99..04ff10dc46 100644 --- a/pkg/simple/client/network/options.go +++ b/pkg/simple/client/network/options.go @@ -19,7 +19,7 @@ package network import ( "github.com/spf13/pflag" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" ) type NSNPOptions struct { diff --git a/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go b/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go index 0a2d5e810b..b931356dab 100644 --- a/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go +++ b/pkg/simple/client/openpitrix/helmrepoindex/load_chart.go @@ -26,7 +26,8 @@ import ( "helm.sh/helm/v3/pkg/getter" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/simple/client/s3" ) diff --git a/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go b/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go index 96e7739886..e93f1afc2b 100644 --- a/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go +++ b/pkg/simple/client/openpitrix/helmrepoindex/repo_index.go @@ -32,7 +32,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/utils/idutils" ) diff --git a/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go b/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go index 71c805c691..420e889eef 100644 --- a/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go +++ b/pkg/simple/client/openpitrix/helmrepoindex/repo_index_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" ) func TestLoadRepo(t *testing.T) { diff --git a/pkg/utils/clusterclient/clusterclient.go b/pkg/utils/clusterclient/clusterclient.go index 224ce99d90..4cc4caaca3 100644 --- a/pkg/utils/clusterclient/clusterclient.go +++ b/pkg/utils/clusterclient/clusterclient.go @@ -28,7 +28,8 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/klog" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + clusterinformer "kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1" ) diff --git a/pkg/utils/k8sutil/k8sutil.go b/pkg/utils/k8sutil/k8sutil.go index 8b6e6b0661..c771002d43 100644 --- a/pkg/utils/k8sutil/k8sutil.go +++ b/pkg/utils/k8sutil/k8sutil.go @@ -19,8 +19,8 @@ package k8sutil import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) // IsControlledBy returns whether the ownerReferences contains the specified resource kind diff --git a/pkg/utils/k8sutil/k8sutil_test.go b/pkg/utils/k8sutil/k8sutil_test.go index 30472f07cd..2099115388 100644 --- a/pkg/utils/k8sutil/k8sutil_test.go +++ b/pkg/utils/k8sutil/k8sutil_test.go @@ -25,7 +25,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" ) func TestIsControlledBy(t *testing.T) { diff --git a/pkg/utils/reposcache/repo_cahes.go b/pkg/utils/reposcache/repo_cahes.go index ccdb1b4d48..d44e69756d 100644 --- a/pkg/utils/reposcache/repo_cahes.go +++ b/pkg/utils/reposcache/repo_cahes.go @@ -31,7 +31,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" + "kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/simple/client/openpitrix/helmrepoindex" ) diff --git a/staging/README.md b/staging/README.md index 7768b58cde..f9d354b7b9 100644 --- a/staging/README.md +++ b/staging/README.md @@ -7,6 +7,7 @@ top-level kubesphere.io repositories. Repositories currently staged here: - [`kubesphere.io/client-go`](https://github.com/kubesphere/client-go) +- [`kubesphere.io/api`](https://github.com/kubesphere/api) The code in the staging/ directory is authoritative, i.e. the only copy of the diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index ddd51301c9..0c1b20a9ba 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -15,6 +15,14 @@ rules: # name: release-3.1 # go: 1.13.15 +- destination: api + library: true + branches: + - source: + branch: master + dir: staging/src/kubesphere.io/api + name: master + smoke-test: | # assumes GO111MODULE=on go build ./... diff --git a/staging/src/kubesphere.io/api/CONTRIBUTING.md b/staging/src/kubesphere.io/api/CONTRIBUTING.md new file mode 100644 index 0000000000..b163e8e037 --- /dev/null +++ b/staging/src/kubesphere.io/api/CONTRIBUTING.md @@ -0,0 +1,3 @@ +# Guide + +This [document](https://github.com/kubesphere/community) walks you through how to get started contributing KubeSphere. diff --git a/staging/src/kubesphere.io/api/LICENSE b/staging/src/kubesphere.io/api/LICENSE new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/staging/src/kubesphere.io/api/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/staging/src/kubesphere.io/api/OWNERS b/staging/src/kubesphere.io/api/OWNERS new file mode 100644 index 0000000000..6b3c116d2e --- /dev/null +++ b/staging/src/kubesphere.io/api/OWNERS @@ -0,0 +1,16 @@ +approvers: + - zryfish #oncall + - rayzhou2017 + +reviewers: + - rayzhou2017 + - zryfish + - benjaminhuo + - calvinyv + - FeynmanZhou + - pixiake + - wansir + - zheng1 + - stoneshi-yunify + - linuxsuren + - RolandMa1986 diff --git a/staging/src/kubesphere.io/api/README.md b/staging/src/kubesphere.io/api/README.md new file mode 100644 index 0000000000..e7dedd317a --- /dev/null +++ b/staging/src/kubesphere.io/api/README.md @@ -0,0 +1,7 @@ +# api + +Schema of the external API types that are served by the KubeSphere API server. + +# Where does it come from? + +api is synced from https://github.com/kubesphere/kubesphere/blob/master/staging/src/kubesphere.io/api. Code changes are made in that location, merged into `kubesphere.io/api` and later synced here. \ No newline at end of file diff --git a/pkg/apis/application/OWNERS b/staging/src/kubesphere.io/api/application/OWNERS similarity index 100% rename from pkg/apis/application/OWNERS rename to staging/src/kubesphere.io/api/application/OWNERS diff --git a/pkg/apis/application/crdinstall/install.go b/staging/src/kubesphere.io/api/application/crdinstall/install.go similarity index 93% rename from pkg/apis/application/crdinstall/install.go rename to staging/src/kubesphere.io/api/application/crdinstall/install.go index 3437a16300..51207e33f8 100644 --- a/pkg/apis/application/crdinstall/install.go +++ b/staging/src/kubesphere.io/api/application/crdinstall/install.go @@ -20,7 +20,7 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" - "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" + "kubesphere.io/api/application/v1alpha1" ) func Install(scheme *k8sruntime.Scheme) { diff --git a/pkg/apis/application/group.go b/staging/src/kubesphere.io/api/application/group.go similarity index 100% rename from pkg/apis/application/group.go rename to staging/src/kubesphere.io/api/application/group.go diff --git a/pkg/apis/application/v1alpha1/constants.go b/staging/src/kubesphere.io/api/application/v1alpha1/constants.go similarity index 100% rename from pkg/apis/application/v1alpha1/constants.go rename to staging/src/kubesphere.io/api/application/v1alpha1/constants.go diff --git a/pkg/apis/application/v1alpha1/doc.go b/staging/src/kubesphere.io/api/application/v1alpha1/doc.go similarity index 100% rename from pkg/apis/application/v1alpha1/doc.go rename to staging/src/kubesphere.io/api/application/v1alpha1/doc.go diff --git a/pkg/apis/application/v1alpha1/helmapplication_types.go b/staging/src/kubesphere.io/api/application/v1alpha1/helmapplication_types.go similarity index 100% rename from pkg/apis/application/v1alpha1/helmapplication_types.go rename to staging/src/kubesphere.io/api/application/v1alpha1/helmapplication_types.go diff --git a/pkg/apis/application/v1alpha1/helmapplicationversion_types.go b/staging/src/kubesphere.io/api/application/v1alpha1/helmapplicationversion_types.go similarity index 100% rename from pkg/apis/application/v1alpha1/helmapplicationversion_types.go rename to staging/src/kubesphere.io/api/application/v1alpha1/helmapplicationversion_types.go diff --git a/pkg/apis/application/v1alpha1/helmcategory_types.go b/staging/src/kubesphere.io/api/application/v1alpha1/helmcategory_types.go similarity index 100% rename from pkg/apis/application/v1alpha1/helmcategory_types.go rename to staging/src/kubesphere.io/api/application/v1alpha1/helmcategory_types.go diff --git a/pkg/apis/application/v1alpha1/helmrelease_types.go b/staging/src/kubesphere.io/api/application/v1alpha1/helmrelease_types.go similarity index 100% rename from pkg/apis/application/v1alpha1/helmrelease_types.go rename to staging/src/kubesphere.io/api/application/v1alpha1/helmrelease_types.go diff --git a/pkg/apis/application/v1alpha1/helmrepo_types.go b/staging/src/kubesphere.io/api/application/v1alpha1/helmrepo_types.go similarity index 100% rename from pkg/apis/application/v1alpha1/helmrepo_types.go rename to staging/src/kubesphere.io/api/application/v1alpha1/helmrepo_types.go diff --git a/pkg/apis/application/v1alpha1/register.go b/staging/src/kubesphere.io/api/application/v1alpha1/register.go similarity index 100% rename from pkg/apis/application/v1alpha1/register.go rename to staging/src/kubesphere.io/api/application/v1alpha1/register.go diff --git a/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/application/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/application/v1alpha1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/application/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/auditing/group.go b/staging/src/kubesphere.io/api/auditing/group.go similarity index 100% rename from pkg/apis/auditing/group.go rename to staging/src/kubesphere.io/api/auditing/group.go diff --git a/pkg/apis/auditing/v1alpha1/doc.go b/staging/src/kubesphere.io/api/auditing/v1alpha1/doc.go similarity index 100% rename from pkg/apis/auditing/v1alpha1/doc.go rename to staging/src/kubesphere.io/api/auditing/v1alpha1/doc.go diff --git a/pkg/apis/auditing/v1alpha1/register.go b/staging/src/kubesphere.io/api/auditing/v1alpha1/register.go similarity index 100% rename from pkg/apis/auditing/v1alpha1/register.go rename to staging/src/kubesphere.io/api/auditing/v1alpha1/register.go diff --git a/pkg/apis/auditing/v1alpha1/rule_types.go b/staging/src/kubesphere.io/api/auditing/v1alpha1/rule_types.go similarity index 100% rename from pkg/apis/auditing/v1alpha1/rule_types.go rename to staging/src/kubesphere.io/api/auditing/v1alpha1/rule_types.go diff --git a/pkg/apis/auditing/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/auditing/v1alpha1/v1alpha1_suite_test.go similarity index 100% rename from pkg/apis/auditing/v1alpha1/v1alpha1_suite_test.go rename to staging/src/kubesphere.io/api/auditing/v1alpha1/v1alpha1_suite_test.go diff --git a/pkg/apis/auditing/v1alpha1/webhook_types.go b/staging/src/kubesphere.io/api/auditing/v1alpha1/webhook_types.go similarity index 100% rename from pkg/apis/auditing/v1alpha1/webhook_types.go rename to staging/src/kubesphere.io/api/auditing/v1alpha1/webhook_types.go diff --git a/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/auditing/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/auditing/v1alpha1/zz_generated.deepcopy.go index aab83f9d2d..2ab652e2e4 100644 --- a/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/kubesphere.io/api/auditing/v1alpha1/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1alpha1 import ( auditregistrationv1alpha1 "k8s.io/api/auditregistration/v1alpha1" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/cluster/group.go b/staging/src/kubesphere.io/api/cluster/group.go similarity index 100% rename from pkg/apis/cluster/group.go rename to staging/src/kubesphere.io/api/cluster/group.go diff --git a/pkg/apis/cluster/v1alpha1/cluster_types.go b/staging/src/kubesphere.io/api/cluster/v1alpha1/cluster_types.go similarity index 100% rename from pkg/apis/cluster/v1alpha1/cluster_types.go rename to staging/src/kubesphere.io/api/cluster/v1alpha1/cluster_types.go diff --git a/pkg/apis/cluster/v1alpha1/doc.go b/staging/src/kubesphere.io/api/cluster/v1alpha1/doc.go similarity index 92% rename from pkg/apis/cluster/v1alpha1/doc.go rename to staging/src/kubesphere.io/api/cluster/v1alpha1/doc.go index b9f45aeeca..4c691c0a18 100644 --- a/pkg/apis/cluster/v1alpha1/doc.go +++ b/staging/src/kubesphere.io/api/cluster/v1alpha1/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the tower v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/cluster +// +k8s:conversion-gen=kubesphere.io/api/cluster // +k8s:defaulter-gen=TypeMeta // +groupName=cluster.kubesphere.io diff --git a/pkg/apis/cluster/v1alpha1/openapi_generated.go b/staging/src/kubesphere.io/api/cluster/v1alpha1/openapi_generated.go similarity index 97% rename from pkg/apis/cluster/v1alpha1/openapi_generated.go rename to staging/src/kubesphere.io/api/cluster/v1alpha1/openapi_generated.go index 8886c25a16..c17c96400e 100644 --- a/pkg/apis/cluster/v1alpha1/openapi_generated.go +++ b/staging/src/kubesphere.io/api/cluster/v1alpha1/openapi_generated.go @@ -30,265 +30,265 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), - "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), - "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), - "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), - "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), - "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), - "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), - "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), - "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), - "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), - "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), - "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), - "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), - "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), - "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), - "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), - "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), - "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), - "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), - "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), - "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), - "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), - "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), - "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), - "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), - "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), - "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), - "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), - "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), - "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), - "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), - "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), - "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), - "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), - "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), - "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), - "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), - "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), - "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), - "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), - "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), - "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), - "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), - "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), - "k8s.io/api/core/v1.EphemeralContainers": schema_k8sio_api_core_v1_EphemeralContainers(ref), - "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), - "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), - "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), - "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), - "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), - "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), - "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), - "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), - "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), - "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), - "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), - "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), - "k8s.io/api/core/v1.Handler": schema_k8sio_api_core_v1_Handler(ref), - "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), - "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), - "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), - "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), - "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), - "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), - "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), - "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), - "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), - "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), - "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), - "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), - "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), - "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), - "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), - "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), - "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), - "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), - "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), - "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), - "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), - "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), - "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), - "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), - "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), - "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), - "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), - "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), - "k8s.io/api/core/v1.NodeResources": schema_k8sio_api_core_v1_NodeResources(ref), - "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), - "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), - "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), - "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), - "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), - "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), - "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), - "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), - "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), - "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), - "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), - "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), - "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), - "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), - "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), - "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), - "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), - "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), - "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), - "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), - "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), - "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), - "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), - "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), - "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), - "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), - "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), - "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), - "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), - "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), - "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), - "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), - "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), - "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), - "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), - "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), - "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), - "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), - "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), - "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), - "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), - "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), - "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), - "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), - "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), - "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), - "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), - "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), - "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), - "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), - "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), - "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), - "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), - "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), - "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), - "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), - "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), - "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), - "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), - "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), - "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), - "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), - "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), - "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), - "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), - "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), - "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), - "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), - "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), - "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), - "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), - "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), - "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), - "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), - "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), - "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), - "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), - "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), - "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), - "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), - "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), - "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), - "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), - "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), - "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), - "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), - "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), - "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), - "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), - "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), - "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), - "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), - "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), - "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), - "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.Cluster": schema_pkg_apis_cluster_v1alpha1_Cluster(ref), - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterCondition": schema_pkg_apis_cluster_v1alpha1_ClusterCondition(ref), - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterList": schema_pkg_apis_cluster_v1alpha1_ClusterList(ref), - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterSpec": schema_pkg_apis_cluster_v1alpha1_ClusterSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterStatus": schema_pkg_apis_cluster_v1alpha1_ClusterStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.Connection": schema_pkg_apis_cluster_v1alpha1_Connection(ref), + "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), + "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), + "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), + "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), + "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), + "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), + "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), + "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), + "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), + "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), + "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), + "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), + "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), + "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), + "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), + "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), + "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), + "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), + "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), + "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), + "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), + "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), + "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), + "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), + "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), + "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), + "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), + "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), + "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), + "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), + "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), + "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), + "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), + "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), + "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), + "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), + "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), + "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), + "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), + "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), + "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), + "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), + "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), + "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), + "k8s.io/api/core/v1.EphemeralContainers": schema_k8sio_api_core_v1_EphemeralContainers(ref), + "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), + "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), + "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), + "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), + "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), + "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), + "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), + "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), + "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), + "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), + "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), + "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), + "k8s.io/api/core/v1.Handler": schema_k8sio_api_core_v1_Handler(ref), + "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), + "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), + "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), + "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), + "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), + "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), + "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), + "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), + "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), + "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), + "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), + "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), + "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), + "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), + "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), + "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), + "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), + "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), + "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), + "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), + "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), + "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), + "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), + "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), + "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), + "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), + "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), + "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), + "k8s.io/api/core/v1.NodeResources": schema_k8sio_api_core_v1_NodeResources(ref), + "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), + "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), + "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), + "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), + "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), + "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), + "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), + "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), + "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), + "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), + "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), + "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), + "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), + "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), + "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), + "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), + "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), + "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), + "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), + "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), + "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), + "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), + "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), + "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), + "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), + "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), + "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), + "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), + "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), + "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), + "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), + "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), + "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), + "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), + "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), + "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), + "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), + "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), + "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), + "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), + "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), + "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), + "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), + "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), + "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), + "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), + "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), + "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), + "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), + "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), + "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), + "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), + "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), + "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), + "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), + "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), + "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), + "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), + "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), + "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), + "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), + "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), + "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), + "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), + "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), + "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), + "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), + "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), + "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), + "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), + "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), + "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), + "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), + "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), + "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), + "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), + "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), + "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), + "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), + "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), + "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), + "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), + "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), + "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), + "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), + "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), + "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), + "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), + "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), + "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), + "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), + "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), + "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), + "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), + "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "kubesphere.io/api/cluster/v1alpha1.Cluster": schema_pkg_apis_cluster_v1alpha1_Cluster(ref), + "kubesphere.io/api/cluster/v1alpha1.ClusterCondition": schema_pkg_apis_cluster_v1alpha1_ClusterCondition(ref), + "kubesphere.io/api/cluster/v1alpha1.ClusterList": schema_pkg_apis_cluster_v1alpha1_ClusterList(ref), + "kubesphere.io/api/cluster/v1alpha1.ClusterSpec": schema_pkg_apis_cluster_v1alpha1_ClusterSpec(ref), + "kubesphere.io/api/cluster/v1alpha1.ClusterStatus": schema_pkg_apis_cluster_v1alpha1_ClusterStatus(ref), + "kubesphere.io/api/cluster/v1alpha1.Connection": schema_pkg_apis_cluster_v1alpha1_Connection(ref), } } @@ -13334,19 +13334,19 @@ func schema_pkg_apis_cluster_v1alpha1_Cluster(ref common.ReferenceCallback) comm }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterSpec"), + Ref: ref("kubesphere.io/api/cluster/v1alpha1.ClusterSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterStatus"), + Ref: ref("kubesphere.io/api/cluster/v1alpha1.ClusterStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterSpec", "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/cluster/v1alpha1.ClusterSpec", "kubesphere.io/api/cluster/v1alpha1.ClusterStatus"}, } } @@ -13436,7 +13436,7 @@ func schema_pkg_apis_cluster_v1alpha1_ClusterList(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.Cluster"), + Ref: ref("kubesphere.io/api/cluster/v1alpha1.Cluster"), }, }, }, @@ -13447,7 +13447,7 @@ func schema_pkg_apis_cluster_v1alpha1_ClusterList(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.Cluster"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/cluster/v1alpha1.Cluster"}, } } @@ -13481,14 +13481,14 @@ func schema_pkg_apis_cluster_v1alpha1_ClusterSpec(ref common.ReferenceCallback) "connection": { SchemaProps: spec.SchemaProps{ Description: "Connection holds info to connect to the member cluster", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.Connection"), + Ref: ref("kubesphere.io/api/cluster/v1alpha1.Connection"), }, }, }, }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.Connection"}, + "kubesphere.io/api/cluster/v1alpha1.Connection"}, } } @@ -13505,7 +13505,7 @@ func schema_pkg_apis_cluster_v1alpha1_ClusterStatus(ref common.ReferenceCallback Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterCondition"), + Ref: ref("kubesphere.io/api/cluster/v1alpha1.ClusterCondition"), }, }, }, @@ -13565,7 +13565,7 @@ func schema_pkg_apis_cluster_v1alpha1_ClusterStatus(ref common.ReferenceCallback }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1.ClusterCondition"}, + "kubesphere.io/api/cluster/v1alpha1.ClusterCondition"}, } } diff --git a/pkg/apis/cluster/v1alpha1/register.go b/staging/src/kubesphere.io/api/cluster/v1alpha1/register.go similarity index 100% rename from pkg/apis/cluster/v1alpha1/register.go rename to staging/src/kubesphere.io/api/cluster/v1alpha1/register.go diff --git a/pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/cluster/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/cluster/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/devops/OWNERS b/staging/src/kubesphere.io/api/devops/OWNERS similarity index 100% rename from pkg/apis/devops/OWNERS rename to staging/src/kubesphere.io/api/devops/OWNERS diff --git a/pkg/apis/devops/crdinstall/install.go b/staging/src/kubesphere.io/api/devops/crdinstall/install.go similarity index 87% rename from pkg/apis/devops/crdinstall/install.go rename to staging/src/kubesphere.io/api/devops/crdinstall/install.go index 91f27a277e..e5bd82dd5e 100644 --- a/pkg/apis/devops/crdinstall/install.go +++ b/staging/src/kubesphere.io/api/devops/crdinstall/install.go @@ -20,8 +20,8 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" ) func Install(scheme *k8sruntime.Scheme) { diff --git a/pkg/apis/devops/group.go b/staging/src/kubesphere.io/api/devops/group.go similarity index 100% rename from pkg/apis/devops/group.go rename to staging/src/kubesphere.io/api/devops/group.go diff --git a/pkg/apis/devops/v1alpha1/doc.go b/staging/src/kubesphere.io/api/devops/v1alpha1/doc.go similarity index 92% rename from pkg/apis/devops/v1alpha1/doc.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/doc.go index 2d39cf7c5d..edab8bea8f 100644 --- a/pkg/apis/devops/v1alpha1/doc.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the devops v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/devops +// +k8s:conversion-gen=kubesphere.io/api/devops // +k8s:defaulter-gen=TypeMeta // +groupName=devops.kubesphere.io package v1alpha1 diff --git a/pkg/apis/devops/v1alpha1/openapi_generated.go b/staging/src/kubesphere.io/api/devops/v1alpha1/openapi_generated.go similarity index 96% rename from pkg/apis/devops/v1alpha1/openapi_generated.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/openapi_generated.go index 490ee5b68e..38985398ad 100644 --- a/pkg/apis/devops/v1alpha1/openapi_generated.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/openapi_generated.go @@ -30,291 +30,291 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), - "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), - "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), - "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), - "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), - "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), - "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), - "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), - "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), - "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), - "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), - "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), - "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), - "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), - "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), - "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), - "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), - "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), - "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), - "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), - "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), - "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), - "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), - "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), - "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), - "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), - "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), - "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), - "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), - "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), - "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), - "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), - "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), - "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), - "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), - "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), - "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), - "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), - "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), - "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), - "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), - "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), - "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), - "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), - "k8s.io/api/core/v1.EphemeralContainers": schema_k8sio_api_core_v1_EphemeralContainers(ref), - "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), - "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), - "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), - "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), - "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), - "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), - "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), - "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), - "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), - "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), - "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), - "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), - "k8s.io/api/core/v1.Handler": schema_k8sio_api_core_v1_Handler(ref), - "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), - "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), - "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), - "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), - "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), - "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), - "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), - "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), - "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), - "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), - "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), - "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), - "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), - "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), - "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), - "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), - "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), - "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), - "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), - "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), - "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), - "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), - "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), - "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), - "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), - "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), - "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), - "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), - "k8s.io/api/core/v1.NodeResources": schema_k8sio_api_core_v1_NodeResources(ref), - "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), - "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), - "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), - "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), - "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), - "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), - "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), - "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), - "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), - "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), - "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), - "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), - "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), - "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), - "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), - "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), - "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), - "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), - "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), - "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), - "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), - "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), - "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), - "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), - "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), - "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), - "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), - "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), - "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), - "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), - "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), - "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), - "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), - "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), - "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), - "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), - "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), - "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), - "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), - "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), - "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), - "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), - "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), - "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), - "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), - "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), - "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), - "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), - "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), - "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), - "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), - "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), - "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), - "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), - "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), - "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), - "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), - "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), - "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), - "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), - "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), - "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), - "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), - "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), - "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), - "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), - "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), - "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), - "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), - "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), - "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), - "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), - "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), - "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), - "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), - "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), - "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), - "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), - "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), - "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), - "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), - "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), - "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), - "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), - "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), - "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), - "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), - "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), - "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), - "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), - "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), - "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), - "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), - "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), - "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.AuthConfig": schema_pkg_apis_devops_v1alpha1_AuthConfig(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.CGroupLimits": schema_pkg_apis_devops_v1alpha1_CGroupLimits(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.ContainerConfig": schema_pkg_apis_devops_v1alpha1_ContainerConfig(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.ContainerInfo": schema_pkg_apis_devops_v1alpha1_ContainerInfo(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.DockerConfig": schema_pkg_apis_devops_v1alpha1_DockerConfig(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.DockerConfigEntry": schema_pkg_apis_devops_v1alpha1_DockerConfigEntry(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.DockerConfigJson": schema_pkg_apis_devops_v1alpha1_DockerConfigJson(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.EnvironmentSpec": schema_pkg_apis_devops_v1alpha1_EnvironmentSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.Parameter": schema_pkg_apis_devops_v1alpha1_Parameter(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.ProxyConfig": schema_pkg_apis_devops_v1alpha1_ProxyConfig(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iAutoScale": schema_pkg_apis_devops_v1alpha1_S2iAutoScale(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinary": schema_pkg_apis_devops_v1alpha1_S2iBinary(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinaryList": schema_pkg_apis_devops_v1alpha1_S2iBinaryList(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinarySpec": schema_pkg_apis_devops_v1alpha1_S2iBinarySpec(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinaryStatus": schema_pkg_apis_devops_v1alpha1_S2iBinaryStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuildResult": schema_pkg_apis_devops_v1alpha1_S2iBuildResult(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuildSource": schema_pkg_apis_devops_v1alpha1_S2iBuildSource(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilder": schema_pkg_apis_devops_v1alpha1_S2iBuilder(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderList": schema_pkg_apis_devops_v1alpha1_S2iBuilderList(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderSpec": schema_pkg_apis_devops_v1alpha1_S2iBuilderSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderStatus": schema_pkg_apis_devops_v1alpha1_S2iBuilderStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplate": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplate(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplateList": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateList(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplateSpec": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplateStatus": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iConfig": schema_pkg_apis_devops_v1alpha1_S2iConfig(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRun": schema_pkg_apis_devops_v1alpha1_S2iRun(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRunList": schema_pkg_apis_devops_v1alpha1_S2iRunList(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRunSpec": schema_pkg_apis_devops_v1alpha1_S2iRunSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRunStatus": schema_pkg_apis_devops_v1alpha1_S2iRunStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.UserDefineTemplate": schema_pkg_apis_devops_v1alpha1_UserDefineTemplate(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.VolumeSpec": schema_pkg_apis_devops_v1alpha1_VolumeSpec(ref), + "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), + "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), + "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), + "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), + "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), + "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), + "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), + "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), + "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), + "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), + "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), + "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), + "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), + "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), + "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), + "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), + "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), + "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), + "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), + "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), + "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), + "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), + "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), + "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), + "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), + "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), + "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), + "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), + "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), + "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), + "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), + "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), + "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), + "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), + "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), + "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), + "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), + "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), + "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), + "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), + "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), + "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), + "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), + "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), + "k8s.io/api/core/v1.EphemeralContainers": schema_k8sio_api_core_v1_EphemeralContainers(ref), + "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), + "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), + "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), + "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), + "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), + "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), + "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), + "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), + "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), + "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), + "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), + "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), + "k8s.io/api/core/v1.Handler": schema_k8sio_api_core_v1_Handler(ref), + "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), + "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), + "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), + "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), + "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), + "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), + "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), + "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), + "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), + "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), + "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), + "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), + "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), + "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), + "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), + "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), + "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), + "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), + "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), + "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), + "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), + "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), + "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), + "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), + "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), + "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), + "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), + "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), + "k8s.io/api/core/v1.NodeResources": schema_k8sio_api_core_v1_NodeResources(ref), + "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), + "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), + "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), + "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), + "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), + "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), + "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), + "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), + "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), + "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), + "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), + "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), + "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), + "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), + "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), + "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), + "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), + "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), + "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), + "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), + "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), + "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), + "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), + "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), + "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), + "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), + "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), + "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), + "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), + "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), + "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), + "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), + "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), + "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), + "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), + "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), + "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), + "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), + "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), + "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), + "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), + "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), + "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), + "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), + "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), + "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), + "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), + "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), + "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), + "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), + "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), + "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), + "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), + "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), + "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), + "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), + "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), + "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), + "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), + "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), + "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), + "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), + "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), + "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), + "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), + "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), + "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), + "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), + "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), + "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), + "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), + "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), + "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), + "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), + "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), + "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), + "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), + "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), + "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), + "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), + "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), + "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), + "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), + "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), + "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), + "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), + "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), + "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), + "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), + "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), + "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), + "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), + "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), + "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), + "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "kubesphere.io/api/devops/v1alpha1.AuthConfig": schema_pkg_apis_devops_v1alpha1_AuthConfig(ref), + "kubesphere.io/api/devops/v1alpha1.CGroupLimits": schema_pkg_apis_devops_v1alpha1_CGroupLimits(ref), + "kubesphere.io/api/devops/v1alpha1.ContainerConfig": schema_pkg_apis_devops_v1alpha1_ContainerConfig(ref), + "kubesphere.io/api/devops/v1alpha1.ContainerInfo": schema_pkg_apis_devops_v1alpha1_ContainerInfo(ref), + "kubesphere.io/api/devops/v1alpha1.DockerConfig": schema_pkg_apis_devops_v1alpha1_DockerConfig(ref), + "kubesphere.io/api/devops/v1alpha1.DockerConfigEntry": schema_pkg_apis_devops_v1alpha1_DockerConfigEntry(ref), + "kubesphere.io/api/devops/v1alpha1.DockerConfigJson": schema_pkg_apis_devops_v1alpha1_DockerConfigJson(ref), + "kubesphere.io/api/devops/v1alpha1.EnvironmentSpec": schema_pkg_apis_devops_v1alpha1_EnvironmentSpec(ref), + "kubesphere.io/api/devops/v1alpha1.Parameter": schema_pkg_apis_devops_v1alpha1_Parameter(ref), + "kubesphere.io/api/devops/v1alpha1.ProxyConfig": schema_pkg_apis_devops_v1alpha1_ProxyConfig(ref), + "kubesphere.io/api/devops/v1alpha1.S2iAutoScale": schema_pkg_apis_devops_v1alpha1_S2iAutoScale(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBinary": schema_pkg_apis_devops_v1alpha1_S2iBinary(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBinaryList": schema_pkg_apis_devops_v1alpha1_S2iBinaryList(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBinarySpec": schema_pkg_apis_devops_v1alpha1_S2iBinarySpec(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBinaryStatus": schema_pkg_apis_devops_v1alpha1_S2iBinaryStatus(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuildResult": schema_pkg_apis_devops_v1alpha1_S2iBuildResult(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuildSource": schema_pkg_apis_devops_v1alpha1_S2iBuildSource(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilder": schema_pkg_apis_devops_v1alpha1_S2iBuilder(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilderList": schema_pkg_apis_devops_v1alpha1_S2iBuilderList(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilderSpec": schema_pkg_apis_devops_v1alpha1_S2iBuilderSpec(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilderStatus": schema_pkg_apis_devops_v1alpha1_S2iBuilderStatus(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplate": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplate(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplateList": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateList(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplateSpec": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateSpec(ref), + "kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplateStatus": schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateStatus(ref), + "kubesphere.io/api/devops/v1alpha1.S2iConfig": schema_pkg_apis_devops_v1alpha1_S2iConfig(ref), + "kubesphere.io/api/devops/v1alpha1.S2iRun": schema_pkg_apis_devops_v1alpha1_S2iRun(ref), + "kubesphere.io/api/devops/v1alpha1.S2iRunList": schema_pkg_apis_devops_v1alpha1_S2iRunList(ref), + "kubesphere.io/api/devops/v1alpha1.S2iRunSpec": schema_pkg_apis_devops_v1alpha1_S2iRunSpec(ref), + "kubesphere.io/api/devops/v1alpha1.S2iRunStatus": schema_pkg_apis_devops_v1alpha1_S2iRunStatus(ref), + "kubesphere.io/api/devops/v1alpha1.UserDefineTemplate": schema_pkg_apis_devops_v1alpha1_UserDefineTemplate(ref), + "kubesphere.io/api/devops/v1alpha1.VolumeSpec": schema_pkg_apis_devops_v1alpha1_VolumeSpec(ref), } } @@ -13492,7 +13492,7 @@ func schema_pkg_apis_devops_v1alpha1_ContainerInfo(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.VolumeSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.VolumeSpec"), }, }, }, @@ -13516,7 +13516,7 @@ func schema_pkg_apis_devops_v1alpha1_ContainerInfo(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.VolumeSpec"}, + "kubesphere.io/api/devops/v1alpha1.VolumeSpec"}, } } @@ -13626,7 +13626,7 @@ func schema_pkg_apis_devops_v1alpha1_DockerConfigJson(ref common.ReferenceCallba Allows: true, Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.DockerConfigEntry"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.DockerConfigEntry"), }, }, }, @@ -13637,7 +13637,7 @@ func schema_pkg_apis_devops_v1alpha1_DockerConfigJson(ref common.ReferenceCallba }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.DockerConfigEntry"}, + "kubesphere.io/api/devops/v1alpha1.DockerConfigEntry"}, } } @@ -13825,19 +13825,19 @@ func schema_pkg_apis_devops_v1alpha1_S2iBinary(ref common.ReferenceCallback) com }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinarySpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBinarySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinaryStatus"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBinaryStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinarySpec", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinaryStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/devops/v1alpha1.S2iBinarySpec", "kubesphere.io/api/devops/v1alpha1.S2iBinaryStatus"}, } } @@ -13873,7 +13873,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBinaryList(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinary"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBinary"), }, }, }, @@ -13884,7 +13884,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBinaryList(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBinary"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/devops/v1alpha1.S2iBinary"}, } } @@ -14121,19 +14121,19 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilder(ref common.ReferenceCallback) co }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuilderSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderStatus"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuilderStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderSpec", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/devops/v1alpha1.S2iBuilderSpec", "kubesphere.io/api/devops/v1alpha1.S2iBuilderStatus"}, } } @@ -14169,7 +14169,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderList(ref common.ReferenceCallback Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilder"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuilder"), }, }, }, @@ -14180,7 +14180,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderList(ref common.ReferenceCallback }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilder"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/devops/v1alpha1.S2iBuilder"}, } } @@ -14194,20 +14194,20 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderSpec(ref common.ReferenceCallback "config": { SchemaProps: spec.SchemaProps{ Description: "INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run \"make\" to regenerate code after modifying this file", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iConfig"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iConfig"), }, }, "fromTemplate": { SchemaProps: spec.SchemaProps{ Description: "FromTemplate define some inputs from user", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.UserDefineTemplate"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.UserDefineTemplate"), }, }, }, }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iConfig", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.UserDefineTemplate"}, + "kubesphere.io/api/devops/v1alpha1.S2iConfig", "kubesphere.io/api/devops/v1alpha1.UserDefineTemplate"}, } } @@ -14282,19 +14282,19 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplate(ref common.ReferenceCall }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplateSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplateSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplateStatus"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplateStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplateSpec", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplateStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplateSpec", "kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplateStatus"}, } } @@ -14330,7 +14330,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateList(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplate"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplate"), }, }, }, @@ -14341,7 +14341,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateList(ref common.Reference }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuilderTemplate"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/devops/v1alpha1.S2iBuilderTemplate"}, } } @@ -14366,7 +14366,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateSpec(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.ContainerInfo"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.ContainerInfo"), }, }, }, @@ -14386,7 +14386,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateSpec(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.Parameter"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.Parameter"), }, }, }, @@ -14417,7 +14417,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iBuilderTemplateSpec(ref common.Reference }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.ContainerInfo", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.Parameter"}, + "kubesphere.io/api/devops/v1alpha1.ContainerInfo", "kubesphere.io/api/devops/v1alpha1.Parameter"}, } } @@ -14497,7 +14497,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com "runtimeAuthentication": { SchemaProps: spec.SchemaProps{ Description: "RuntimeAuthentication holds the authentication information for pulling the runtime Docker images from private repositories.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.AuthConfig"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.AuthConfig"), }, }, "runtimeArtifacts": { @@ -14507,7 +14507,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.VolumeSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.VolumeSpec"), }, }, }, @@ -14516,25 +14516,25 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com "dockerConfig": { SchemaProps: spec.SchemaProps{ Description: "DockerConfig describes how to access host docker daemon.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.DockerConfig"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.DockerConfig"), }, }, "pullAuthentication": { SchemaProps: spec.SchemaProps{ Description: "PullAuthentication holds the authentication information for pulling the Docker images from private repositories", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.AuthConfig"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.AuthConfig"), }, }, "pushAuthentication": { SchemaProps: spec.SchemaProps{ Description: "PullAuthentication holds the authentication information for pulling the Docker images from private repositories", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.AuthConfig"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.AuthConfig"), }, }, "incrementalAuthentication": { SchemaProps: spec.SchemaProps{ Description: "IncrementalAuthentication holds the authentication information for pulling the previous image from private repositories", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.AuthConfig"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.AuthConfig"), }, }, "dockerNetworkMode": { @@ -14607,7 +14607,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.EnvironmentSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.EnvironmentSpec"), }, }, }, @@ -14697,7 +14697,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.VolumeSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.VolumeSpec"), }, }, }, @@ -14706,7 +14706,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com "cgroupLimits": { SchemaProps: spec.SchemaProps{ Description: "CGroupLimits describes the cgroups limits that will be applied to any containers run by s2i.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.CGroupLimits"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.CGroupLimits"), }, }, "dropCapabilities": { @@ -14726,7 +14726,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com "scriptDownloadProxyConfig": { SchemaProps: spec.SchemaProps{ Description: "ScriptDownloadProxyConfig optionally specifies the http and https proxy to use when downloading scripts", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.ProxyConfig"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.ProxyConfig"), }, }, "excludeRegExp": { @@ -14923,7 +14923,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com }, }, Dependencies: []string{ - "k8s.io/api/core/v1.LocalObjectReference", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.AuthConfig", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.CGroupLimits", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.DockerConfig", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.EnvironmentSpec", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.ProxyConfig", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.VolumeSpec"}, + "k8s.io/api/core/v1.LocalObjectReference", "kubesphere.io/api/devops/v1alpha1.AuthConfig", "kubesphere.io/api/devops/v1alpha1.CGroupLimits", "kubesphere.io/api/devops/v1alpha1.DockerConfig", "kubesphere.io/api/devops/v1alpha1.EnvironmentSpec", "kubesphere.io/api/devops/v1alpha1.ProxyConfig", "kubesphere.io/api/devops/v1alpha1.VolumeSpec"}, } } @@ -14955,19 +14955,19 @@ func schema_pkg_apis_devops_v1alpha1_S2iRun(ref common.ReferenceCallback) common }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRunSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iRunSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRunStatus"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iRunStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRunSpec", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRunStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/devops/v1alpha1.S2iRunSpec", "kubesphere.io/api/devops/v1alpha1.S2iRunStatus"}, } } @@ -15003,7 +15003,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iRunList(ref common.ReferenceCallback) co Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRun"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iRun"), }, }, }, @@ -15014,7 +15014,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iRunList(ref common.ReferenceCallback) co }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iRun"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/devops/v1alpha1.S2iRun"}, } } @@ -15117,20 +15117,20 @@ func schema_pkg_apis_devops_v1alpha1_S2iRunStatus(ref common.ReferenceCallback) "s2iBuildResult": { SchemaProps: spec.SchemaProps{ Description: "S2i build result info.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuildResult"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuildResult"), }, }, "s2iBuildSource": { SchemaProps: spec.SchemaProps{ Description: "S2i build source info.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuildSource"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.S2iBuildSource"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Time", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuildResult", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.S2iBuildSource"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.Time", "kubesphere.io/api/devops/v1alpha1.S2iBuildResult", "kubesphere.io/api/devops/v1alpha1.S2iBuildSource"}, } } @@ -15154,7 +15154,7 @@ func schema_pkg_apis_devops_v1alpha1_UserDefineTemplate(ref common.ReferenceCall Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.Parameter"), + Ref: ref("kubesphere.io/api/devops/v1alpha1.Parameter"), }, }, }, @@ -15171,7 +15171,7 @@ func schema_pkg_apis_devops_v1alpha1_UserDefineTemplate(ref common.ReferenceCall }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1.Parameter"}, + "kubesphere.io/api/devops/v1alpha1.Parameter"}, } } diff --git a/pkg/apis/devops/v1alpha1/register.go b/staging/src/kubesphere.io/api/devops/v1alpha1/register.go similarity index 95% rename from pkg/apis/devops/v1alpha1/register.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/register.go index 5c06d617e2..14022aa775 100644 --- a/pkg/apis/devops/v1alpha1/register.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the devops v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/devops +// +k8s:conversion-gen=kubesphere.io/api/devops // +k8s:defaulter-gen=TypeMeta // +groupName=devops.kubesphere.io package v1alpha1 diff --git a/pkg/apis/devops/v1alpha1/s2ibinary_types.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2ibinary_types.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types.go diff --git a/pkg/apis/devops/v1alpha1/s2ibinary_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types_test.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2ibinary_types_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types_test.go diff --git a/pkg/apis/devops/v1alpha1/s2ibuilder_types.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2ibuilder_types.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types.go diff --git a/pkg/apis/devops/v1alpha1/s2ibuilder_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types_test.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2ibuilder_types_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types_test.go diff --git a/pkg/apis/devops/v1alpha1/s2ibuildertemplate_types.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2ibuildertemplate_types.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types.go diff --git a/pkg/apis/devops/v1alpha1/s2ibuildertemplate_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types_test.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2ibuildertemplate_types_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types_test.go diff --git a/pkg/apis/devops/v1alpha1/s2irun_types.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2irun_types.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types.go diff --git a/pkg/apis/devops/v1alpha1/s2irun_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types_test.go similarity index 100% rename from pkg/apis/devops/v1alpha1/s2irun_types_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types_test.go diff --git a/pkg/apis/devops/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/v1alpha1_suite_test.go similarity index 100% rename from pkg/apis/devops/v1alpha1/v1alpha1_suite_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/v1alpha1_suite_test.go diff --git a/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/devops/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/devops/v1alpha1/zz_generated.deepcopy.go index 00f90c63ff..64e01c809e 100644 --- a/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/devops/v1alpha3/credential_types.go b/staging/src/kubesphere.io/api/devops/v1alpha3/credential_types.go similarity index 100% rename from pkg/apis/devops/v1alpha3/credential_types.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/credential_types.go diff --git a/pkg/apis/devops/v1alpha3/devopsproject_types.go b/staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types.go similarity index 100% rename from pkg/apis/devops/v1alpha3/devopsproject_types.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types.go diff --git a/pkg/apis/devops/v1alpha3/devopsproject_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types_test.go similarity index 100% rename from pkg/apis/devops/v1alpha3/devopsproject_types_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types_test.go diff --git a/pkg/apis/devops/v1alpha3/doc.go b/staging/src/kubesphere.io/api/devops/v1alpha3/doc.go similarity index 92% rename from pkg/apis/devops/v1alpha3/doc.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/doc.go index e4a49d1f94..6dc3f9deed 100644 --- a/pkg/apis/devops/v1alpha3/doc.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha3/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha3 contains API Schema definitions for the devops v1alpha3 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/devops +// +k8s:conversion-gen=kubesphere.io/api/devops // +k8s:defaulter-gen=TypeMeta // +groupName=devops.kubesphere.io package v1alpha3 diff --git a/pkg/apis/devops/v1alpha3/openapi_generated.go b/staging/src/kubesphere.io/api/devops/v1alpha3/openapi_generated.go similarity index 93% rename from pkg/apis/devops/v1alpha3/openapi_generated.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/openapi_generated.go index 76b4cdcdc1..a2a1feec1c 100644 --- a/pkg/apis/devops/v1alpha3/openapi_generated.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha3/openapi_generated.go @@ -30,78 +30,78 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.BitbucketServerSource": schema_pkg_apis_devops_v1alpha3_BitbucketServerSource(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProject": schema_pkg_apis_devops_v1alpha3_DevOpsProject(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProjectList": schema_pkg_apis_devops_v1alpha3_DevOpsProjectList(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProjectSpec": schema_pkg_apis_devops_v1alpha3_DevOpsProjectSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProjectStatus": schema_pkg_apis_devops_v1alpha3_DevOpsProjectStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscarderProperty": schema_pkg_apis_devops_v1alpha3_DiscarderProperty(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscoverPRFromForks": schema_pkg_apis_devops_v1alpha3_DiscoverPRFromForks(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitCloneOption": schema_pkg_apis_devops_v1alpha3_GitCloneOption(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitSource": schema_pkg_apis_devops_v1alpha3_GitSource(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GithubSource": schema_pkg_apis_devops_v1alpha3_GithubSource(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.MultiBranchJobTrigger": schema_pkg_apis_devops_v1alpha3_MultiBranchJobTrigger(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.MultiBranchPipeline": schema_pkg_apis_devops_v1alpha3_MultiBranchPipeline(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.NoScmPipeline": schema_pkg_apis_devops_v1alpha3_NoScmPipeline(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.Parameter": schema_pkg_apis_devops_v1alpha3_Parameter(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.Pipeline": schema_pkg_apis_devops_v1alpha3_Pipeline(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.PipelineList": schema_pkg_apis_devops_v1alpha3_PipelineList(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.PipelineSpec": schema_pkg_apis_devops_v1alpha3_PipelineSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.PipelineStatus": schema_pkg_apis_devops_v1alpha3_PipelineStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.RemoteTrigger": schema_pkg_apis_devops_v1alpha3_RemoteTrigger(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.SingleSvnSource": schema_pkg_apis_devops_v1alpha3_SingleSvnSource(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.SvnSource": schema_pkg_apis_devops_v1alpha3_SvnSource(ref), - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.TimerTrigger": schema_pkg_apis_devops_v1alpha3_TimerTrigger(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "kubesphere.io/api/devops/v1alpha3.BitbucketServerSource": schema_pkg_apis_devops_v1alpha3_BitbucketServerSource(ref), + "kubesphere.io/api/devops/v1alpha3.DevOpsProject": schema_pkg_apis_devops_v1alpha3_DevOpsProject(ref), + "kubesphere.io/api/devops/v1alpha3.DevOpsProjectList": schema_pkg_apis_devops_v1alpha3_DevOpsProjectList(ref), + "kubesphere.io/api/devops/v1alpha3.DevOpsProjectSpec": schema_pkg_apis_devops_v1alpha3_DevOpsProjectSpec(ref), + "kubesphere.io/api/devops/v1alpha3.DevOpsProjectStatus": schema_pkg_apis_devops_v1alpha3_DevOpsProjectStatus(ref), + "kubesphere.io/api/devops/v1alpha3.DiscarderProperty": schema_pkg_apis_devops_v1alpha3_DiscarderProperty(ref), + "kubesphere.io/api/devops/v1alpha3.DiscoverPRFromForks": schema_pkg_apis_devops_v1alpha3_DiscoverPRFromForks(ref), + "kubesphere.io/api/devops/v1alpha3.GitCloneOption": schema_pkg_apis_devops_v1alpha3_GitCloneOption(ref), + "kubesphere.io/api/devops/v1alpha3.GitSource": schema_pkg_apis_devops_v1alpha3_GitSource(ref), + "kubesphere.io/api/devops/v1alpha3.GithubSource": schema_pkg_apis_devops_v1alpha3_GithubSource(ref), + "kubesphere.io/api/devops/v1alpha3.MultiBranchJobTrigger": schema_pkg_apis_devops_v1alpha3_MultiBranchJobTrigger(ref), + "kubesphere.io/api/devops/v1alpha3.MultiBranchPipeline": schema_pkg_apis_devops_v1alpha3_MultiBranchPipeline(ref), + "kubesphere.io/api/devops/v1alpha3.NoScmPipeline": schema_pkg_apis_devops_v1alpha3_NoScmPipeline(ref), + "kubesphere.io/api/devops/v1alpha3.Parameter": schema_pkg_apis_devops_v1alpha3_Parameter(ref), + "kubesphere.io/api/devops/v1alpha3.Pipeline": schema_pkg_apis_devops_v1alpha3_Pipeline(ref), + "kubesphere.io/api/devops/v1alpha3.PipelineList": schema_pkg_apis_devops_v1alpha3_PipelineList(ref), + "kubesphere.io/api/devops/v1alpha3.PipelineSpec": schema_pkg_apis_devops_v1alpha3_PipelineSpec(ref), + "kubesphere.io/api/devops/v1alpha3.PipelineStatus": schema_pkg_apis_devops_v1alpha3_PipelineStatus(ref), + "kubesphere.io/api/devops/v1alpha3.RemoteTrigger": schema_pkg_apis_devops_v1alpha3_RemoteTrigger(ref), + "kubesphere.io/api/devops/v1alpha3.SingleSvnSource": schema_pkg_apis_devops_v1alpha3_SingleSvnSource(ref), + "kubesphere.io/api/devops/v1alpha3.SvnSource": schema_pkg_apis_devops_v1alpha3_SvnSource(ref), + "kubesphere.io/api/devops/v1alpha3.TimerTrigger": schema_pkg_apis_devops_v1alpha3_TimerTrigger(ref), } } @@ -2313,12 +2313,12 @@ func schema_pkg_apis_devops_v1alpha3_BitbucketServerSource(ref common.ReferenceC }, "discover_pr_from_forks": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscoverPRFromForks"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.DiscoverPRFromForks"), }, }, "git_clone_option": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitCloneOption"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.GitCloneOption"), }, }, "regex_filter": { @@ -2331,7 +2331,7 @@ func schema_pkg_apis_devops_v1alpha3_BitbucketServerSource(ref common.ReferenceC }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscoverPRFromForks", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitCloneOption"}, + "kubesphere.io/api/devops/v1alpha3.DiscoverPRFromForks", "kubesphere.io/api/devops/v1alpha3.GitCloneOption"}, } } @@ -2363,19 +2363,19 @@ func schema_pkg_apis_devops_v1alpha3_DevOpsProject(ref common.ReferenceCallback) }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProjectSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.DevOpsProjectSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProjectStatus"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.DevOpsProjectStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProjectSpec", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProjectStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/devops/v1alpha3.DevOpsProjectSpec", "kubesphere.io/api/devops/v1alpha3.DevOpsProjectStatus"}, } } @@ -2411,7 +2411,7 @@ func schema_pkg_apis_devops_v1alpha3_DevOpsProjectList(ref common.ReferenceCallb Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProject"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.DevOpsProject"), }, }, }, @@ -2422,7 +2422,7 @@ func schema_pkg_apis_devops_v1alpha3_DevOpsProjectList(ref common.ReferenceCallb }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DevOpsProject"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/devops/v1alpha3.DevOpsProject"}, } } @@ -2567,7 +2567,7 @@ func schema_pkg_apis_devops_v1alpha3_GitSource(ref common.ReferenceCallback) com }, "git_clone_option": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitCloneOption"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.GitCloneOption"), }, }, "regex_filter": { @@ -2580,7 +2580,7 @@ func schema_pkg_apis_devops_v1alpha3_GitSource(ref common.ReferenceCallback) com }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitCloneOption"}, + "kubesphere.io/api/devops/v1alpha3.GitCloneOption"}, } } @@ -2634,12 +2634,12 @@ func schema_pkg_apis_devops_v1alpha3_GithubSource(ref common.ReferenceCallback) }, "discover_pr_from_forks": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscoverPRFromForks"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.DiscoverPRFromForks"), }, }, "git_clone_option": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitCloneOption"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.GitCloneOption"), }, }, "regex_filter": { @@ -2652,7 +2652,7 @@ func schema_pkg_apis_devops_v1alpha3_GithubSource(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscoverPRFromForks", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitCloneOption"}, + "kubesphere.io/api/devops/v1alpha3.DiscoverPRFromForks", "kubesphere.io/api/devops/v1alpha3.GitCloneOption"}, } } @@ -2700,12 +2700,12 @@ func schema_pkg_apis_devops_v1alpha3_MultiBranchPipeline(ref common.ReferenceCal }, "discarder": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscarderProperty"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.DiscarderProperty"), }, }, "timer_trigger": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.TimerTrigger"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.TimerTrigger"), }, }, "source_type": { @@ -2716,27 +2716,27 @@ func schema_pkg_apis_devops_v1alpha3_MultiBranchPipeline(ref common.ReferenceCal }, "git_source": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitSource"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.GitSource"), }, }, "github_source": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GithubSource"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.GithubSource"), }, }, "svn_source": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.SvnSource"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.SvnSource"), }, }, "single_svn_source": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.SingleSvnSource"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.SingleSvnSource"), }, }, "bitbucket_server_source": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.BitbucketServerSource"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.BitbucketServerSource"), }, }, "script_path": { @@ -2747,7 +2747,7 @@ func schema_pkg_apis_devops_v1alpha3_MultiBranchPipeline(ref common.ReferenceCal }, "multibranch_job_trigger": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.MultiBranchJobTrigger"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.MultiBranchJobTrigger"), }, }, }, @@ -2755,7 +2755,7 @@ func schema_pkg_apis_devops_v1alpha3_MultiBranchPipeline(ref common.ReferenceCal }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.BitbucketServerSource", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscarderProperty", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GitSource", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.GithubSource", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.MultiBranchJobTrigger", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.SingleSvnSource", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.SvnSource", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.TimerTrigger"}, + "kubesphere.io/api/devops/v1alpha3.BitbucketServerSource", "kubesphere.io/api/devops/v1alpha3.DiscarderProperty", "kubesphere.io/api/devops/v1alpha3.GitSource", "kubesphere.io/api/devops/v1alpha3.GithubSource", "kubesphere.io/api/devops/v1alpha3.MultiBranchJobTrigger", "kubesphere.io/api/devops/v1alpha3.SingleSvnSource", "kubesphere.io/api/devops/v1alpha3.SvnSource", "kubesphere.io/api/devops/v1alpha3.TimerTrigger"}, } } @@ -2779,7 +2779,7 @@ func schema_pkg_apis_devops_v1alpha3_NoScmPipeline(ref common.ReferenceCallback) }, "discarder": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscarderProperty"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.DiscarderProperty"), }, }, "parameters": { @@ -2788,7 +2788,7 @@ func schema_pkg_apis_devops_v1alpha3_NoScmPipeline(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.Parameter"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.Parameter"), }, }, }, @@ -2802,12 +2802,12 @@ func schema_pkg_apis_devops_v1alpha3_NoScmPipeline(ref common.ReferenceCallback) }, "timer_trigger": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.TimerTrigger"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.TimerTrigger"), }, }, "remote_trigger": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.RemoteTrigger"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.RemoteTrigger"), }, }, "jenkinsfile": { @@ -2821,7 +2821,7 @@ func schema_pkg_apis_devops_v1alpha3_NoScmPipeline(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.DiscarderProperty", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.Parameter", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.RemoteTrigger", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.TimerTrigger"}, + "kubesphere.io/api/devops/v1alpha3.DiscarderProperty", "kubesphere.io/api/devops/v1alpha3.Parameter", "kubesphere.io/api/devops/v1alpha3.RemoteTrigger", "kubesphere.io/api/devops/v1alpha3.TimerTrigger"}, } } @@ -2890,19 +2890,19 @@ func schema_pkg_apis_devops_v1alpha3_Pipeline(ref common.ReferenceCallback) comm }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.PipelineSpec"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.PipelineSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.PipelineStatus"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.PipelineStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.PipelineSpec", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.PipelineStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/devops/v1alpha3.PipelineSpec", "kubesphere.io/api/devops/v1alpha3.PipelineStatus"}, } } @@ -2938,7 +2938,7 @@ func schema_pkg_apis_devops_v1alpha3_PipelineList(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.Pipeline"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.Pipeline"), }, }, }, @@ -2949,7 +2949,7 @@ func schema_pkg_apis_devops_v1alpha3_PipelineList(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.Pipeline"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/devops/v1alpha3.Pipeline"}, } } @@ -2969,12 +2969,12 @@ func schema_pkg_apis_devops_v1alpha3_PipelineSpec(ref common.ReferenceCallback) }, "pipeline": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.NoScmPipeline"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.NoScmPipeline"), }, }, "multi_branch_pipeline": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.MultiBranchPipeline"), + Ref: ref("kubesphere.io/api/devops/v1alpha3.MultiBranchPipeline"), }, }, }, @@ -2982,7 +2982,7 @@ func schema_pkg_apis_devops_v1alpha3_PipelineSpec(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.MultiBranchPipeline", "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3.NoScmPipeline"}, + "kubesphere.io/api/devops/v1alpha3.MultiBranchPipeline", "kubesphere.io/api/devops/v1alpha3.NoScmPipeline"}, } } diff --git a/pkg/apis/devops/v1alpha3/pipeline_types.go b/staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types.go similarity index 100% rename from pkg/apis/devops/v1alpha3/pipeline_types.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types.go diff --git a/pkg/apis/devops/v1alpha3/pipeline_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types_test.go similarity index 100% rename from pkg/apis/devops/v1alpha3/pipeline_types_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types_test.go diff --git a/pkg/apis/devops/v1alpha3/register.go b/staging/src/kubesphere.io/api/devops/v1alpha3/register.go similarity index 95% rename from pkg/apis/devops/v1alpha3/register.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/register.go index 3f18a9c88a..4cac1da1c2 100644 --- a/pkg/apis/devops/v1alpha3/register.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha3/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha3 contains API Schema definitions for the devops v1alpha3 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/devops +// +k8s:conversion-gen=kubesphere.io/api/devops // +k8s:defaulter-gen=TypeMeta // +groupName=devops.kubesphere.io package v1alpha3 diff --git a/pkg/apis/devops/v1alpha3/v1alpha3_suite_test.go b/staging/src/kubesphere.io/api/devops/v1alpha3/v1alpha3_suite_test.go similarity index 100% rename from pkg/apis/devops/v1alpha3/v1alpha3_suite_test.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/v1alpha3_suite_test.go diff --git a/pkg/apis/devops/v1alpha3/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/devops/v1alpha3/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/devops/v1alpha3/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/devops/v1alpha3/zz_generated.deepcopy.go diff --git a/staging/src/kubesphere.io/api/go.mod b/staging/src/kubesphere.io/api/go.mod new file mode 100644 index 0000000000..471cfa44f3 --- /dev/null +++ b/staging/src/kubesphere.io/api/go.mod @@ -0,0 +1,13 @@ +// This is a generated file. Do not edit directly. +// Run hack/pin-dependency.sh to change pinned dependency versions. +// Run hack/update-vendor.sh to update go.mod files and the vendor directory. + +module kubesphere.io/api + +go 1.13 + +require ( + k8s.io/apimachinery v0.18.6 + k8s.io/client-go v0.18.6 + sigs.k8s.io/controller-runtime v0.6.4 +) diff --git a/staging/src/kubesphere.io/api/go.sum b/staging/src/kubesphere.io/api/go.sum new file mode 100644 index 0000000000..99604478a6 --- /dev/null +++ b/staging/src/kubesphere.io/api/go.sum @@ -0,0 +1,414 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= +github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= +github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= +github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= +github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= +github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= +github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= +github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= +github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= +github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= +github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= +github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= +k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= +k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= +k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= +k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= +k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= +k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= +sigs.k8s.io/controller-runtime v0.6.4/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/pkg/apis/iam/group.go b/staging/src/kubesphere.io/api/iam/group.go similarity index 100% rename from pkg/apis/iam/group.go rename to staging/src/kubesphere.io/api/iam/group.go diff --git a/pkg/apis/iam/v1alpha2/doc.go b/staging/src/kubesphere.io/api/iam/v1alpha2/doc.go similarity index 92% rename from pkg/apis/iam/v1alpha2/doc.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/doc.go index cc2b6133d3..7978d580d1 100644 --- a/pkg/apis/iam/v1alpha2/doc.go +++ b/staging/src/kubesphere.io/api/iam/v1alpha2/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the iam v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/iam +// +k8s:conversion-gen=kubesphere.io/api/iam // +k8s:defaulter-gen=TypeMeta // +groupName=iam.kubesphere.io package v1alpha2 diff --git a/pkg/apis/iam/v1alpha2/federated_types.go b/staging/src/kubesphere.io/api/iam/v1alpha2/federated_types.go similarity index 100% rename from pkg/apis/iam/v1alpha2/federated_types.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/federated_types.go diff --git a/pkg/apis/iam/v1alpha2/group_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/group_test.go similarity index 100% rename from pkg/apis/iam/v1alpha2/group_test.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/group_test.go diff --git a/pkg/apis/iam/v1alpha2/group_types.go b/staging/src/kubesphere.io/api/iam/v1alpha2/group_types.go similarity index 100% rename from pkg/apis/iam/v1alpha2/group_types.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/group_types.go diff --git a/pkg/apis/iam/v1alpha2/groupbinding_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_test.go similarity index 100% rename from pkg/apis/iam/v1alpha2/groupbinding_test.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_test.go diff --git a/pkg/apis/iam/v1alpha2/groupbinding_types.go b/staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_types.go similarity index 100% rename from pkg/apis/iam/v1alpha2/groupbinding_types.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_types.go diff --git a/pkg/apis/iam/v1alpha2/register.go b/staging/src/kubesphere.io/api/iam/v1alpha2/register.go similarity index 97% rename from pkg/apis/iam/v1alpha2/register.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/register.go index 54467ed9ed..492e3e9a4b 100644 --- a/pkg/apis/iam/v1alpha2/register.go +++ b/staging/src/kubesphere.io/api/iam/v1alpha2/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the iam v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/iam +// +k8s:conversion-gen=kubesphere.io/api/iam // +k8s:defaulter-gen=TypeMeta // +groupName=iam.kubesphere.io package v1alpha2 diff --git a/pkg/apis/iam/v1alpha2/types.go b/staging/src/kubesphere.io/api/iam/v1alpha2/types.go similarity index 100% rename from pkg/apis/iam/v1alpha2/types.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/types.go diff --git a/pkg/apis/iam/v1alpha2/types_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/types_test.go similarity index 100% rename from pkg/apis/iam/v1alpha2/types_test.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/types_test.go diff --git a/pkg/apis/iam/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/v1alpha2_suite_test.go similarity index 100% rename from pkg/apis/iam/v1alpha2/v1alpha2_suite_test.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/v1alpha2_suite_test.go diff --git a/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/iam/v1alpha2/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/iam/v1alpha2/zz_generated.deepcopy.go index 86305a8983..9e094eef54 100644 --- a/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go +++ b/staging/src/kubesphere.io/api/iam/v1alpha2/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/network/OWNERS b/staging/src/kubesphere.io/api/network/OWNERS similarity index 100% rename from pkg/apis/network/OWNERS rename to staging/src/kubesphere.io/api/network/OWNERS diff --git a/pkg/apis/network/calicov3/block_affinity_types.go b/staging/src/kubesphere.io/api/network/calicov3/block_affinity_types.go similarity index 100% rename from pkg/apis/network/calicov3/block_affinity_types.go rename to staging/src/kubesphere.io/api/network/calicov3/block_affinity_types.go diff --git a/pkg/apis/network/calicov3/doc.go b/staging/src/kubesphere.io/api/network/calicov3/doc.go similarity index 100% rename from pkg/apis/network/calicov3/doc.go rename to staging/src/kubesphere.io/api/network/calicov3/doc.go diff --git a/pkg/apis/network/calicov3/ipamblock_types.go b/staging/src/kubesphere.io/api/network/calicov3/ipamblock_types.go similarity index 100% rename from pkg/apis/network/calicov3/ipamblock_types.go rename to staging/src/kubesphere.io/api/network/calicov3/ipamblock_types.go diff --git a/pkg/apis/network/calicov3/ippool_types.go b/staging/src/kubesphere.io/api/network/calicov3/ippool_types.go similarity index 100% rename from pkg/apis/network/calicov3/ippool_types.go rename to staging/src/kubesphere.io/api/network/calicov3/ippool_types.go diff --git a/pkg/apis/network/calicov3/register.go b/staging/src/kubesphere.io/api/network/calicov3/register.go similarity index 100% rename from pkg/apis/network/calicov3/register.go rename to staging/src/kubesphere.io/api/network/calicov3/register.go diff --git a/pkg/apis/network/calicov3/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/network/calicov3/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/network/calicov3/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/network/calicov3/zz_generated.deepcopy.go diff --git a/pkg/apis/network/crdinstall/install.go b/staging/src/kubesphere.io/api/network/crdinstall/install.go similarity index 92% rename from pkg/apis/network/crdinstall/install.go rename to staging/src/kubesphere.io/api/network/crdinstall/install.go index 0fa7580a0f..ae8e45de4a 100644 --- a/pkg/apis/network/crdinstall/install.go +++ b/staging/src/kubesphere.io/api/network/crdinstall/install.go @@ -20,7 +20,7 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" ) func Install(scheme *k8sruntime.Scheme) { diff --git a/pkg/apis/network/group.go b/staging/src/kubesphere.io/api/network/group.go similarity index 100% rename from pkg/apis/network/group.go rename to staging/src/kubesphere.io/api/network/group.go diff --git a/pkg/apis/network/v1alpha1/doc.go b/staging/src/kubesphere.io/api/network/v1alpha1/doc.go similarity index 92% rename from pkg/apis/network/v1alpha1/doc.go rename to staging/src/kubesphere.io/api/network/v1alpha1/doc.go index aaf886e4c7..0ee11eaddb 100644 --- a/pkg/apis/network/v1alpha1/doc.go +++ b/staging/src/kubesphere.io/api/network/v1alpha1/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the network v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/network +// +k8s:conversion-gen=kubesphere.io/api/network // +k8s:defaulter-gen=TypeMeta // +groupName=network.kubesphere.io package v1alpha1 diff --git a/pkg/apis/network/v1alpha1/ipamblock_types.go b/staging/src/kubesphere.io/api/network/v1alpha1/ipamblock_types.go similarity index 100% rename from pkg/apis/network/v1alpha1/ipamblock_types.go rename to staging/src/kubesphere.io/api/network/v1alpha1/ipamblock_types.go diff --git a/pkg/apis/network/v1alpha1/ipamblock_types_test.go b/staging/src/kubesphere.io/api/network/v1alpha1/ipamblock_types_test.go similarity index 100% rename from pkg/apis/network/v1alpha1/ipamblock_types_test.go rename to staging/src/kubesphere.io/api/network/v1alpha1/ipamblock_types_test.go diff --git a/pkg/apis/network/v1alpha1/ipamhandle_types.go b/staging/src/kubesphere.io/api/network/v1alpha1/ipamhandle_types.go similarity index 100% rename from pkg/apis/network/v1alpha1/ipamhandle_types.go rename to staging/src/kubesphere.io/api/network/v1alpha1/ipamhandle_types.go diff --git a/pkg/apis/network/v1alpha1/ipamhandle_types_test.go b/staging/src/kubesphere.io/api/network/v1alpha1/ipamhandle_types_test.go similarity index 100% rename from pkg/apis/network/v1alpha1/ipamhandle_types_test.go rename to staging/src/kubesphere.io/api/network/v1alpha1/ipamhandle_types_test.go diff --git a/pkg/apis/network/v1alpha1/ippool_types.go b/staging/src/kubesphere.io/api/network/v1alpha1/ippool_types.go similarity index 100% rename from pkg/apis/network/v1alpha1/ippool_types.go rename to staging/src/kubesphere.io/api/network/v1alpha1/ippool_types.go diff --git a/pkg/apis/network/v1alpha1/ippool_types_test.go b/staging/src/kubesphere.io/api/network/v1alpha1/ippool_types_test.go similarity index 100% rename from pkg/apis/network/v1alpha1/ippool_types_test.go rename to staging/src/kubesphere.io/api/network/v1alpha1/ippool_types_test.go diff --git a/pkg/apis/network/v1alpha1/namespacenetworkpolicy_types.go b/staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types.go similarity index 100% rename from pkg/apis/network/v1alpha1/namespacenetworkpolicy_types.go rename to staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types.go diff --git a/pkg/apis/network/v1alpha1/namespacenetworkpolicy_types_test.go b/staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types_test.go similarity index 100% rename from pkg/apis/network/v1alpha1/namespacenetworkpolicy_types_test.go rename to staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types_test.go diff --git a/pkg/apis/network/v1alpha1/openapi_generated.go b/staging/src/kubesphere.io/api/network/v1alpha1/openapi_generated.go similarity index 93% rename from pkg/apis/network/v1alpha1/openapi_generated.go rename to staging/src/kubesphere.io/api/network/v1alpha1/openapi_generated.go index 57db60b824..daeac06b2d 100644 --- a/pkg/apis/network/v1alpha1/openapi_generated.go +++ b/staging/src/kubesphere.io/api/network/v1alpha1/openapi_generated.go @@ -31,86 +31,86 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "k8s.io/api/networking/v1.IPBlock": schema_k8sio_api_networking_v1_IPBlock(ref), - "k8s.io/api/networking/v1.NetworkPolicy": schema_k8sio_api_networking_v1_NetworkPolicy(ref), - "k8s.io/api/networking/v1.NetworkPolicyEgressRule": schema_k8sio_api_networking_v1_NetworkPolicyEgressRule(ref), - "k8s.io/api/networking/v1.NetworkPolicyIngressRule": schema_k8sio_api_networking_v1_NetworkPolicyIngressRule(ref), - "k8s.io/api/networking/v1.NetworkPolicyList": schema_k8sio_api_networking_v1_NetworkPolicyList(ref), - "k8s.io/api/networking/v1.NetworkPolicyPeer": schema_k8sio_api_networking_v1_NetworkPolicyPeer(ref), - "k8s.io/api/networking/v1.NetworkPolicyPort": schema_k8sio_api_networking_v1_NetworkPolicyPort(ref), - "k8s.io/api/networking/v1.NetworkPolicySpec": schema_k8sio_api_networking_v1_NetworkPolicySpec(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.AllocationAttribute": schema_pkg_apis_network_v1alpha1_AllocationAttribute(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.DNS": schema_pkg_apis_network_v1alpha1_DNS(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMBlock": schema_pkg_apis_network_v1alpha1_IPAMBlock(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMBlockList": schema_pkg_apis_network_v1alpha1_IPAMBlockList(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMBlockSpec": schema_pkg_apis_network_v1alpha1_IPAMBlockSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMHandle": schema_pkg_apis_network_v1alpha1_IPAMHandle(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMHandleList": schema_pkg_apis_network_v1alpha1_IPAMHandleList(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMHandleSpec": schema_pkg_apis_network_v1alpha1_IPAMHandleSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPool": schema_pkg_apis_network_v1alpha1_IPPool(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPoolList": schema_pkg_apis_network_v1alpha1_IPPoolList(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPoolSpec": schema_pkg_apis_network_v1alpha1_IPPoolSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPoolStatus": schema_pkg_apis_network_v1alpha1_IPPoolStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceNetworkPolicy": schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicy(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceNetworkPolicyList": schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicyList(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceNetworkPolicySpec": schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicySpec(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceSelector": schema_pkg_apis_network_v1alpha1_NamespaceSelector(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyEgressRule": schema_pkg_apis_network_v1alpha1_NetworkPolicyEgressRule(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyIngressRule": schema_pkg_apis_network_v1alpha1_NetworkPolicyIngressRule(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyPeer": schema_pkg_apis_network_v1alpha1_NetworkPolicyPeer(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.ReservedAttr": schema_pkg_apis_network_v1alpha1_ReservedAttr(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.Route": schema_pkg_apis_network_v1alpha1_Route(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.ServiceSelector": schema_pkg_apis_network_v1alpha1_ServiceSelector(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.VLANConfig": schema_pkg_apis_network_v1alpha1_VLANConfig(ref), - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.WorkspaceStatus": schema_pkg_apis_network_v1alpha1_WorkspaceStatus(ref), + "k8s.io/api/networking/v1.IPBlock": schema_k8sio_api_networking_v1_IPBlock(ref), + "k8s.io/api/networking/v1.NetworkPolicy": schema_k8sio_api_networking_v1_NetworkPolicy(ref), + "k8s.io/api/networking/v1.NetworkPolicyEgressRule": schema_k8sio_api_networking_v1_NetworkPolicyEgressRule(ref), + "k8s.io/api/networking/v1.NetworkPolicyIngressRule": schema_k8sio_api_networking_v1_NetworkPolicyIngressRule(ref), + "k8s.io/api/networking/v1.NetworkPolicyList": schema_k8sio_api_networking_v1_NetworkPolicyList(ref), + "k8s.io/api/networking/v1.NetworkPolicyPeer": schema_k8sio_api_networking_v1_NetworkPolicyPeer(ref), + "k8s.io/api/networking/v1.NetworkPolicyPort": schema_k8sio_api_networking_v1_NetworkPolicyPort(ref), + "k8s.io/api/networking/v1.NetworkPolicySpec": schema_k8sio_api_networking_v1_NetworkPolicySpec(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), + "kubesphere.io/api/network/v1alpha1.AllocationAttribute": schema_pkg_apis_network_v1alpha1_AllocationAttribute(ref), + "kubesphere.io/api/network/v1alpha1.DNS": schema_pkg_apis_network_v1alpha1_DNS(ref), + "kubesphere.io/api/network/v1alpha1.IPAMBlock": schema_pkg_apis_network_v1alpha1_IPAMBlock(ref), + "kubesphere.io/api/network/v1alpha1.IPAMBlockList": schema_pkg_apis_network_v1alpha1_IPAMBlockList(ref), + "kubesphere.io/api/network/v1alpha1.IPAMBlockSpec": schema_pkg_apis_network_v1alpha1_IPAMBlockSpec(ref), + "kubesphere.io/api/network/v1alpha1.IPAMHandle": schema_pkg_apis_network_v1alpha1_IPAMHandle(ref), + "kubesphere.io/api/network/v1alpha1.IPAMHandleList": schema_pkg_apis_network_v1alpha1_IPAMHandleList(ref), + "kubesphere.io/api/network/v1alpha1.IPAMHandleSpec": schema_pkg_apis_network_v1alpha1_IPAMHandleSpec(ref), + "kubesphere.io/api/network/v1alpha1.IPPool": schema_pkg_apis_network_v1alpha1_IPPool(ref), + "kubesphere.io/api/network/v1alpha1.IPPoolList": schema_pkg_apis_network_v1alpha1_IPPoolList(ref), + "kubesphere.io/api/network/v1alpha1.IPPoolSpec": schema_pkg_apis_network_v1alpha1_IPPoolSpec(ref), + "kubesphere.io/api/network/v1alpha1.IPPoolStatus": schema_pkg_apis_network_v1alpha1_IPPoolStatus(ref), + "kubesphere.io/api/network/v1alpha1.NamespaceNetworkPolicy": schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicy(ref), + "kubesphere.io/api/network/v1alpha1.NamespaceNetworkPolicyList": schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicyList(ref), + "kubesphere.io/api/network/v1alpha1.NamespaceNetworkPolicySpec": schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicySpec(ref), + "kubesphere.io/api/network/v1alpha1.NamespaceSelector": schema_pkg_apis_network_v1alpha1_NamespaceSelector(ref), + "kubesphere.io/api/network/v1alpha1.NetworkPolicyEgressRule": schema_pkg_apis_network_v1alpha1_NetworkPolicyEgressRule(ref), + "kubesphere.io/api/network/v1alpha1.NetworkPolicyIngressRule": schema_pkg_apis_network_v1alpha1_NetworkPolicyIngressRule(ref), + "kubesphere.io/api/network/v1alpha1.NetworkPolicyPeer": schema_pkg_apis_network_v1alpha1_NetworkPolicyPeer(ref), + "kubesphere.io/api/network/v1alpha1.ReservedAttr": schema_pkg_apis_network_v1alpha1_ReservedAttr(ref), + "kubesphere.io/api/network/v1alpha1.Route": schema_pkg_apis_network_v1alpha1_Route(ref), + "kubesphere.io/api/network/v1alpha1.ServiceSelector": schema_pkg_apis_network_v1alpha1_ServiceSelector(ref), + "kubesphere.io/api/network/v1alpha1.VLANConfig": schema_pkg_apis_network_v1alpha1_VLANConfig(ref), + "kubesphere.io/api/network/v1alpha1.WorkspaceStatus": schema_pkg_apis_network_v1alpha1_WorkspaceStatus(ref), } } @@ -2650,14 +2650,14 @@ func schema_pkg_apis_network_v1alpha1_IPAMBlock(ref common.ReferenceCallback) co "spec": { SchemaProps: spec.SchemaProps{ Description: "Specification of the IPAMBlock.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMBlockSpec"), + Ref: ref("kubesphere.io/api/network/v1alpha1.IPAMBlockSpec"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMBlockSpec"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/network/v1alpha1.IPAMBlockSpec"}, } } @@ -2692,7 +2692,7 @@ func schema_pkg_apis_network_v1alpha1_IPAMBlockList(ref common.ReferenceCallback Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMBlock"), + Ref: ref("kubesphere.io/api/network/v1alpha1.IPAMBlock"), }, }, }, @@ -2703,7 +2703,7 @@ func schema_pkg_apis_network_v1alpha1_IPAMBlockList(ref common.ReferenceCallback }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMBlock"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/network/v1alpha1.IPAMBlock"}, } } @@ -2758,7 +2758,7 @@ func schema_pkg_apis_network_v1alpha1_IPAMBlockSpec(ref common.ReferenceCallback Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.AllocationAttribute"), + Ref: ref("kubesphere.io/api/network/v1alpha1.AllocationAttribute"), }, }, }, @@ -2775,7 +2775,7 @@ func schema_pkg_apis_network_v1alpha1_IPAMBlockSpec(ref common.ReferenceCallback }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.AllocationAttribute"}, + "kubesphere.io/api/network/v1alpha1.AllocationAttribute"}, } } @@ -2808,14 +2808,14 @@ func schema_pkg_apis_network_v1alpha1_IPAMHandle(ref common.ReferenceCallback) c "spec": { SchemaProps: spec.SchemaProps{ Description: "Specification of the IPAMHandle.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMHandleSpec"), + Ref: ref("kubesphere.io/api/network/v1alpha1.IPAMHandleSpec"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMHandleSpec"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/network/v1alpha1.IPAMHandleSpec"}, } } @@ -2850,7 +2850,7 @@ func schema_pkg_apis_network_v1alpha1_IPAMHandleList(ref common.ReferenceCallbac Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMHandle"), + Ref: ref("kubesphere.io/api/network/v1alpha1.IPAMHandle"), }, }, }, @@ -2861,7 +2861,7 @@ func schema_pkg_apis_network_v1alpha1_IPAMHandleList(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPAMHandle"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/network/v1alpha1.IPAMHandle"}, } } @@ -2932,19 +2932,19 @@ func schema_pkg_apis_network_v1alpha1_IPPool(ref common.ReferenceCallback) commo }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPoolSpec"), + Ref: ref("kubesphere.io/api/network/v1alpha1.IPPoolSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPoolStatus"), + Ref: ref("kubesphere.io/api/network/v1alpha1.IPPoolStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPoolSpec", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPoolStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/network/v1alpha1.IPPoolSpec", "kubesphere.io/api/network/v1alpha1.IPPoolStatus"}, } } @@ -2979,7 +2979,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolList(ref common.ReferenceCallback) c Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPool"), + Ref: ref("kubesphere.io/api/network/v1alpha1.IPPool"), }, }, }, @@ -2990,7 +2990,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolList(ref common.ReferenceCallback) c }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.IPPool"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/network/v1alpha1.IPPool"}, } } @@ -3043,7 +3043,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolSpec(ref common.ReferenceCallback) c }, "vlanConfig": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.VLANConfig"), + Ref: ref("kubesphere.io/api/network/v1alpha1.VLANConfig"), }, }, "gateway": { @@ -3058,7 +3058,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolSpec(ref common.ReferenceCallback) c Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.Route"), + Ref: ref("kubesphere.io/api/network/v1alpha1.Route"), }, }, }, @@ -3066,7 +3066,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolSpec(ref common.ReferenceCallback) c }, "dns": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.DNS"), + Ref: ref("kubesphere.io/api/network/v1alpha1.DNS"), }, }, }, @@ -3074,7 +3074,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolSpec(ref common.ReferenceCallback) c }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.DNS", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.Route", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.VLANConfig"}, + "kubesphere.io/api/network/v1alpha1.DNS", "kubesphere.io/api/network/v1alpha1.Route", "kubesphere.io/api/network/v1alpha1.VLANConfig"}, } } @@ -3121,7 +3121,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolStatus(ref common.ReferenceCallback) Allows: true, Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.WorkspaceStatus"), + Ref: ref("kubesphere.io/api/network/v1alpha1.WorkspaceStatus"), }, }, }, @@ -3132,7 +3132,7 @@ func schema_pkg_apis_network_v1alpha1_IPPoolStatus(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.WorkspaceStatus"}, + "kubesphere.io/api/network/v1alpha1.WorkspaceStatus"}, } } @@ -3164,14 +3164,14 @@ func schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicy(ref common.Referenc }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceNetworkPolicySpec"), + Ref: ref("kubesphere.io/api/network/v1alpha1.NamespaceNetworkPolicySpec"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceNetworkPolicySpec"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/network/v1alpha1.NamespaceNetworkPolicySpec"}, } } @@ -3207,7 +3207,7 @@ func schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicyList(ref common.Refe Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceNetworkPolicy"), + Ref: ref("kubesphere.io/api/network/v1alpha1.NamespaceNetworkPolicy"), }, }, }, @@ -3218,7 +3218,7 @@ func schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicyList(ref common.Refe }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceNetworkPolicy"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/network/v1alpha1.NamespaceNetworkPolicy"}, } } @@ -3236,7 +3236,7 @@ func schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicySpec(ref common.Refe Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyIngressRule"), + Ref: ref("kubesphere.io/api/network/v1alpha1.NetworkPolicyIngressRule"), }, }, }, @@ -3249,7 +3249,7 @@ func schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicySpec(ref common.Refe Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyEgressRule"), + Ref: ref("kubesphere.io/api/network/v1alpha1.NetworkPolicyEgressRule"), }, }, }, @@ -3273,7 +3273,7 @@ func schema_pkg_apis_network_v1alpha1_NamespaceNetworkPolicySpec(ref common.Refe }, }, Dependencies: []string{ - "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyEgressRule", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyIngressRule"}, + "kubesphere.io/api/network/v1alpha1.NetworkPolicyEgressRule", "kubesphere.io/api/network/v1alpha1.NetworkPolicyIngressRule"}, } } @@ -3323,7 +3323,7 @@ func schema_pkg_apis_network_v1alpha1_NetworkPolicyEgressRule(ref common.Referen Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyPeer"), + Ref: ref("kubesphere.io/api/network/v1alpha1.NetworkPolicyPeer"), }, }, }, @@ -3333,7 +3333,7 @@ func schema_pkg_apis_network_v1alpha1_NetworkPolicyEgressRule(ref common.Referen }, }, Dependencies: []string{ - "k8s.io/api/networking/v1.NetworkPolicyPort", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyPeer"}, + "k8s.io/api/networking/v1.NetworkPolicyPort", "kubesphere.io/api/network/v1alpha1.NetworkPolicyPeer"}, } } @@ -3364,7 +3364,7 @@ func schema_pkg_apis_network_v1alpha1_NetworkPolicyIngressRule(ref common.Refere Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyPeer"), + Ref: ref("kubesphere.io/api/network/v1alpha1.NetworkPolicyPeer"), }, }, }, @@ -3374,7 +3374,7 @@ func schema_pkg_apis_network_v1alpha1_NetworkPolicyIngressRule(ref common.Refere }, }, Dependencies: []string{ - "k8s.io/api/networking/v1.NetworkPolicyPort", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NetworkPolicyPeer"}, + "k8s.io/api/networking/v1.NetworkPolicyPort", "kubesphere.io/api/network/v1alpha1.NetworkPolicyPeer"}, } } @@ -3387,7 +3387,7 @@ func schema_pkg_apis_network_v1alpha1_NetworkPolicyPeer(ref common.ReferenceCall Properties: map[string]spec.Schema{ "namespace": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceSelector"), + Ref: ref("kubesphere.io/api/network/v1alpha1.NamespaceSelector"), }, }, "ipBlock": { @@ -3398,14 +3398,14 @@ func schema_pkg_apis_network_v1alpha1_NetworkPolicyPeer(ref common.ReferenceCall }, "service": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.ServiceSelector"), + Ref: ref("kubesphere.io/api/network/v1alpha1.ServiceSelector"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/api/networking/v1.IPBlock", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.NamespaceSelector", "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1.ServiceSelector"}, + "k8s.io/api/networking/v1.IPBlock", "kubesphere.io/api/network/v1alpha1.NamespaceSelector", "kubesphere.io/api/network/v1alpha1.ServiceSelector"}, } } diff --git a/pkg/apis/network/v1alpha1/register.go b/staging/src/kubesphere.io/api/network/v1alpha1/register.go similarity index 96% rename from pkg/apis/network/v1alpha1/register.go rename to staging/src/kubesphere.io/api/network/v1alpha1/register.go index 8247db7b41..46b0494440 100644 --- a/pkg/apis/network/v1alpha1/register.go +++ b/staging/src/kubesphere.io/api/network/v1alpha1/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the network v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/network +// +k8s:conversion-gen=kubesphere.io/api/network // +k8s:defaulter-gen=TypeMeta // +groupName=network.kubesphere.io package v1alpha1 diff --git a/pkg/apis/network/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/network/v1alpha1/v1alpha1_suite_test.go similarity index 100% rename from pkg/apis/network/v1alpha1/v1alpha1_suite_test.go rename to staging/src/kubesphere.io/api/network/v1alpha1/v1alpha1_suite_test.go diff --git a/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/network/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/network/v1alpha1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/network/v1alpha1/zz_generated.deepcopy.go index 8e508884b1..eeea9ac2fd 100644 --- a/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/kubesphere.io/api/network/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/networking/v1" + v1 "k8s.io/api/networking/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/notification/group.go b/staging/src/kubesphere.io/api/notification/group.go similarity index 100% rename from pkg/apis/notification/group.go rename to staging/src/kubesphere.io/api/notification/group.go diff --git a/pkg/apis/notification/v2beta1/config_types.go b/staging/src/kubesphere.io/api/notification/v2beta1/config_types.go similarity index 100% rename from pkg/apis/notification/v2beta1/config_types.go rename to staging/src/kubesphere.io/api/notification/v2beta1/config_types.go diff --git a/pkg/apis/notification/v2beta1/doc.go b/staging/src/kubesphere.io/api/notification/v2beta1/doc.go similarity index 100% rename from pkg/apis/notification/v2beta1/doc.go rename to staging/src/kubesphere.io/api/notification/v2beta1/doc.go diff --git a/pkg/apis/notification/v2beta1/notificationmanager_types.go b/staging/src/kubesphere.io/api/notification/v2beta1/notificationmanager_types.go similarity index 100% rename from pkg/apis/notification/v2beta1/notificationmanager_types.go rename to staging/src/kubesphere.io/api/notification/v2beta1/notificationmanager_types.go diff --git a/pkg/apis/notification/v2beta1/receiver_types.go b/staging/src/kubesphere.io/api/notification/v2beta1/receiver_types.go similarity index 100% rename from pkg/apis/notification/v2beta1/receiver_types.go rename to staging/src/kubesphere.io/api/notification/v2beta1/receiver_types.go diff --git a/pkg/apis/notification/v2beta1/register.go b/staging/src/kubesphere.io/api/notification/v2beta1/register.go similarity index 100% rename from pkg/apis/notification/v2beta1/register.go rename to staging/src/kubesphere.io/api/notification/v2beta1/register.go diff --git a/pkg/apis/notification/v2beta1/types.go b/staging/src/kubesphere.io/api/notification/v2beta1/types.go similarity index 100% rename from pkg/apis/notification/v2beta1/types.go rename to staging/src/kubesphere.io/api/notification/v2beta1/types.go diff --git a/pkg/apis/notification/v2beta1/v2beta1_suite_test.go b/staging/src/kubesphere.io/api/notification/v2beta1/v2beta1_suite_test.go similarity index 100% rename from pkg/apis/notification/v2beta1/v2beta1_suite_test.go rename to staging/src/kubesphere.io/api/notification/v2beta1/v2beta1_suite_test.go diff --git a/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/notification/v2beta1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/notification/v2beta1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/notification/v2beta1/zz_generated.deepcopy.go index 559800ecbc..2ca64d5e1f 100644 --- a/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go +++ b/staging/src/kubesphere.io/api/notification/v2beta1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v2beta1 import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/quota/group.go b/staging/src/kubesphere.io/api/quota/group.go similarity index 100% rename from pkg/apis/quota/group.go rename to staging/src/kubesphere.io/api/quota/group.go diff --git a/pkg/apis/quota/v1alpha2/doc.go b/staging/src/kubesphere.io/api/quota/v1alpha2/doc.go similarity index 92% rename from pkg/apis/quota/v1alpha2/doc.go rename to staging/src/kubesphere.io/api/quota/v1alpha2/doc.go index ca399d3b8b..dfa2746ff6 100644 --- a/pkg/apis/quota/v1alpha2/doc.go +++ b/staging/src/kubesphere.io/api/quota/v1alpha2/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the quotas v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/quota +// +k8s:conversion-gen=kubesphere.io/api/quota // +k8s:defaulter-gen=TypeMeta // +groupName=quota.kubesphere.io package v1alpha2 diff --git a/pkg/apis/quota/v1alpha2/register.go b/staging/src/kubesphere.io/api/quota/v1alpha2/register.go similarity index 96% rename from pkg/apis/quota/v1alpha2/register.go rename to staging/src/kubesphere.io/api/quota/v1alpha2/register.go index d9dd4ce337..40f1eeefa0 100644 --- a/pkg/apis/quota/v1alpha2/register.go +++ b/staging/src/kubesphere.io/api/quota/v1alpha2/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the quotas v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/quota +// +k8s:conversion-gen=kubesphere.io/api/quota // +k8s:defaulter-gen=TypeMeta // +groupName=quota.kubesphere.io package v1alpha2 diff --git a/pkg/apis/quota/v1alpha2/types.go b/staging/src/kubesphere.io/api/quota/v1alpha2/types.go similarity index 100% rename from pkg/apis/quota/v1alpha2/types.go rename to staging/src/kubesphere.io/api/quota/v1alpha2/types.go diff --git a/pkg/apis/quota/v1alpha2/types_test.go b/staging/src/kubesphere.io/api/quota/v1alpha2/types_test.go similarity index 100% rename from pkg/apis/quota/v1alpha2/types_test.go rename to staging/src/kubesphere.io/api/quota/v1alpha2/types_test.go diff --git a/pkg/apis/quota/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/quota/v1alpha2/v1alpha2_suite_test.go similarity index 100% rename from pkg/apis/quota/v1alpha2/v1alpha2_suite_test.go rename to staging/src/kubesphere.io/api/quota/v1alpha2/v1alpha2_suite_test.go diff --git a/pkg/apis/quota/v1alpha2/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/quota/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/quota/v1alpha2/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/quota/v1alpha2/zz_generated.deepcopy.go diff --git a/pkg/apis/servicemesh/crdinstall/install.go b/staging/src/kubesphere.io/api/servicemesh/crdinstall/install.go similarity index 91% rename from pkg/apis/servicemesh/crdinstall/install.go rename to staging/src/kubesphere.io/api/servicemesh/crdinstall/install.go index 84d200da05..ae2cdd3245 100644 --- a/pkg/apis/servicemesh/crdinstall/install.go +++ b/staging/src/kubesphere.io/api/servicemesh/crdinstall/install.go @@ -20,7 +20,7 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" ) func Install(scheme *k8sruntime.Scheme) { diff --git a/pkg/apis/servicemesh/group.go b/staging/src/kubesphere.io/api/servicemesh/group.go similarity index 100% rename from pkg/apis/servicemesh/group.go rename to staging/src/kubesphere.io/api/servicemesh/group.go diff --git a/pkg/apis/servicemesh/v1alpha2/doc.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/doc.go similarity index 92% rename from pkg/apis/servicemesh/v1alpha2/doc.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/doc.go index ac654f02ab..eb15debe88 100644 --- a/pkg/apis/servicemesh/v1alpha2/doc.go +++ b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the servicemesh v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/servicemesh +// +k8s:conversion-gen=kubesphere.io/api/servicemesh // +k8s:defaulter-gen=TypeMeta // +groupName=servicemesh.kubesphere.io package v1alpha2 diff --git a/pkg/apis/servicemesh/v1alpha2/openapi_generated.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/openapi_generated.go similarity index 94% rename from pkg/apis/servicemesh/v1alpha2/openapi_generated.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/openapi_generated.go index 40301d7320..1abc7ef3da 100644 --- a/pkg/apis/servicemesh/v1alpha2/openapi_generated.go +++ b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/openapi_generated.go @@ -30,65 +30,65 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.DestinationRuleSpecTemplate": schema_pkg_apis_servicemesh_v1alpha2_DestinationRuleSpecTemplate(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicy": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicy(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicyCondition": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyCondition(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicyList": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyList(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicySpec": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicySpec(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicyStatus": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.Strategy": schema_pkg_apis_servicemesh_v1alpha2_Strategy(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategyCondition": schema_pkg_apis_servicemesh_v1alpha2_StrategyCondition(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategyList": schema_pkg_apis_servicemesh_v1alpha2_StrategyList(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategySpec": schema_pkg_apis_servicemesh_v1alpha2_StrategySpec(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategyStatus": schema_pkg_apis_servicemesh_v1alpha2_StrategyStatus(ref), - "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.VirtualServiceTemplateSpec": schema_pkg_apis_servicemesh_v1alpha2_VirtualServiceTemplateSpec(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "kubesphere.io/api/servicemesh/v1alpha2.DestinationRuleSpecTemplate": schema_pkg_apis_servicemesh_v1alpha2_DestinationRuleSpecTemplate(ref), + "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicy": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicy(ref), + "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicyCondition": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyCondition(ref), + "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicyList": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyList(ref), + "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicySpec": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicySpec(ref), + "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicyStatus": schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyStatus(ref), + "kubesphere.io/api/servicemesh/v1alpha2.Strategy": schema_pkg_apis_servicemesh_v1alpha2_Strategy(ref), + "kubesphere.io/api/servicemesh/v1alpha2.StrategyCondition": schema_pkg_apis_servicemesh_v1alpha2_StrategyCondition(ref), + "kubesphere.io/api/servicemesh/v1alpha2.StrategyList": schema_pkg_apis_servicemesh_v1alpha2_StrategyList(ref), + "kubesphere.io/api/servicemesh/v1alpha2.StrategySpec": schema_pkg_apis_servicemesh_v1alpha2_StrategySpec(ref), + "kubesphere.io/api/servicemesh/v1alpha2.StrategyStatus": schema_pkg_apis_servicemesh_v1alpha2_StrategyStatus(ref), + "kubesphere.io/api/servicemesh/v1alpha2.VirtualServiceTemplateSpec": schema_pkg_apis_servicemesh_v1alpha2_VirtualServiceTemplateSpec(ref), } } @@ -2221,19 +2221,19 @@ func schema_pkg_apis_servicemesh_v1alpha2_ServicePolicy(ref common.ReferenceCall }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicySpec"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.ServicePolicySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicyStatus"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.ServicePolicyStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicySpec", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicyStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicySpec", "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicyStatus"}, } } @@ -2324,7 +2324,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyList(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicy"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.ServicePolicy"), }, }, }, @@ -2335,7 +2335,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyList(ref common.Reference }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicy"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicy"}, } } @@ -2355,14 +2355,14 @@ func schema_pkg_apis_servicemesh_v1alpha2_ServicePolicySpec(ref common.Reference "template": { SchemaProps: spec.SchemaProps{ Description: "Template used to create a destination rule", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.DestinationRuleSpecTemplate"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.DestinationRuleSpecTemplate"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.DestinationRuleSpecTemplate"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector", "kubesphere.io/api/servicemesh/v1alpha2.DestinationRuleSpecTemplate"}, } } @@ -2380,7 +2380,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyStatus(ref common.Referen Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicyCondition"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.ServicePolicyCondition"), }, }, }, @@ -2402,7 +2402,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_ServicePolicyStatus(ref common.Referen }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Time", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.ServicePolicyCondition"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.Time", "kubesphere.io/api/servicemesh/v1alpha2.ServicePolicyCondition"}, } } @@ -2434,19 +2434,19 @@ func schema_pkg_apis_servicemesh_v1alpha2_Strategy(ref common.ReferenceCallback) }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategySpec"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.StrategySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategyStatus"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.StrategyStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategySpec", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategyStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/servicemesh/v1alpha2.StrategySpec", "kubesphere.io/api/servicemesh/v1alpha2.StrategyStatus"}, } } @@ -2537,7 +2537,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_StrategyList(ref common.ReferenceCallb Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.Strategy"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.Strategy"), }, }, }, @@ -2548,7 +2548,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_StrategyList(ref common.ReferenceCallb }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.Strategy"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/servicemesh/v1alpha2.Strategy"}, } } @@ -2589,7 +2589,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_StrategySpec(ref common.ReferenceCallb "template": { SchemaProps: spec.SchemaProps{ Description: "Template describes the virtual service that will be created.", - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.VirtualServiceTemplateSpec"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.VirtualServiceTemplateSpec"), }, }, "strategyPolicy": { @@ -2603,7 +2603,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_StrategySpec(ref common.ReferenceCallb }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.VirtualServiceTemplateSpec"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector", "kubesphere.io/api/servicemesh/v1alpha2.VirtualServiceTemplateSpec"}, } } @@ -2621,7 +2621,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_StrategyStatus(ref common.ReferenceCal Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategyCondition"), + Ref: ref("kubesphere.io/api/servicemesh/v1alpha2.StrategyCondition"), }, }, }, @@ -2643,7 +2643,7 @@ func schema_pkg_apis_servicemesh_v1alpha2_StrategyStatus(ref common.ReferenceCal }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Time", "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2.StrategyCondition"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.Time", "kubesphere.io/api/servicemesh/v1alpha2.StrategyCondition"}, } } diff --git a/pkg/apis/servicemesh/v1alpha2/register.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/register.go similarity index 95% rename from pkg/apis/servicemesh/v1alpha2/register.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/register.go index 88195f2df7..d762b69870 100644 --- a/pkg/apis/servicemesh/v1alpha2/register.go +++ b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the servicemesh v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/servicemesh +// +k8s:conversion-gen=kubesphere.io/api/servicemesh // +k8s:defaulter-gen=TypeMeta // +groupName=servicemesh.kubesphere.io package v1alpha2 diff --git a/pkg/apis/servicemesh/v1alpha2/servicepolicy_types.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types.go similarity index 100% rename from pkg/apis/servicemesh/v1alpha2/servicepolicy_types.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types.go diff --git a/pkg/apis/servicemesh/v1alpha2/servicepolicy_types_test.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types_test.go similarity index 100% rename from pkg/apis/servicemesh/v1alpha2/servicepolicy_types_test.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types_test.go diff --git a/pkg/apis/servicemesh/v1alpha2/strategy_types.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types.go similarity index 100% rename from pkg/apis/servicemesh/v1alpha2/strategy_types.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types.go diff --git a/pkg/apis/servicemesh/v1alpha2/strategy_types_test.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types_test.go similarity index 100% rename from pkg/apis/servicemesh/v1alpha2/strategy_types_test.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types_test.go diff --git a/pkg/apis/servicemesh/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/v1alpha2_suite_test.go similarity index 100% rename from pkg/apis/servicemesh/v1alpha2/v1alpha2_suite_test.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/v1alpha2_suite_test.go diff --git a/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/servicemesh/v1alpha2/zz_generated.deepcopy.go index c9cdd094f6..9552e52048 100644 --- a/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go +++ b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/storage/crdinstall/install.go b/staging/src/kubesphere.io/api/storage/crdinstall/install.go similarity index 92% rename from pkg/apis/storage/crdinstall/install.go rename to staging/src/kubesphere.io/api/storage/crdinstall/install.go index 712b4860e4..17a1f59fca 100644 --- a/pkg/apis/storage/crdinstall/install.go +++ b/staging/src/kubesphere.io/api/storage/crdinstall/install.go @@ -21,7 +21,7 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" - storagev1alpha1 "kubesphere.io/kubesphere/pkg/apis/storage/v1alpha1" + storagev1alpha1 "kubesphere.io/api/storage/v1alpha1" ) func Install(scheme *k8sruntime.Scheme) { diff --git a/pkg/apis/storage/group.go b/staging/src/kubesphere.io/api/storage/group.go similarity index 100% rename from pkg/apis/storage/group.go rename to staging/src/kubesphere.io/api/storage/group.go diff --git a/pkg/apis/storage/v1alpha1/capability_types.go b/staging/src/kubesphere.io/api/storage/v1alpha1/capability_types.go similarity index 100% rename from pkg/apis/storage/v1alpha1/capability_types.go rename to staging/src/kubesphere.io/api/storage/v1alpha1/capability_types.go diff --git a/pkg/apis/storage/v1alpha1/doc.go b/staging/src/kubesphere.io/api/storage/v1alpha1/doc.go similarity index 92% rename from pkg/apis/storage/v1alpha1/doc.go rename to staging/src/kubesphere.io/api/storage/v1alpha1/doc.go index 4ba80557df..390950246c 100644 --- a/pkg/apis/storage/v1alpha1/doc.go +++ b/staging/src/kubesphere.io/api/storage/v1alpha1/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/storage +// +k8s:conversion-gen=kubesphere.io/api/storage // +k8s:defaulter-gen=TypeMeta // +groupName=storage.kubesphere.io package v1alpha1 diff --git a/pkg/apis/storage/v1alpha1/register.go b/staging/src/kubesphere.io/api/storage/v1alpha1/register.go similarity index 95% rename from pkg/apis/storage/v1alpha1/register.go rename to staging/src/kubesphere.io/api/storage/v1alpha1/register.go index 66eb9422f9..87a6574d38 100644 --- a/pkg/apis/storage/v1alpha1/register.go +++ b/staging/src/kubesphere.io/api/storage/v1alpha1/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the storage v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/storage +// +k8s:conversion-gen=kubesphere.io/api/storage // +k8s:defaulter-gen=TypeMeta // +groupName=storage.kubesphere.io package v1alpha1 diff --git a/pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/storage/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/storage/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/tenant/crdinstall/install.go b/staging/src/kubesphere.io/api/tenant/crdinstall/install.go similarity index 88% rename from pkg/apis/tenant/crdinstall/install.go rename to staging/src/kubesphere.io/api/tenant/crdinstall/install.go index bf62f0f192..a1a2494f74 100644 --- a/pkg/apis/tenant/crdinstall/install.go +++ b/staging/src/kubesphere.io/api/tenant/crdinstall/install.go @@ -20,8 +20,8 @@ import ( k8sruntime "k8s.io/apimachinery/pkg/runtime" urlruntime "k8s.io/apimachinery/pkg/util/runtime" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" ) func Install(scheme *k8sruntime.Scheme) { diff --git a/pkg/apis/tenant/group.go b/staging/src/kubesphere.io/api/tenant/group.go similarity index 100% rename from pkg/apis/tenant/group.go rename to staging/src/kubesphere.io/api/tenant/group.go diff --git a/pkg/apis/tenant/v1alpha1/doc.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/doc.go similarity index 92% rename from pkg/apis/tenant/v1alpha1/doc.go rename to staging/src/kubesphere.io/api/tenant/v1alpha1/doc.go index 35e734bff9..64859094e0 100644 --- a/pkg/apis/tenant/v1alpha1/doc.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha1/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the tenant v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/tenant +// +k8s:conversion-gen=kubesphere.io/api/tenant // +k8s:defaulter-gen=TypeMeta // +groupName=tenant.kubesphere.io package v1alpha1 diff --git a/pkg/apis/tenant/v1alpha1/openapi_generated.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/openapi_generated.go similarity index 97% rename from pkg/apis/tenant/v1alpha1/openapi_generated.go rename to staging/src/kubesphere.io/api/tenant/v1alpha1/openapi_generated.go index af2fd75404..2e179afb73 100644 --- a/pkg/apis/tenant/v1alpha1/openapi_generated.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha1/openapi_generated.go @@ -30,57 +30,57 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.Workspace": schema_pkg_apis_tenant_v1alpha1_Workspace(ref), - "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.WorkspaceList": schema_pkg_apis_tenant_v1alpha1_WorkspaceList(ref), - "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.WorkspaceSpec": schema_pkg_apis_tenant_v1alpha1_WorkspaceSpec(ref), - "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.WorkspaceStatus": schema_pkg_apis_tenant_v1alpha1_WorkspaceStatus(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "kubesphere.io/api/tenant/v1alpha1.Workspace": schema_pkg_apis_tenant_v1alpha1_Workspace(ref), + "kubesphere.io/api/tenant/v1alpha1.WorkspaceList": schema_pkg_apis_tenant_v1alpha1_WorkspaceList(ref), + "kubesphere.io/api/tenant/v1alpha1.WorkspaceSpec": schema_pkg_apis_tenant_v1alpha1_WorkspaceSpec(ref), + "kubesphere.io/api/tenant/v1alpha1.WorkspaceStatus": schema_pkg_apis_tenant_v1alpha1_WorkspaceStatus(ref), } } @@ -2187,19 +2187,19 @@ func schema_pkg_apis_tenant_v1alpha1_Workspace(ref common.ReferenceCallback) com }, "spec": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.WorkspaceSpec"), + Ref: ref("kubesphere.io/api/tenant/v1alpha1.WorkspaceSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.WorkspaceStatus"), + Ref: ref("kubesphere.io/api/tenant/v1alpha1.WorkspaceStatus"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.WorkspaceSpec", "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.WorkspaceStatus"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kubesphere.io/api/tenant/v1alpha1.WorkspaceSpec", "kubesphere.io/api/tenant/v1alpha1.WorkspaceStatus"}, } } @@ -2235,7 +2235,7 @@ func schema_pkg_apis_tenant_v1alpha1_WorkspaceList(ref common.ReferenceCallback) Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.Workspace"), + Ref: ref("kubesphere.io/api/tenant/v1alpha1.Workspace"), }, }, }, @@ -2246,7 +2246,7 @@ func schema_pkg_apis_tenant_v1alpha1_WorkspaceList(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1.Workspace"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "kubesphere.io/api/tenant/v1alpha1.Workspace"}, } } diff --git a/pkg/apis/tenant/v1alpha1/register.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/register.go similarity index 95% rename from pkg/apis/tenant/v1alpha1/register.go rename to staging/src/kubesphere.io/api/tenant/v1alpha1/register.go index 30d7a7b233..1023495f0d 100644 --- a/pkg/apis/tenant/v1alpha1/register.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha1/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha1 contains API Schema definitions for the tenant v1alpha1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/tenant +// +k8s:conversion-gen=kubesphere.io/api/tenant // +k8s:defaulter-gen=TypeMeta // +groupName=tenant.kubesphere.io package v1alpha1 diff --git a/pkg/apis/tenant/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/v1alpha1_suite_test.go similarity index 100% rename from pkg/apis/tenant/v1alpha1/v1alpha1_suite_test.go rename to staging/src/kubesphere.io/api/tenant/v1alpha1/v1alpha1_suite_test.go diff --git a/pkg/apis/tenant/v1alpha1/workspace_types.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types.go similarity index 100% rename from pkg/apis/tenant/v1alpha1/workspace_types.go rename to staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types.go diff --git a/pkg/apis/tenant/v1alpha1/workspace_types_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types_test.go similarity index 100% rename from pkg/apis/tenant/v1alpha1/workspace_types_test.go rename to staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types_test.go diff --git a/pkg/apis/tenant/v1alpha1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/tenant/v1alpha1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/tenant/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/tenant/v1alpha2/doc.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/doc.go similarity index 92% rename from pkg/apis/tenant/v1alpha2/doc.go rename to staging/src/kubesphere.io/api/tenant/v1alpha2/doc.go index bf75414733..9720e480f3 100644 --- a/pkg/apis/tenant/v1alpha2/doc.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha2/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the tenant v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/tenant +// +k8s:conversion-gen=kubesphere.io/api/tenant // +k8s:defaulter-gen=TypeMeta // +groupName=tenant.kubesphere.io package v1alpha2 diff --git a/pkg/apis/tenant/v1alpha2/register.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/register.go similarity index 95% rename from pkg/apis/tenant/v1alpha2/register.go rename to staging/src/kubesphere.io/api/tenant/v1alpha2/register.go index 36549793d5..4af0e83f40 100644 --- a/pkg/apis/tenant/v1alpha2/register.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha2/register.go @@ -19,7 +19,7 @@ limitations under the License. // Package v1alpha2 contains API Schema definitions for the tenant v1alpha2 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/tenant +// +k8s:conversion-gen=kubesphere.io/api/tenant // +k8s:defaulter-gen=TypeMeta // +groupName=tenant.kubesphere.io package v1alpha2 diff --git a/pkg/apis/tenant/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/v1alpha2_suite_test.go similarity index 100% rename from pkg/apis/tenant/v1alpha2/v1alpha2_suite_test.go rename to staging/src/kubesphere.io/api/tenant/v1alpha2/v1alpha2_suite_test.go diff --git a/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types.go similarity index 96% rename from pkg/apis/tenant/v1alpha2/workspacetemplate_types.go rename to staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types.go index 792e9beb1a..c7431afe21 100644 --- a/pkg/apis/tenant/v1alpha2/workspacetemplate_types.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types.go @@ -19,7 +19,7 @@ package v1alpha2 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - typesv1alpha1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + typesv1alpha1 "kubesphere.io/api/types/v1beta1" ) const ( diff --git a/pkg/apis/tenant/v1alpha2/workspacetemplate_types_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types_test.go similarity index 100% rename from pkg/apis/tenant/v1alpha2/workspacetemplate_types_test.go rename to staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types_test.go diff --git a/pkg/apis/tenant/v1alpha2/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/tenant/v1alpha2/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/tenant/v1alpha2/zz_generated.deepcopy.go diff --git a/pkg/apis/types/group.go b/staging/src/kubesphere.io/api/types/group.go similarity index 100% rename from pkg/apis/types/group.go rename to staging/src/kubesphere.io/api/types/group.go diff --git a/pkg/apis/types/v1beta1/doc.go b/staging/src/kubesphere.io/api/types/v1beta1/doc.go similarity index 91% rename from pkg/apis/types/v1beta1/doc.go rename to staging/src/kubesphere.io/api/types/v1beta1/doc.go index 0e8bd835da..08bec60eae 100644 --- a/pkg/apis/types/v1beta1/doc.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/doc.go @@ -16,7 +16,7 @@ limitations under the License. // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/types +// +k8s:conversion-gen=kubesphere.io/api/types // +k8s:defaulter-gen=TypeMeta // +groupName=types.kubefed.io package v1beta1 diff --git a/pkg/apis/types/v1beta1/federatedapplication_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedapplication_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedapplication_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedapplication_types.go diff --git a/pkg/apis/types/v1beta1/federatedclusterrole_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedclusterrole_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedclusterrole_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedclusterrole_types.go diff --git a/pkg/apis/types/v1beta1/federatedclusterrolebinding_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedclusterrolebinding_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedclusterrolebinding_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedclusterrolebinding_types.go diff --git a/pkg/apis/types/v1beta1/federatedconfigmap_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedconfigmap_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedconfigmap_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedconfigmap_types.go diff --git a/pkg/apis/types/v1beta1/federateddeployment_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federateddeployment_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federateddeployment_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federateddeployment_types.go diff --git a/pkg/apis/types/v1beta1/federatedgroup_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedgroup_types.go similarity index 97% rename from pkg/apis/types/v1beta1/federatedgroup_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedgroup_types.go index eacb13e70f..29ccb66ec4 100644 --- a/pkg/apis/types/v1beta1/federatedgroup_types.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/federatedgroup_types.go @@ -19,7 +19,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/api/iam/v1alpha2" ) const ( diff --git a/pkg/apis/types/v1beta1/federatedgroupbinding_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedgroupbinding_types.go similarity index 97% rename from pkg/apis/types/v1beta1/federatedgroupbinding_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedgroupbinding_types.go index bd6f9175bb..d6fbfedc8f 100644 --- a/pkg/apis/types/v1beta1/federatedgroupbinding_types.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/federatedgroupbinding_types.go @@ -19,7 +19,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/api/iam/v1alpha2" ) const ( diff --git a/pkg/apis/types/v1beta1/federatedingress_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedingress_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedingress_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedingress_types.go diff --git a/pkg/apis/types/v1beta1/federatedjob_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedjob_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedjob_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedjob_types.go diff --git a/pkg/apis/types/v1beta1/federatedlimitrange_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedlimitrange_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedlimitrange_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedlimitrange_types.go diff --git a/pkg/apis/types/v1beta1/federatednamespace_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatednamespace_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatednamespace_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatednamespace_types.go diff --git a/pkg/apis/types/v1beta1/federatednotificationconfig_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatednotificationconfig_types.go similarity index 97% rename from pkg/apis/types/v1beta1/federatednotificationconfig_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatednotificationconfig_types.go index f2d4892f5f..f7823a9185 100644 --- a/pkg/apis/types/v1beta1/federatednotificationconfig_types.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/federatednotificationconfig_types.go @@ -19,7 +19,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + "kubesphere.io/api/notification/v2beta1" ) const ( diff --git a/pkg/apis/types/v1beta1/federatednotificationreceiver_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatednotificationreceiver_types.go similarity index 97% rename from pkg/apis/types/v1beta1/federatednotificationreceiver_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatednotificationreceiver_types.go index 556ab728a9..6c2d56c348 100644 --- a/pkg/apis/types/v1beta1/federatednotificationreceiver_types.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/federatednotificationreceiver_types.go @@ -19,7 +19,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/apis/notification/v2beta1" + "kubesphere.io/api/notification/v2beta1" ) const ( diff --git a/pkg/apis/types/v1beta1/federatedpersistentvolumeclaim_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedpersistentvolumeclaim_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedpersistentvolumeclaim_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedpersistentvolumeclaim_types.go diff --git a/pkg/apis/types/v1beta1/federatedresourcequota_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedresourcequota_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedresourcequota_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedresourcequota_types.go diff --git a/pkg/apis/types/v1beta1/federatedsecret_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedsecret_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedsecret_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedsecret_types.go diff --git a/pkg/apis/types/v1beta1/federatedservice_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedservice_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedservice_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedservice_types.go diff --git a/pkg/apis/types/v1beta1/federatedstatefulset_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedstatefulset_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedstatefulset_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedstatefulset_types.go diff --git a/pkg/apis/types/v1beta1/federateduser_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federateduser_types.go similarity index 97% rename from pkg/apis/types/v1beta1/federateduser_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federateduser_types.go index d0d730252a..0e36c9b9f8 100644 --- a/pkg/apis/types/v1beta1/federateduser_types.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/federateduser_types.go @@ -19,7 +19,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/api/iam/v1alpha2" ) const ( diff --git a/pkg/apis/types/v1beta1/federatedworkspace_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedworkspace_types.go similarity index 96% rename from pkg/apis/types/v1beta1/federatedworkspace_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedworkspace_types.go index 04e1576ed1..e885eaa178 100644 --- a/pkg/apis/types/v1beta1/federatedworkspace_types.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/federatedworkspace_types.go @@ -19,7 +19,7 @@ package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - workspacev1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + workspacev1alpha1 "kubesphere.io/api/tenant/v1alpha1" ) const ( diff --git a/pkg/apis/types/v1beta1/federatedworkspacerole_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedworkspacerole_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedworkspacerole_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedworkspacerole_types.go diff --git a/pkg/apis/types/v1beta1/federatedworkspacerolebinding_types.go b/staging/src/kubesphere.io/api/types/v1beta1/federatedworkspacerolebinding_types.go similarity index 100% rename from pkg/apis/types/v1beta1/federatedworkspacerolebinding_types.go rename to staging/src/kubesphere.io/api/types/v1beta1/federatedworkspacerolebinding_types.go diff --git a/pkg/apis/types/v1beta1/register.go b/staging/src/kubesphere.io/api/types/v1beta1/register.go similarity index 97% rename from pkg/apis/types/v1beta1/register.go rename to staging/src/kubesphere.io/api/types/v1beta1/register.go index 2016a51461..c2ab1051ee 100644 --- a/pkg/apis/types/v1beta1/register.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/register.go @@ -18,7 +18,7 @@ limitations under the License. // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/types +// +k8s:conversion-gen=kubesphere.io/api/types // +k8s:defaulter-gen=TypeMeta // +groupName=types.kubefed.io package v1beta1 diff --git a/pkg/apis/types/v1beta1/types.go b/staging/src/kubesphere.io/api/types/v1beta1/types.go similarity index 100% rename from pkg/apis/types/v1beta1/types.go rename to staging/src/kubesphere.io/api/types/v1beta1/types.go diff --git a/pkg/apis/types/v1beta1/zz_generated.deepcopy.go b/staging/src/kubesphere.io/api/types/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from pkg/apis/types/v1beta1/zz_generated.deepcopy.go rename to staging/src/kubesphere.io/api/types/v1beta1/zz_generated.deepcopy.go index 87d37a8c88..29ac85c4f9 100644 --- a/pkg/apis/types/v1beta1/zz_generated.deepcopy.go +++ b/staging/src/kubesphere.io/api/types/v1beta1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/test/e2e/framework/iam/fixtures.go b/test/e2e/framework/iam/fixtures.go index 66738663e5..7e421ffc7a 100644 --- a/test/e2e/framework/iam/fixtures.go +++ b/test/e2e/framework/iam/fixtures.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" "kubesphere.io/client-go/client" ) diff --git a/test/e2e/framework/workspace/fixtures.go b/test/e2e/framework/workspace/fixtures.go index 347a16e652..5784467b9d 100644 --- a/test/e2e/framework/workspace/fixtures.go +++ b/test/e2e/framework/workspace/fixtures.go @@ -19,9 +19,9 @@ package workspace import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" - tenantv1alpha2 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha2" - fedb1 "kubesphere.io/kubesphere/pkg/apis/types/v1beta1" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" + tenantv1alpha2 "kubesphere.io/api/tenant/v1alpha2" + fedb1 "kubesphere.io/api/types/v1beta1" "context" diff --git a/test/e2e/groups.go b/test/e2e/groups.go index f4a69c5f42..1f3a0db6d1 100644 --- a/test/e2e/groups.go +++ b/test/e2e/groups.go @@ -25,7 +25,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "kubesphere.io/client-go/client" - "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/test/e2e/constant" "kubesphere.io/kubesphere/test/e2e/framework" "kubesphere.io/kubesphere/test/e2e/framework/iam" diff --git a/test/e2e/help_test.go b/test/e2e/help_test.go new file mode 100644 index 0000000000..784b8c9e43 --- /dev/null +++ b/test/e2e/help_test.go @@ -0,0 +1,39 @@ +package e2e + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/rest" + "kubesphere.io/client-go/client" + "kubesphere.io/client-go/client/generic" +) + +func TestDelayingDeliverer(t *testing.T) { + + config := &rest.Config{ + Host: "http://127.0.0.1:9090", + Username: "tester", + Password: "P@88w0rd", + } + + sch := runtime.NewScheme() + v1.AddToScheme(sch) + c, _ := generic.New(config, client.Options{Scheme: sch}) + + // sar := &authv1.SelfSubjectRulesReview{ + // Spec: authv1.SelfSubjectRulesReviewSpec{ + // Namespace: "kube-system", + // }, + // } + // err := c.Create(context.TODO(), sar) + + pods := &v1.PodList{} + + err := c.List(context.TODO(), pods) + + assert.Nil(t, err) +} diff --git a/test/e2e/workspaces.go b/test/e2e/workspaces.go index 0c7a128e5a..0038190834 100644 --- a/test/e2e/workspaces.go +++ b/test/e2e/workspaces.go @@ -24,7 +24,8 @@ import ( . "github.com/onsi/gomega" "kubesphere.io/client-go/client" - iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2" + iamv1alpha2 "kubesphere.io/api/iam/v1alpha2" + "kubesphere.io/kubesphere/test/e2e/framework" "kubesphere.io/kubesphere/test/e2e/framework/iam" "kubesphere.io/kubesphere/test/e2e/framework/workspace" diff --git a/tools/cmd/crd-doc-gen/main.go b/tools/cmd/crd-doc-gen/main.go index 3d8aa55ab0..7781d879b0 100644 --- a/tools/cmd/crd-doc-gen/main.go +++ b/tools/cmd/crd-doc-gen/main.go @@ -26,9 +26,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" urlruntime "k8s.io/apimachinery/pkg/util/runtime" - applicationv1alpha1 "kubesphere.io/kubesphere/pkg/apis/application/v1alpha1" - clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1" - devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" + applicationv1alpha1 "kubesphere.io/api/application/v1alpha1" + clusterv1alpha1 "kubesphere.io/api/cluster/v1alpha1" + devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3" + "kubesphere.io/kubesphere/pkg/version" "kubesphere.io/kubesphere/tools/lib" @@ -38,15 +39,15 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/kube-openapi/pkg/common" - applicationinstall "kubesphere.io/kubesphere/pkg/apis/application/crdinstall" - devopsinstall "kubesphere.io/kubesphere/pkg/apis/devops/crdinstall" - devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" - networkinstall "kubesphere.io/kubesphere/pkg/apis/network/crdinstall" - networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" - servicemeshinstall "kubesphere.io/kubesphere/pkg/apis/servicemesh/crdinstall" - servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" - tenantinstall "kubesphere.io/kubesphere/pkg/apis/tenant/crdinstall" - tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" + applicationinstall "kubesphere.io/api/application/crdinstall" + devopsinstall "kubesphere.io/api/devops/crdinstall" + devopsv1alpha1 "kubesphere.io/api/devops/v1alpha1" + networkinstall "kubesphere.io/api/network/crdinstall" + networkv1alpha1 "kubesphere.io/api/network/v1alpha1" + servicemeshinstall "kubesphere.io/api/servicemesh/crdinstall" + servicemeshv1alpha2 "kubesphere.io/api/servicemesh/v1alpha2" + tenantinstall "kubesphere.io/api/tenant/crdinstall" + tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1" ) var output string diff --git a/vendor/kubesphere.io/api b/vendor/kubesphere.io/api new file mode 120000 index 0000000000..be49cf9bfa --- /dev/null +++ b/vendor/kubesphere.io/api @@ -0,0 +1 @@ +../../staging/src/kubesphere.io/api \ No newline at end of file diff --git a/vendor/modules.txt b/vendor/modules.txt index 408434b93b..81a00a3473 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1585,6 +1585,27 @@ k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/strings k8s.io/utils/trace +# kubesphere.io/api v0.0.0 => ./staging/src/kubesphere.io/api +kubesphere.io/api/application/crdinstall +kubesphere.io/api/application/v1alpha1 +kubesphere.io/api/auditing/v1alpha1 +kubesphere.io/api/cluster/v1alpha1 +kubesphere.io/api/devops/crdinstall +kubesphere.io/api/devops/v1alpha1 +kubesphere.io/api/devops/v1alpha3 +kubesphere.io/api/iam/v1alpha2 +kubesphere.io/api/network/calicov3 +kubesphere.io/api/network/crdinstall +kubesphere.io/api/network/v1alpha1 +kubesphere.io/api/notification/v2beta1 +kubesphere.io/api/quota/v1alpha2 +kubesphere.io/api/servicemesh/crdinstall +kubesphere.io/api/servicemesh/v1alpha2 +kubesphere.io/api/storage/v1alpha1 +kubesphere.io/api/tenant/crdinstall +kubesphere.io/api/tenant/v1alpha1 +kubesphere.io/api/tenant/v1alpha2 +kubesphere.io/api/types/v1beta1 # kubesphere.io/client-go v0.0.0 => ./staging/src/kubesphere.io/client-go kubesphere.io/client-go/client kubesphere.io/client-go/client/generic