Merge pull request kubernetes#128971 from aojea/servicecidr_ga

KEP-1880 Multiple Service CIDRs: Graduate to GA

Author: k8s-ci-robot

api/api-rules/violation_exceptions.list

@@ -50,6 +50,7 @@ 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/v1,ServiceCIDRSpec,CIDRs
 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/v1alpha3,DeviceAttribute,BoolValue

api/discovery/aggregated_v2.json

@@ -805,6 +805,29 @@
                 "watch"
               ]
             },
+            {
+              "resource": "ipaddresses",
+              "responseKind": {
+                "group": "",
+                "kind": "IPAddress",
+                "version": ""
+              },
+              "scope": "Cluster",
+              "shortNames": [
+                "ip"
+              ],
+              "singularResource": "ipaddress",
+              "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+              ]
+            },
             {
               "resource": "networkpolicies",
               "responseKind": {
@@ -827,6 +850,41 @@
                 "update",
                 "watch"
               ]
+            },
+            {
+              "resource": "servicecidrs",
+              "responseKind": {
+                "group": "",
+                "kind": "ServiceCIDR",
+                "version": ""
+              },
+              "scope": "Cluster",
+              "singularResource": "servicecidr",
+              "subresources": [
+                {
+                  "responseKind": {
+                    "group": "",
+                    "kind": "ServiceCIDR",
+                    "version": ""
+                  },
+                  "subresource": "status",
+                  "verbs": [
+                    "get",
+                    "patch",
+                    "update"
+                  ]
+                }
+              ],
+              "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+              ]
             }
           ],
           "version": "v1"

api/discovery/apis__networking.k8s.io__v1.json

@@ -51,6 +51,26 @@
         "update"
       ]
     },
+    {
+      "kind": "IPAddress",
+      "name": "ipaddresses",
+      "namespaced": false,
+      "shortNames": [
+        "ip"
+      ],
+      "singularName": "ipaddress",
+      "storageVersionHash": "O4H8VxQhW5Y=",
+      "verbs": [
+        "create",
+        "delete",
+        "deletecollection",
+        "get",
+        "list",
+        "patch",
+        "update",
+        "watch"
+      ]
+    },
     {
       "kind": "NetworkPolicy",
       "name": "networkpolicies",
@@ -70,6 +90,34 @@
         "update",
         "watch"
       ]
+    },
+    {
+      "kind": "ServiceCIDR",
+      "name": "servicecidrs",
+      "namespaced": false,
+      "singularName": "servicecidr",
+      "storageVersionHash": "8ufAXOnr3Yg=",
+      "verbs": [
+        "create",
+        "delete",
+        "deletecollection",
+        "get",
+        "list",
+        "patch",
+        "update",
+        "watch"
+      ]
+    },
+    {
+      "kind": "ServiceCIDR",
+      "name": "servicecidrs/status",
+      "namespaced": false,
+      "singularName": "",
+      "verbs": [
+        "get",
+        "patch",
+        "update"
+      ]
     }
   ]
 }