diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 36675c864c9..390902a04e3 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -85565,8 +85565,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "apiVersion": {
diff --git a/api/swagger-spec/admissionregistration.k8s.io.json b/api/swagger-spec/admissionregistration.k8s.io.json
index 8a93d2b976f..4b5bba0b60a 100644
--- a/api/swagger-spec/admissionregistration.k8s.io.json
+++ b/api/swagger-spec/admissionregistration.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/apis.json b/api/swagger-spec/apis.json
index 18d960ca599..9070fc9096b 100644
--- a/api/swagger-spec/apis.json
+++ b/api/swagger-spec/apis.json
@@ -62,8 +62,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/apps.json b/api/swagger-spec/apps.json
index ecfaa626a6e..603237ab4b1 100644
--- a/api/swagger-spec/apps.json
+++ b/api/swagger-spec/apps.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/authentication.k8s.io.json b/api/swagger-spec/authentication.k8s.io.json
index d0ef25599e9..175735dba82 100644
--- a/api/swagger-spec/authentication.k8s.io.json
+++ b/api/swagger-spec/authentication.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/authorization.k8s.io.json b/api/swagger-spec/authorization.k8s.io.json
index 9bd028308d7..98200f75838 100644
--- a/api/swagger-spec/authorization.k8s.io.json
+++ b/api/swagger-spec/authorization.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/autoscaling.json b/api/swagger-spec/autoscaling.json
index fbb9329e3a7..39bdb8664fa 100644
--- a/api/swagger-spec/autoscaling.json
+++ b/api/swagger-spec/autoscaling.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/batch.json b/api/swagger-spec/batch.json
index c8604aed950..ad5fcc2c274 100644
--- a/api/swagger-spec/batch.json
+++ b/api/swagger-spec/batch.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/certificates.k8s.io.json b/api/swagger-spec/certificates.k8s.io.json
index bdd12bab60a..64799705329 100644
--- a/api/swagger-spec/certificates.k8s.io.json
+++ b/api/swagger-spec/certificates.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/events.k8s.io.json b/api/swagger-spec/events.k8s.io.json
index 423933664fc..b6513828374 100644
--- a/api/swagger-spec/events.k8s.io.json
+++ b/api/swagger-spec/events.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/extensions.json b/api/swagger-spec/extensions.json
index 2e2fc1afd97..bc161e4ef44 100644
--- a/api/swagger-spec/extensions.json
+++ b/api/swagger-spec/extensions.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/networking.k8s.io.json b/api/swagger-spec/networking.k8s.io.json
index debc58cd79a..9a67396ddd7 100644
--- a/api/swagger-spec/networking.k8s.io.json
+++ b/api/swagger-spec/networking.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/policy.json b/api/swagger-spec/policy.json
index 51c62c22174..12ee477ccdc 100644
--- a/api/swagger-spec/policy.json
+++ b/api/swagger-spec/policy.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/rbac.authorization.k8s.io.json b/api/swagger-spec/rbac.authorization.k8s.io.json
index d162e47b9fd..7752ae8a683 100644
--- a/api/swagger-spec/rbac.authorization.k8s.io.json
+++ b/api/swagger-spec/rbac.authorization.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/scheduling.k8s.io.json b/api/swagger-spec/scheduling.k8s.io.json
index ca8030cbd41..639e581b077 100644
--- a/api/swagger-spec/scheduling.k8s.io.json
+++ b/api/swagger-spec/scheduling.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/settings.k8s.io.json b/api/swagger-spec/settings.k8s.io.json
index b82334cab59..f1462290704 100644
--- a/api/swagger-spec/settings.k8s.io.json
+++ b/api/swagger-spec/settings.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/api/swagger-spec/storage.k8s.io.json b/api/swagger-spec/storage.k8s.io.json
index 733f4ecef65..956159c8c18 100644
--- a/api/swagger-spec/storage.k8s.io.json
+++ b/api/swagger-spec/storage.k8s.io.json
@@ -38,8 +38,7 @@
     "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
     "required": [
      "name",
-     "versions",
-     "serverAddressByClientCIDRs"
+     "versions"
     ],
     "properties": {
      "kind": {
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
index e78380ab6d8..4baf44f3de9 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
@@ -49,6 +49,7 @@ message APIGroup {
   // The server returns only those CIDRs that it thinks that the client can match.
   // For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP.
   // Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.
+  // +optional
   repeated ServerAddressByClientCIDR serverAddressByClientCIDRs = 4;
 }
 
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
index 917efb37f75..e93df18461e 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
@@ -799,7 +799,8 @@ type APIGroup struct {
 	// The server returns only those CIDRs that it thinks that the client can match.
 	// For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP.
 	// Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.
-	ServerAddressByClientCIDRs []ServerAddressByClientCIDR `json:"serverAddressByClientCIDRs" protobuf:"bytes,4,rep,name=serverAddressByClientCIDRs"`
+	// +optional
+	ServerAddressByClientCIDRs []ServerAddressByClientCIDR `json:"serverAddressByClientCIDRs,omitempty" protobuf:"bytes,4,rep,name=serverAddressByClientCIDRs"`
 }
 
 // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.