Revert "Introduce APIs to support multiple ClusterCIDRs (kubernetes#1…

…08290)" This reverts commit b9792a9.
muyangren2 · Jul 14, 2022 · d76fbd5 · d76fbd5
1 parent 46a1efc
commit d76fbd5
Show file tree

Hide file tree

Showing 98 changed files with 1 addition and 8,740 deletions.
diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list
@@ -393,8 +393,6 @@ API rule violation: names_match,k8s.io/api/core/v1,RBDVolumeSource,RBDPool
 API rule violation: names_match,k8s.io/api/core/v1,RBDVolumeSource,RadosUser
 API rule violation: names_match,k8s.io/api/core/v1,VolumeSource,CephFS
 API rule violation: names_match,k8s.io/api/core/v1,VolumeSource,StorageOS
-API rule violation: names_match,k8s.io/api/networking/v1alpha1,ClusterCIDRConfigSpec,IPv4CIDR
-API rule violation: names_match,k8s.io/api/networking/v1alpha1,ClusterCIDRConfigSpec,IPv6CIDR
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSON,Raw
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/openapi-spec/v3/api__v1_openapi.json b/api/openapi-spec/v3/api__v1_openapi.json
@@ -8167,11 +8167,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -8876,11 +8871,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__admissionregistration.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__admissionregistration.k8s.io__v1_openapi.json
@@ -774,11 +774,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1478,11 +1473,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__apiextensions.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__apiextensions.k8s.io__v1_openapi.json
@@ -1163,11 +1163,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1810,11 +1805,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__apps__v1_openapi.json b/api/openapi-spec/v3/apis__apps__v1_openapi.json
@@ -5165,11 +5165,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -5869,11 +5864,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__autoscaling__v1_openapi.json b/api/openapi-spec/v3/apis__autoscaling__v1_openapi.json
@@ -533,11 +533,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1180,11 +1175,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__autoscaling__v2_openapi.json b/api/openapi-spec/v3/apis__autoscaling__v2_openapi.json
@@ -1186,11 +1186,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1890,11 +1885,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__autoscaling__v2beta1_openapi.json b/api/openapi-spec/v3/apis__autoscaling__v2beta1_openapi.json
@@ -1080,11 +1080,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1784,11 +1779,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__autoscaling__v2beta2_openapi.json b/api/openapi-spec/v3/apis__autoscaling__v2beta2_openapi.json
@@ -1177,11 +1177,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1881,11 +1876,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__batch__v1_openapi.json b/api/openapi-spec/v3/apis__batch__v1_openapi.json
@@ -4244,11 +4244,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -4948,11 +4943,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__batch__v1beta1_openapi.json b/api/openapi-spec/v3/apis__batch__v1beta1_openapi.json
@@ -4012,11 +4012,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -4716,11 +4711,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__certificates.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__certificates.k8s.io__v1_openapi.json
@@ -571,11 +571,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1218,11 +1213,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__coordination.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__coordination.k8s.io__v1_openapi.json
@@ -460,11 +460,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1112,11 +1107,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__discovery.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__discovery.k8s.io__v1_openapi.json
@@ -623,11 +623,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1270,11 +1265,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__discovery.k8s.io__v1beta1_openapi.json b/api/openapi-spec/v3/apis__discovery.k8s.io__v1beta1_openapi.json
@@ -618,11 +618,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1265,11 +1260,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__events.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__events.k8s.io__v1_openapi.json
@@ -582,11 +582,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1234,11 +1229,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",

diff --git a/api/openapi-spec/v3/apis__events.k8s.io__v1beta1_openapi.json b/api/openapi-spec/v3/apis__events.k8s.io__v1beta1_openapi.json
@@ -582,11 +582,6 @@
             "kind": "DeleteOptions",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "DeleteOptions",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "DeleteOptions",
@@ -1234,11 +1229,6 @@
             "kind": "WatchEvent",
             "version": "v1"
           },
-          {
-            "group": "networking.k8s.io",
-            "kind": "WatchEvent",
-            "version": "v1alpha1"
-          },
           {
             "group": "networking.k8s.io",
             "kind": "WatchEvent",