Merge pull request kubernetes#125021 from aojea/servicecidrbeta

KEP-1880 Multiple Service CIDRs: Graduate to Beta (2/2)
openshift · Jun 30, 2024 · 93d5651 · 93d5651
2 parents d902351 + bc8bce2
commit 93d5651
Show file tree

Hide file tree

Showing 80 changed files with 6,421 additions and 1,638 deletions.
diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list
@@ -51,6 +51,7 @@ 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,ServiceCIDRSpec,CIDRs
+API rule violation: names_match,k8s.io/api/networking/v1beta1,ServiceCIDRSpec,CIDRs
 API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,BoolValue
 API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,IntSliceValue
 API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,IntValue

diff --git a/api/discovery/aggregated_v2.json b/api/discovery/aggregated_v2.json
@@ -912,7 +912,7 @@
               ]
             }
           ],
-          "version": "v1alpha1"
+          "version": "v1beta1"
         }
       ]
     },

diff --git a/api/discovery/aggregated_v2beta1.json b/api/discovery/aggregated_v2beta1.json
@@ -912,7 +912,7 @@
               ]
             }
           ],
-          "version": "v1alpha1"
+          "version": "v1beta1"
         }
       ]
     },

diff --git a/api/discovery/apis.json b/api/discovery/apis.json
@@ -133,8 +133,8 @@
           "version": "v1"
         },
         {
-          "groupVersion": "networking.k8s.io/v1alpha1",
-          "version": "v1alpha1"
+          "groupVersion": "networking.k8s.io/v1beta1",
+          "version": "v1beta1"
         }
       ]
     },

diff --git a/api/discovery/apis__networking.k8s.io.json b/api/discovery/apis__networking.k8s.io.json
@@ -12,8 +12,8 @@
       "version": "v1"
     },
     {
-      "groupVersion": "networking.k8s.io/v1alpha1",
-      "version": "v1alpha1"
+      "groupVersion": "networking.k8s.io/v1beta1",
+      "version": "v1beta1"
     }
   ]
 }
diff --git a/...ry/apis__networking.k8s.io__v1alpha1.json → ...ery/apis__networking.k8s.io__v1beta1.json b/...ry/apis__networking.k8s.io__v1alpha1.json → ...ery/apis__networking.k8s.io__v1beta1.json
@@ -1,6 +1,6 @@
 {
   "apiVersion": "v1",
-  "groupVersion": "networking.k8s.io/v1alpha1",
+  "groupVersion": "networking.k8s.io/v1beta1",
   "kind": "APIResourceList",
   "resources": [
     {
@@ -11,7 +11,7 @@
         "ip"
       ],
       "singularName": "ipaddress",
-      "storageVersionHash": "3APLM23DOxw=",
+      "storageVersionHash": "O4H8VxQhW5Y=",
       "verbs": [
         "create",
         "delete",
@@ -28,7 +28,7 @@
       "name": "servicecidrs",
       "namespaced": false,
       "singularName": "servicecidr",
-      "storageVersionHash": "3cDF5hqTkLY=",
+      "storageVersionHash": "8ufAXOnr3Yg=",
       "verbs": [
         "create",
         "delete",