Remove pre-CRD network APIs

openshift · Apr 6, 2019 · e721893 · e721893
1 parent 754d808
commit e721893
Show file tree

Hide file tree

Showing 24 changed files with 150 additions and 2,158 deletions.
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -263,19 +263,6 @@
     ]
   },
 
-  {
-    "checkedPackages": [
-      "github.com/openshift/origin/pkg/network/apis/network",
-      "github.com/openshift/origin/pkg/network/apis/network/v1"
-    ],
-    "allowedImportPackageRoots": [
-      "vendor/k8s.io/apimachinery",
-      "vendor/k8s.io/api",
-      "vendor/github.com/openshift/api"
-    ],
-    "allowedImportPackages": []
-  },
-
   {
     "checkedPackages": [
       "github.com/openshift/origin/pkg/oauth/apis/oauth",

diff --git a/hack/update-generated-conversions.sh b/hack/update-generated-conversions.sh
@@ -15,7 +15,6 @@ ALL_FQ_APIS=(
     github.com/openshift/origin/pkg/build/apis/build/v1
     github.com/openshift/origin/pkg/cmd/server/apis/config/v1
     github.com/openshift/origin/pkg/image/apis/image/v1
-    github.com/openshift/origin/pkg/network/apis/network/v1
     github.com/openshift/origin/pkg/oauth/apis/oauth/v1
     github.com/openshift/origin/pkg/project/apis/project/v1
     github.com/openshift/origin/pkg/quota/apis/quota/v1

diff --git a/hack/update-generated-deep-copies.sh b/hack/update-generated-deep-copies.sh
@@ -36,7 +36,6 @@ ALL_FQ_APIS=(
     github.com/openshift/origin/pkg/authorization/apis/authorization
     github.com/openshift/origin/pkg/build/apis/build
     github.com/openshift/origin/pkg/image/apis/image
-    github.com/openshift/origin/pkg/network/apis/network
     github.com/openshift/origin/pkg/oauth/apis/oauth
     github.com/openshift/origin/pkg/project/apis/project
     github.com/openshift/origin/pkg/quota/apis/quota

diff --git a/hack/update-generated-defaulters.sh b/hack/update-generated-defaulters.sh
@@ -15,7 +15,6 @@ ALL_FQ_APIS=(
     github.com/openshift/origin/pkg/build/apis/build/v1
     github.com/openshift/origin/pkg/cmd/server/apis/config/v1
     github.com/openshift/origin/pkg/image/apis/image/v1
-    github.com/openshift/origin/pkg/network/apis/network/v1
     github.com/openshift/origin/pkg/oauth/apis/oauth/v1
     github.com/openshift/origin/pkg/project/apis/project/v1
     github.com/openshift/origin/pkg/quota/apis/quota/v1

diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go
@@ -30,7 +30,6 @@ import (
 	authz "github.com/openshift/origin/pkg/authorization/apis/authorization/install"
 	build "github.com/openshift/origin/pkg/build/apis/build/install"
 	image "github.com/openshift/origin/pkg/image/apis/image/install"
-	network "github.com/openshift/origin/pkg/network/apis/network/install"
 	oauth "github.com/openshift/origin/pkg/oauth/apis/oauth/install"
 	project "github.com/openshift/origin/pkg/project/apis/project/install"
 	quota "github.com/openshift/origin/pkg/quota/apis/quota/install"
@@ -45,7 +44,6 @@ func InstallInternalOpenShift(scheme *runtime.Scheme) {
 	authz.Install(scheme)
 	build.Install(scheme)
 	image.Install(scheme)
-	network.Install(scheme)
 	oauth.Install(scheme)
 	project.Install(scheme)
 	quota.Install(scheme)

diff --git a/pkg/api/legacy/install.go b/pkg/api/legacy/install.go
@@ -31,7 +31,6 @@ func InstallInternalLegacyAll(scheme *runtime.Scheme) {
 	InstallInternalLegacyAuthorization(scheme)
 	InstallInternalLegacyBuild(scheme)
 	InstallInternalLegacyImage(scheme)
-	InstallInternalLegacyNetwork(scheme)
 	InstallInternalLegacyOAuth(scheme)
 	InstallInternalLegacyProject(scheme)
 	InstallInternalLegacyQuota(scheme)

diff --git a/pkg/api/legacy/network.go b/pkg/api/legacy/network.go
@@ -5,24 +5,10 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 
 	networkv1 "github.com/openshift/api/network/v1"
-	"github.com/openshift/origin/pkg/network/apis/network"
-	networkv1helpers "github.com/openshift/origin/pkg/network/apis/network/v1"
 )
 
 // InstallLegacyNetwork this looks like a lot of duplication, but the code in the individual versions is living and may
 // change. The code here should never change and needs to allow the other code to move independently.
-func InstallInternalLegacyNetwork(scheme *runtime.Scheme) {
-	InstallExternalLegacyNetwork(scheme)
-
-	schemeBuilder := runtime.NewSchemeBuilder(
-		addUngroupifiedInternalNetworkTypes,
-
-		networkv1helpers.RegisterDefaults,
-		networkv1helpers.RegisterConversions,
-	)
-	utilruntime.Must(schemeBuilder.AddToScheme(scheme))
-}
-
 func InstallExternalLegacyNetwork(scheme *runtime.Scheme) {
 	schemeBuilder := runtime.NewSchemeBuilder(
 		addUngroupifiedNetworkTypes,
@@ -44,17 +30,3 @@ func addUngroupifiedNetworkTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(GroupVersion, types...)
 	return nil
 }
-
-func addUngroupifiedInternalNetworkTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(InternalGroupVersion,
-		&network.ClusterNetwork{},
-		&network.ClusterNetworkList{},
-		&network.HostSubnet{},
-		&network.HostSubnetList{},
-		&network.NetNamespace{},
-		&network.NetNamespaceList{},
-		&network.EgressNetworkPolicy{},
-		&network.EgressNetworkPolicyList{},
-	)
-	return nil
-}
diff --git a/pkg/api/legacygroupification/groupification.go b/pkg/api/legacygroupification/groupification.go
@@ -21,7 +21,6 @@ import (
 	"github.com/openshift/origin/pkg/authorization/apis/authorization"
 	"github.com/openshift/origin/pkg/build/apis/build"
 	"github.com/openshift/origin/pkg/image/apis/image"
-	"github.com/openshift/origin/pkg/network/apis/network"
 	"github.com/openshift/origin/pkg/oauth/apis/oauth"
 	"github.com/openshift/origin/pkg/project/apis/project"
 	"github.com/openshift/origin/pkg/quota/apis/quota"
@@ -110,11 +109,11 @@ func OAPIToGroupified(uncast runtime.Object, gvk *schema.GroupVersionKind) {
 		gvk.Group = image.GroupName
 		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
-	case *network.ClusterNetwork, *networkv1.ClusterNetwork, *network.ClusterNetworkList, *networkv1.ClusterNetworkList,
-		*network.NetNamespace, *networkv1.NetNamespace, *network.NetNamespaceList, *networkv1.NetNamespaceList,
-		*network.HostSubnet, *networkv1.HostSubnet, *network.HostSubnetList, *networkv1.HostSubnetList,
-		*network.EgressNetworkPolicy, *networkv1.EgressNetworkPolicy, *network.EgressNetworkPolicyList, *networkv1.EgressNetworkPolicyList:
-		gvk.Group = network.GroupName
+	case *networkv1.ClusterNetwork, *networkv1.ClusterNetworkList,
+		*networkv1.NetNamespace, *networkv1.NetNamespaceList,
+		*networkv1.HostSubnet, *networkv1.HostSubnetList,
+		*networkv1.EgressNetworkPolicy, *networkv1.EgressNetworkPolicyList:
+		gvk.Group = networkv1.GroupName
 		uncast.GetObjectKind().SetGroupVersionKind(*gvk)
 
 	case *project.Project, *projectv1.Project, *project.ProjectList, *projectv1.ProjectList,

diff --git a/pkg/api/validation/register.go b/pkg/api/validation/register.go
@@ -5,7 +5,6 @@ import (
 	authorizationvalidation "github.com/openshift/origin/pkg/authorization/apis/authorization/validation"
 	buildvalidation "github.com/openshift/origin/pkg/build/apis/build/validation"
 	imagevalidation "github.com/openshift/origin/pkg/image/apis/image/validation"
-	sdnvalidation "github.com/openshift/origin/pkg/network/apis/network/validation"
 	oauthvalidation "github.com/openshift/origin/pkg/oauth/apis/oauth/validation"
 	projectvalidation "github.com/openshift/origin/pkg/project/apis/project/validation"
 	quotavalidation "github.com/openshift/origin/pkg/quota/apis/quota/validation"
@@ -18,7 +17,6 @@ import (
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
-	networkapi "github.com/openshift/origin/pkg/network/apis/network"
 	oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
 	projectapi "github.com/openshift/origin/pkg/project/apis/project"
 	quotaapi "github.com/openshift/origin/pkg/quota/apis/quota"
@@ -77,11 +75,6 @@ func registerAll() {
 
 	Validator.MustRegister(&routeapi.Route{}, true, routevalidation.ValidateRoute, routevalidation.ValidateRouteUpdate)
 
-	Validator.MustRegister(&networkapi.ClusterNetwork{}, false, sdnvalidation.ValidateClusterNetwork, sdnvalidation.ValidateClusterNetworkUpdate)
-	Validator.MustRegister(&networkapi.HostSubnet{}, false, sdnvalidation.ValidateHostSubnet, sdnvalidation.ValidateHostSubnetUpdate)
-	Validator.MustRegister(&networkapi.NetNamespace{}, false, sdnvalidation.ValidateNetNamespace, sdnvalidation.ValidateNetNamespaceUpdate)
-	Validator.MustRegister(&networkapi.EgressNetworkPolicy{}, true, sdnvalidation.ValidateEgressNetworkPolicy, sdnvalidation.ValidateEgressNetworkPolicyUpdate)
-
 	Validator.MustRegister(&templateapi.Template{}, true, templatevalidation.ValidateTemplate, templatevalidation.ValidateTemplateUpdate)
 	Validator.MustRegister(&templateapi.TemplateInstance{}, true, templatevalidation.ValidateTemplateInstance, templatevalidation.ValidateTemplateInstanceUpdate)
 	Validator.MustRegister(&templateapi.BrokerTemplateInstance{}, false, templatevalidation.ValidateBrokerTemplateInstance, templatevalidation.ValidateBrokerTemplateInstanceUpdate)

diff --git a/pkg/network/apis/network/doc.go b/pkg/network/apis/network/doc.go
diff --git a/pkg/network/apis/network/install/install.go b/pkg/network/apis/network/install/install.go
diff --git a/pkg/network/apis/network/plugin.go b/pkg/network/apis/network/plugin.go
diff --git a/pkg/network/apis/network/register.go b/pkg/network/apis/network/register.go
diff --git a/pkg/network/apis/network/types.go b/pkg/network/apis/network/types.go
diff --git a/pkg/network/apis/network/v1/doc.go b/pkg/network/apis/network/v1/doc.go