mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-06 02:34:03 +00:00
make update with the new API with arrays
This commit is contained in:
Antonio Ojea
parent
9917c727a1
commit
fee07ad608
@ -179,7 +179,6 @@ API rule violation: list_type_missing,k8s.io/api/networking/v1,NetworkPolicyIngr
|
||||
API rule violation: list_type_missing,k8s.io/api/networking/v1,NetworkPolicySpec,Egress
|
||||
API rule violation: list_type_missing,k8s.io/api/networking/v1,NetworkPolicySpec,Ingress
|
||||
API rule violation: list_type_missing,k8s.io/api/networking/v1,NetworkPolicySpec,PolicyTypes
|
||||
API rule violation: list_type_missing,k8s.io/api/networking/v1alpha1,ServiceCIDRSpec,CIDRs
|
||||
API rule violation: list_type_missing,k8s.io/api/networking/v1beta1,HTTPIngressRuleValue,Paths
|
||||
API rule violation: list_type_missing,k8s.io/api/networking/v1beta1,IngressLoadBalancerStatus,Ingress
|
||||
API rule violation: list_type_missing,k8s.io/api/networking/v1beta1,IngressSpec,Rules
|
||||
|
||||
15
api/openapi-spec/swagger.json
generated
15
api/openapi-spec/swagger.json
generated
@ -13843,7 +13843,7 @@
|
||||
"type": "object"
|
||||
},
|
||||
"io.k8s.api.networking.v1alpha1.ServiceCIDR": {
|
||||
"description": "ServiceCIDR defines a range of IPs using CIDR format (192.168.0.0/24 or 2001:db2::/64). This range is used by the cluster to allocate the ClusterIPs associated to the Services object.",
|
||||
"description": "ServiceCIDR defines a range of IP addresses using CIDR format (e.g. 192.168.0.0/24 or 2001:db2::/64). This range is used to allocate ClusterIPs to Service objects.",
|
||||
"properties": {
|
||||
"apiVersion": {
|
||||
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
|
||||
@ -13913,13 +13913,12 @@
|
||||
"io.k8s.api.networking.v1alpha1.ServiceCIDRSpec": {
|
||||
"description": "ServiceCIDRSpec define the CIDRs the user wants to use for allocating ClusterIPs for Services.",
|
||||
"properties": {
|
||||
"ipv4": {
|
||||
"description": "IPv4 defines an IPv4 IP block in CIDR notation (e.g. \"192.168.0.0/24\"). This field is immutable.",
|
||||
"type": "string"
|
||||
},
|
||||
"ipv6": {
|
||||
"description": "IPv6 defines an IPv6 IP block in CIDR notation (e.g. \"2001:db8::/64\"). This field is immutable.",
|
||||
"type": "string"
|
||||
"cidrs": {
|
||||
"description": "CIDRs defines the IP blocks in CIDR notation (e.g. \"192.168.0.0/24\" or \"2001:db8::/64\") from which to assign service cluster IPs. Max of two CIDRs is allowed, one of each IP family. This field is immutable.",
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"type": "array"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
|
||||
@ -122,7 +122,7 @@
|
||||
"type": "object"
|
||||
},
|
||||
"io.k8s.api.networking.v1alpha1.ServiceCIDR": {
|
||||
"description": "ServiceCIDR defines a range of IPs using CIDR format (192.168.0.0/24 or 2001:db2::/64). This range is used by the cluster to allocate the ClusterIPs associated to the Services object.",
|
||||
"description": "ServiceCIDR defines a range of IP addresses using CIDR format (e.g. 192.168.0.0/24 or 2001:db2::/64). This range is used to allocate ClusterIPs to Service objects.",
|
||||
"properties": {
|
||||
"apiVersion": {
|
||||
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
|
||||
@ -217,13 +217,13 @@
|
||||
"io.k8s.api.networking.v1alpha1.ServiceCIDRSpec": {
|
||||
"description": "ServiceCIDRSpec define the CIDRs the user wants to use for allocating ClusterIPs for Services.",
|
||||
"properties": {
|
||||
"ipv4": {
|
||||
"description": "IPv4 defines an IPv4 IP block in CIDR notation (e.g. \"192.168.0.0/24\"). This field is immutable.",
|
||||
"type": "string"
|
||||
},
|
||||
"ipv6": {
|
||||
"description": "IPv6 defines an IPv6 IP block in CIDR notation (e.g. \"2001:db8::/64\"). This field is immutable.",
|
||||
"type": "string"
|
||||
"cidrs": {
|
||||
"description": "CIDRs defines the IP blocks in CIDR notation (e.g. \"192.168.0.0/24\" or \"2001:db8::/64\") from which to assign service cluster IPs. Max of two CIDRs is allowed, one of each IP family. This field is immutable.",
|
||||
"items": {
|
||||
"default": "",
|
||||
"type": "string"
|
||||
},
|
||||
"type": "array"
|
||||
}
|
||||
},
|
||||
"type": "object"
|
||||
|
||||
@ -270,8 +270,7 @@ func Convert_networking_ServiceCIDRList_To_v1alpha1_ServiceCIDRList(in *networki
|
||||
}
|
||||
|
||||
func autoConvert_v1alpha1_ServiceCIDRSpec_To_networking_ServiceCIDRSpec(in *v1alpha1.ServiceCIDRSpec, out *networking.ServiceCIDRSpec, s conversion.Scope) error {
|
||||
out.IPv4 = in.IPv4
|
||||
out.IPv6 = in.IPv6
|
||||
out.CIDRs = *(*[]string)(unsafe.Pointer(&in.CIDRs))
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -281,8 +280,7 @@ func Convert_v1alpha1_ServiceCIDRSpec_To_networking_ServiceCIDRSpec(in *v1alpha1
|
||||
}
|
||||
|
||||
func autoConvert_networking_ServiceCIDRSpec_To_v1alpha1_ServiceCIDRSpec(in *networking.ServiceCIDRSpec, out *v1alpha1.ServiceCIDRSpec, s conversion.Scope) error {
|
||||
out.IPv4 = in.IPv4
|
||||
out.IPv6 = in.IPv6
|
||||
out.CIDRs = *(*[]string)(unsafe.Pointer(&in.CIDRs))
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
7
pkg/apis/networking/zz_generated.deepcopy.go
generated
7
pkg/apis/networking/zz_generated.deepcopy.go
generated
@ -829,7 +829,7 @@ func (in *ServiceCIDR) DeepCopyInto(out *ServiceCIDR) {
|
||||
*out = *in
|
||||
out.TypeMeta = in.TypeMeta
|
||||
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
|
||||
out.Spec = in.Spec
|
||||
in.Spec.DeepCopyInto(&out.Spec)
|
||||
in.Status.DeepCopyInto(&out.Status)
|
||||
return
|
||||
}
|
||||
@ -888,6 +888,11 @@ func (in *ServiceCIDRList) DeepCopyObject() runtime.Object {
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *ServiceCIDRSpec) DeepCopyInto(out *ServiceCIDRSpec) {
|
||||
*out = *in
|
||||
if in.CIDRs != nil {
|
||||
in, out := &in.CIDRs, &out.CIDRs
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
25
pkg/generated/openapi/zz_generated.openapi.go
generated
25
pkg/generated/openapi/zz_generated.openapi.go
generated
@ -38373,7 +38373,7 @@ func schema_k8sio_api_networking_v1alpha1_ServiceCIDR(ref common.ReferenceCallba
|
||||
return common.OpenAPIDefinition{
|
||||
Schema: spec.Schema{
|
||||
SchemaProps: spec.SchemaProps{
|
||||
Description: "ServiceCIDR defines a range of IPs using CIDR format (192.168.0.0/24 or 2001:db2::/64). This range is used by the cluster to allocate the ClusterIPs associated to the Services object.",
|
||||
Description: "ServiceCIDR defines a range of IP addresses using CIDR format (e.g. 192.168.0.0/24 or 2001:db2::/64). This range is used to allocate ClusterIPs to Service objects.",
|
||||
Type: []string{"object"},
|
||||
Properties: map[string]spec.Schema{
|
||||
"kind": {
|
||||
@ -38477,18 +38477,19 @@ func schema_k8sio_api_networking_v1alpha1_ServiceCIDRSpec(ref common.ReferenceCa
|
||||
Description: "ServiceCIDRSpec define the CIDRs the user wants to use for allocating ClusterIPs for Services.",
|
||||
Type: []string{"object"},
|
||||
Properties: map[string]spec.Schema{
|
||||
"ipv4": {
|
||||
"cidrs": {
|
||||
SchemaProps: spec.SchemaProps{
|
||||
Description: "IPv4 defines an IPv4 IP block in CIDR notation (e.g. \"192.168.0.0/24\"). This field is immutable.",
|
||||
Type: []string{"string"},
|
||||
Format: "",
|
||||
},
|
||||
},
|
||||
"ipv6": {
|
||||
SchemaProps: spec.SchemaProps{
|
||||
Description: "IPv6 defines an IPv6 IP block in CIDR notation (e.g. \"2001:db8::/64\"). This field is immutable.",
|
||||
Type: []string{"string"},
|
||||
Format: "",
|
||||
Description: "CIDRs defines the IP blocks in CIDR notation (e.g. \"192.168.0.0/24\" or \"2001:db8::/64\") from which to assign service cluster IPs. Max of two CIDRs is allowed, one of each IP family. This field is immutable.",
|
||||
Type: []string{"array"},
|
||||
Items: &spec.SchemaOrArray{
|
||||
Schema: &spec.Schema{
|
||||
SchemaProps: spec.SchemaProps{
|
||||
Default: "",
|
||||
Type: []string{"string"},
|
||||
Format: "",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@ -284,48 +284,48 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptor_c1b7ac8d7d97acec = []byte{
|
||||
// 656 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x4e, 0xdb, 0x40,
|
||||
0x10, 0x8e, 0x21, 0x20, 0xbc, 0x29, 0xa5, 0xf8, 0x14, 0x71, 0x30, 0x91, 0x7b, 0xa1, 0x6a, 0xd9,
|
||||
0x6d, 0x10, 0x8a, 0x7a, 0x6d, 0x40, 0x42, 0x91, 0x5a, 0x48, 0x17, 0xf5, 0xd0, 0x8a, 0x43, 0x37,
|
||||
0xce, 0xe0, 0x6c, 0x53, 0xff, 0x68, 0x77, 0xed, 0xb6, 0xb7, 0x3e, 0x42, 0x5f, 0xa0, 0xcf, 0xd1,
|
||||
0x53, 0x2b, 0xf5, 0xc6, 0x91, 0x23, 0x27, 0x54, 0xdc, 0x17, 0xa9, 0xbc, 0x71, 0xec, 0x40, 0x04,
|
||||
0x84, 0x0b, 0x37, 0xcf, 0xcc, 0xf7, 0x7d, 0x3b, 0xdf, 0xec, 0xac, 0x8c, 0xf6, 0x86, 0x2f, 0x24,
|
||||
0xe6, 0x21, 0x19, 0xc6, 0x3d, 0x10, 0x01, 0x28, 0x90, 0x24, 0x81, 0xa0, 0x1f, 0x0a, 0x92, 0x17,
|
||||
0x58, 0xc4, 0x49, 0x00, 0xea, 0x73, 0x28, 0x86, 0x3c, 0xf0, 0x48, 0xd2, 0x64, 0x9f, 0xa2, 0x01,
|
||||
0x6b, 0x12, 0x0f, 0x02, 0x10, 0x4c, 0x41, 0x1f, 0x47, 0x22, 0x54, 0xa1, 0x65, 0x8f, 0xf0, 0x98,
|
||||
0x45, 0x1c, 0x97, 0x78, 0x3c, 0xc6, 0xaf, 0x6d, 0x7a, 0x5c, 0x0d, 0xe2, 0x1e, 0x76, 0x43, 0x9f,
|
||||
0x78, 0xa1, 0x17, 0x12, 0x4d, 0xeb, 0xc5, 0xc7, 0x3a, 0xd2, 0x81, 0xfe, 0x1a, 0xc9, 0xad, 0x6d,
|
||||
0x97, 0xc7, 0xfb, 0xcc, 0x1d, 0xf0, 0x00, 0xc4, 0x57, 0x12, 0x0d, 0xbd, 0x2c, 0x21, 0x89, 0x0f,
|
||||
0x8a, 0x91, 0x64, 0xaa, 0x89, 0x35, 0x72, 0x1d, 0x4b, 0xc4, 0x81, 0xe2, 0x3e, 0x4c, 0x11, 0x5a,
|
||||
0xb7, 0x11, 0xa4, 0x3b, 0x00, 0x9f, 0x5d, 0xe5, 0x39, 0xbf, 0x0d, 0x64, 0x76, 0xba, 0x2f, 0xfb,
|
||||
0x7d, 0x01, 0x52, 0x5a, 0x1f, 0xd0, 0x52, 0xd6, 0x51, 0x9f, 0x29, 0x56, 0x37, 0x1a, 0xc6, 0x46,
|
||||
0x6d, 0xeb, 0x39, 0x2e, 0xc7, 0x51, 0x08, 0xe3, 0x68, 0xe8, 0x65, 0x09, 0x89, 0x33, 0x34, 0x4e,
|
||||
0x9a, 0xf8, 0xa0, 0xf7, 0x11, 0x5c, 0xf5, 0x1a, 0x14, 0x6b, 0x5b, 0x27, 0xe7, 0xeb, 0x95, 0xf4,
|
||||
0x7c, 0x1d, 0x95, 0x39, 0x5a, 0xa8, 0x5a, 0x07, 0xa8, 0x2a, 0x23, 0x70, 0xeb, 0x73, 0x5a, 0x7d,
|
||||
0x13, 0xdf, 0x3c, 0x6c, 0x5c, 0xb4, 0x76, 0x18, 0x81, 0xdb, 0x7e, 0x90, 0x4b, 0x57, 0xb3, 0x88,
|
||||
0x6a, 0x21, 0xe7, 0x97, 0x81, 0x96, 0x0b, 0xd4, 0x2b, 0x2e, 0x95, 0x75, 0x34, 0x65, 0x02, 0xcf,
|
||||
0x66, 0x22, 0x63, 0x6b, 0x0b, 0x8f, 0xf2, 0x73, 0x96, 0xc6, 0x99, 0x09, 0x03, 0xfb, 0x68, 0x81,
|
||||
0x2b, 0xf0, 0x65, 0x7d, 0xae, 0x31, 0xbf, 0x51, 0xdb, 0x7a, 0x32, 0xb3, 0x83, 0xf6, 0x72, 0xae,
|
||||
0xba, 0xd0, 0xc9, 0xf8, 0x74, 0x24, 0xe3, 0xf8, 0x13, 0xed, 0x67, 0xb6, 0xac, 0x23, 0x64, 0x46,
|
||||
0x4c, 0x40, 0xa0, 0x28, 0x1c, 0xe7, 0xfd, 0x93, 0xdb, 0x0e, 0xe9, 0x8e, 0x09, 0x20, 0x20, 0x70,
|
||||
0xa1, 0xbd, 0x9c, 0x9e, 0xaf, 0x9b, 0x45, 0x92, 0x96, 0x82, 0xce, 0x4f, 0x03, 0xad, 0x5c, 0x41,
|
||||
0x5b, 0x8f, 0xd1, 0x82, 0x27, 0xc2, 0x38, 0xd2, 0xa7, 0x99, 0x65, 0x9f, 0x7b, 0x59, 0x92, 0x8e,
|
||||
0x6a, 0xd6, 0x33, 0xb4, 0x24, 0x40, 0x86, 0xb1, 0x70, 0x41, 0x5f, 0x9e, 0x59, 0x4e, 0x89, 0xe6,
|
||||
0x79, 0x5a, 0x20, 0x2c, 0x82, 0xcc, 0x80, 0xf9, 0x20, 0x23, 0xe6, 0x42, 0x7d, 0x5e, 0xc3, 0x57,
|
||||
0x73, 0xb8, 0xb9, 0x3f, 0x2e, 0xd0, 0x12, 0x63, 0x35, 0x50, 0x35, 0x0b, 0xea, 0x55, 0x8d, 0x2d,
|
||||
0x2e, 0x3a, 0xc3, 0x52, 0x5d, 0x71, 0x7e, 0xcc, 0xa1, 0xda, 0x21, 0x88, 0x84, 0xbb, 0xb0, 0xd3,
|
||||
0xd9, 0xa5, 0xf7, 0xb0, 0xab, 0x6f, 0x2e, 0xed, 0xea, 0xad, 0x97, 0x30, 0xd1, 0xdc, 0x75, 0xdb,
|
||||
0x6a, 0xbd, 0x43, 0x8b, 0x52, 0x31, 0x15, 0x4b, 0x3d, 0x94, 0xda, 0x56, 0xf3, 0x2e, 0xa2, 0x9a,
|
||||
0xd8, 0x7e, 0x98, 0xcb, 0x2e, 0x8e, 0x62, 0x9a, 0x0b, 0x3a, 0x7f, 0x0c, 0xb4, 0x32, 0x81, 0xbe,
|
||||
0x87, 0xa7, 0xd0, 0xbd, 0xfc, 0x14, 0x9e, 0xde, 0xc1, 0xcb, 0x35, 0x8f, 0xe1, 0xed, 0x25, 0x0b,
|
||||
0xfa, 0x39, 0x34, 0x50, 0x95, 0x47, 0xc9, 0x76, 0xbe, 0x9b, 0xc5, 0x4c, 0x3b, 0xdd, 0x64, 0x9b,
|
||||
0xea, 0x4a, 0x8e, 0x68, 0xe5, 0x5b, 0x39, 0x89, 0x68, 0x69, 0x44, 0xcb, 0xf9, 0x82, 0x56, 0xa7,
|
||||
0xe6, 0x68, 0xb9, 0x08, 0xb9, 0x61, 0xd0, 0xe7, 0x8a, 0x87, 0x81, 0xac, 0x1b, 0xda, 0x02, 0x99,
|
||||
0x6d, 0x3a, 0x3b, 0x63, 0x5e, 0xb9, 0x40, 0x45, 0x4a, 0xd2, 0x09, 0xd9, 0xf6, 0xee, 0xc9, 0x85,
|
||||
0x5d, 0x39, 0xbd, 0xb0, 0x2b, 0x67, 0x17, 0x76, 0xe5, 0x5b, 0x6a, 0x1b, 0x27, 0xa9, 0x6d, 0x9c,
|
||||
0xa6, 0xb6, 0x71, 0x96, 0xda, 0xc6, 0xdf, 0xd4, 0x36, 0xbe, 0xff, 0xb3, 0x2b, 0xef, 0xed, 0x9b,
|
||||
0x7f, 0x51, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x86, 0x6d, 0x07, 0x90, 0xdc, 0x06, 0x00, 0x00,
|
||||
// 648 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0xd3, 0x4c,
|
||||
0x14, 0x8d, 0xdb, 0xa4, 0xaa, 0x27, 0x5f, 0xbf, 0x52, 0xaf, 0xa2, 0x2e, 0x9c, 0x28, 0x6c, 0x8a,
|
||||
0xa0, 0x33, 0x24, 0x42, 0x88, 0x2d, 0x6e, 0xa5, 0xaa, 0x12, 0xb4, 0x65, 0xba, 0x02, 0x75, 0xc1,
|
||||
0xc4, 0xbe, 0x75, 0x4c, 0xf0, 0x8f, 0x66, 0xc6, 0x01, 0x76, 0x3c, 0x02, 0x2f, 0xc0, 0x73, 0xb0,
|
||||
0x02, 0x89, 0x5d, 0x97, 0x5d, 0x76, 0x55, 0x51, 0xf3, 0x22, 0x68, 0xc6, 0x8e, 0x9d, 0x34, 0xea,
|
||||
0xdf, 0xa6, 0x3b, 0xcf, 0xb9, 0xe7, 0x9c, 0xb9, 0xe7, 0xce, 0x8c, 0x8c, 0x76, 0x46, 0x2f, 0x04,
|
||||
0x0e, 0x62, 0x32, 0x4a, 0x07, 0xc0, 0x23, 0x90, 0x20, 0xc8, 0x18, 0x22, 0x2f, 0xe6, 0xa4, 0x28,
|
||||
0xb0, 0x24, 0x20, 0x11, 0xc8, 0x4f, 0x31, 0x1f, 0x05, 0x91, 0x4f, 0xc6, 0x3d, 0xf6, 0x31, 0x19,
|
||||
0xb2, 0x1e, 0xf1, 0x21, 0x02, 0xce, 0x24, 0x78, 0x38, 0xe1, 0xb1, 0x8c, 0x2d, 0x3b, 0xe7, 0x63,
|
||||
0x96, 0x04, 0xb8, 0xe2, 0xe3, 0x09, 0x7f, 0x7d, 0xd3, 0x0f, 0xe4, 0x30, 0x1d, 0x60, 0x37, 0x0e,
|
||||
0x89, 0x1f, 0xfb, 0x31, 0xd1, 0xb2, 0x41, 0x7a, 0xac, 0x57, 0x7a, 0xa1, 0xbf, 0x72, 0xbb, 0xf5,
|
||||
0x67, 0xd5, 0xf6, 0x21, 0x73, 0x87, 0x41, 0x04, 0xfc, 0x0b, 0x49, 0x46, 0xbe, 0x02, 0x04, 0x09,
|
||||
0x41, 0x32, 0x32, 0x9e, 0x6b, 0x62, 0x9d, 0x5c, 0xa5, 0xe2, 0x69, 0x24, 0x83, 0x10, 0xe6, 0x04,
|
||||
0xcf, 0x6f, 0x12, 0x08, 0x77, 0x08, 0x21, 0xbb, 0xac, 0xeb, 0xfe, 0x32, 0x90, 0xb9, 0x7b, 0xf0,
|
||||
0xd2, 0xf3, 0x38, 0x08, 0x61, 0xbd, 0x47, 0xcb, 0xaa, 0x23, 0x8f, 0x49, 0xd6, 0x32, 0x3a, 0xc6,
|
||||
0x46, 0xb3, 0xff, 0x14, 0x57, 0xe3, 0x28, 0x8d, 0x71, 0x32, 0xf2, 0x15, 0x20, 0xb0, 0x62, 0xe3,
|
||||
0x71, 0x0f, 0xef, 0x0f, 0x3e, 0x80, 0x2b, 0x5f, 0x83, 0x64, 0x8e, 0x75, 0x72, 0xde, 0xae, 0x65,
|
||||
0xe7, 0x6d, 0x54, 0x61, 0xb4, 0x74, 0xb5, 0xf6, 0x51, 0x5d, 0x24, 0xe0, 0xb6, 0x16, 0xb4, 0xfb,
|
||||
0x26, 0xbe, 0x7e, 0xd8, 0xb8, 0x6c, 0xed, 0x30, 0x01, 0xd7, 0xf9, 0xaf, 0xb0, 0xae, 0xab, 0x15,
|
||||
0xd5, 0x46, 0xdd, 0x9f, 0x06, 0x5a, 0x29, 0x59, 0xaf, 0x02, 0x21, 0xad, 0xa3, 0xb9, 0x10, 0xf8,
|
||||
0x76, 0x21, 0x94, 0x5a, 0x47, 0x78, 0x50, 0xec, 0xb3, 0x3c, 0x41, 0xa6, 0x02, 0xec, 0xa1, 0x46,
|
||||
0x20, 0x21, 0x14, 0xad, 0x85, 0xce, 0xe2, 0x46, 0xb3, 0xff, 0xe8, 0xd6, 0x09, 0x9c, 0x95, 0xc2,
|
||||
0xb5, 0xb1, 0xab, 0xf4, 0x34, 0xb7, 0xe9, 0x86, 0x53, 0xed, 0xab, 0x58, 0xd6, 0x11, 0x32, 0x13,
|
||||
0xc6, 0x21, 0x92, 0x14, 0x8e, 0x8b, 0xfe, 0xc9, 0x4d, 0x9b, 0x1c, 0x4c, 0x04, 0xc0, 0x21, 0x72,
|
||||
0xc1, 0x59, 0xc9, 0xce, 0xdb, 0x66, 0x09, 0xd2, 0xca, 0xb0, 0xfb, 0xc3, 0x40, 0xab, 0x97, 0xd8,
|
||||
0xd6, 0x43, 0xd4, 0xf0, 0x79, 0x9c, 0x26, 0x7a, 0x37, 0xb3, 0xea, 0x73, 0x47, 0x81, 0x34, 0xaf,
|
||||
0x59, 0x4f, 0xd0, 0x32, 0x07, 0x11, 0xa7, 0xdc, 0x05, 0x7d, 0x78, 0x66, 0x35, 0x25, 0x5a, 0xe0,
|
||||
0xb4, 0x64, 0x58, 0x04, 0x99, 0x11, 0x0b, 0x41, 0x24, 0xcc, 0x85, 0xd6, 0xa2, 0xa6, 0xaf, 0x15,
|
||||
0x74, 0x73, 0x6f, 0x52, 0xa0, 0x15, 0xc7, 0xea, 0xa0, 0xba, 0x5a, 0xb4, 0xea, 0x9a, 0x5b, 0x1e,
|
||||
0xb4, 0xe2, 0x52, 0x5d, 0xe9, 0x7e, 0x5f, 0x40, 0xcd, 0x43, 0xe0, 0xe3, 0xc0, 0x85, 0xad, 0xdd,
|
||||
0x6d, 0x7a, 0x0f, 0x77, 0xf5, 0xcd, 0xcc, 0x5d, 0xbd, 0xf1, 0x10, 0xa6, 0x9a, 0xbb, 0xea, 0xb6,
|
||||
0x5a, 0x6f, 0xd1, 0x92, 0x90, 0x4c, 0xa6, 0x42, 0x0f, 0xa5, 0xd9, 0xef, 0xdd, 0xc5, 0x54, 0x0b,
|
||||
0x9d, 0xff, 0x0b, 0xdb, 0xa5, 0x7c, 0x4d, 0x0b, 0xc3, 0xee, 0x6f, 0x03, 0xad, 0x4e, 0xb1, 0xef,
|
||||
0xe1, 0x29, 0x1c, 0xcc, 0x3e, 0x85, 0xc7, 0x77, 0xc8, 0x72, 0xc5, 0x63, 0xe8, 0xcf, 0x44, 0xd0,
|
||||
0xcf, 0xa1, 0x8d, 0x1a, 0x6e, 0xe0, 0x71, 0xd1, 0x32, 0x3a, 0x8b, 0x1b, 0xa6, 0x63, 0x2a, 0x8d,
|
||||
0x2a, 0x0a, 0x9a, 0xe3, 0xdd, 0xcf, 0x68, 0x6d, 0x6e, 0x48, 0x96, 0x8b, 0x90, 0x1b, 0x47, 0x5e,
|
||||
0x20, 0x83, 0x38, 0xca, 0xa5, 0xb3, 0x07, 0x78, 0x4d, 0xf4, 0xad, 0x89, 0xae, 0xba, 0x1d, 0x25,
|
||||
0x24, 0xe8, 0x94, 0xad, 0xb3, 0x7d, 0x72, 0x61, 0xd7, 0x4e, 0x2f, 0xec, 0xda, 0xd9, 0x85, 0x5d,
|
||||
0xfb, 0x9a, 0xd9, 0xc6, 0x49, 0x66, 0x1b, 0xa7, 0x99, 0x6d, 0x9c, 0x65, 0xb6, 0xf1, 0x27, 0xb3,
|
||||
0x8d, 0x6f, 0x7f, 0xed, 0xda, 0x3b, 0xfb, 0xfa, 0xff, 0xcf, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff,
|
||||
0x29, 0x82, 0x11, 0x57, 0xb9, 0x06, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func (m *IPAddress) Marshal() (dAtA []byte, err error) {
|
||||
@ -616,16 +616,15 @@ func (m *ServiceCIDRSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||
_ = i
|
||||
var l int
|
||||
_ = l
|
||||
i -= len(m.IPv6)
|
||||
copy(dAtA[i:], m.IPv6)
|
||||
i = encodeVarintGenerated(dAtA, i, uint64(len(m.IPv6)))
|
||||
i--
|
||||
dAtA[i] = 0x12
|
||||
i -= len(m.IPv4)
|
||||
copy(dAtA[i:], m.IPv4)
|
||||
i = encodeVarintGenerated(dAtA, i, uint64(len(m.IPv4)))
|
||||
i--
|
||||
dAtA[i] = 0xa
|
||||
if len(m.CIDRs) > 0 {
|
||||
for iNdEx := len(m.CIDRs) - 1; iNdEx >= 0; iNdEx-- {
|
||||
i -= len(m.CIDRs[iNdEx])
|
||||
copy(dAtA[i:], m.CIDRs[iNdEx])
|
||||
i = encodeVarintGenerated(dAtA, i, uint64(len(m.CIDRs[iNdEx])))
|
||||
i--
|
||||
dAtA[i] = 0xa
|
||||
}
|
||||
}
|
||||
return len(dAtA) - i, nil
|
||||
}
|
||||
|
||||
@ -775,10 +774,12 @@ func (m *ServiceCIDRSpec) Size() (n int) {
|
||||
}
|
||||
var l int
|
||||
_ = l
|
||||
l = len(m.IPv4)
|
||||
n += 1 + l + sovGenerated(uint64(l))
|
||||
l = len(m.IPv6)
|
||||
n += 1 + l + sovGenerated(uint64(l))
|
||||
if len(m.CIDRs) > 0 {
|
||||
for _, s := range m.CIDRs {
|
||||
l = len(s)
|
||||
n += 1 + l + sovGenerated(uint64(l))
|
||||
}
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
@ -886,8 +887,7 @@ func (this *ServiceCIDRSpec) String() string {
|
||||
return "nil"
|
||||
}
|
||||
s := strings.Join([]string{`&ServiceCIDRSpec{`,
|
||||
`IPv4:` + fmt.Sprintf("%v", this.IPv4) + `,`,
|
||||
`IPv6:` + fmt.Sprintf("%v", this.IPv6) + `,`,
|
||||
`CIDRs:` + fmt.Sprintf("%v", this.CIDRs) + `,`,
|
||||
`}`,
|
||||
}, "")
|
||||
return s
|
||||
@ -1709,7 +1709,7 @@ func (m *ServiceCIDRSpec) Unmarshal(dAtA []byte) error {
|
||||
switch fieldNum {
|
||||
case 1:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field IPv4", wireType)
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field CIDRs", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
@ -1737,39 +1737,7 @@ func (m *ServiceCIDRSpec) Unmarshal(dAtA []byte) error {
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.IPv4 = string(dAtA[iNdEx:postIndex])
|
||||
iNdEx = postIndex
|
||||
case 2:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field IPv6", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowGenerated
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
stringLen |= uint64(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
intStringLen := int(stringLen)
|
||||
if intStringLen < 0 {
|
||||
return ErrInvalidLengthGenerated
|
||||
}
|
||||
postIndex := iNdEx + intStringLen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthGenerated
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.IPv6 = string(dAtA[iNdEx:postIndex])
|
||||
m.CIDRs = append(m.CIDRs, string(dAtA[iNdEx:postIndex]))
|
||||
iNdEx = postIndex
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
|
||||
@ -85,8 +85,8 @@ message ParentReference {
|
||||
optional string name = 4;
|
||||
}
|
||||
|
||||
// ServiceCIDR defines a range of IPs using CIDR format (192.168.0.0/24 or 2001:db2::/64).
|
||||
// This range is used by the cluster to allocate the ClusterIPs associated to the Services object.
|
||||
// ServiceCIDR defines a range of IP addresses using CIDR format (e.g. 192.168.0.0/24 or 2001:db2::/64).
|
||||
// This range is used to allocate ClusterIPs to Service objects.
|
||||
message ServiceCIDR {
|
||||
// Standard object's metadata.
|
||||
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
|
||||
@ -117,15 +117,11 @@ message ServiceCIDRList {
|
||||
|
||||
// ServiceCIDRSpec define the CIDRs the user wants to use for allocating ClusterIPs for Services.
|
||||
message ServiceCIDRSpec {
|
||||
// IPv4 defines an IPv4 IP block in CIDR notation (e.g. "192.168.0.0/24").
|
||||
// CIDRs defines the IP blocks in CIDR notation (e.g. "192.168.0.0/24" or "2001:db8::/64")
|
||||
// from which to assign service cluster IPs. Max of two CIDRs is allowed, one of each IP family.
|
||||
// This field is immutable.
|
||||
// +optional
|
||||
optional string ipv4 = 1;
|
||||
|
||||
// IPv6 defines an IPv6 IP block in CIDR notation (e.g. "2001:db8::/64").
|
||||
// This field is immutable.
|
||||
// +optional
|
||||
optional string ipv6 = 2;
|
||||
repeated string cidrs = 1;
|
||||
}
|
||||
|
||||
// ServiceCIDRStatus describes the current state of the ServiceCIDR.
|
||||
|
||||
@ -69,7 +69,7 @@ func (ParentReference) SwaggerDoc() map[string]string {
|
||||
}
|
||||
|
||||
var map_ServiceCIDR = map[string]string{
|
||||
"": "ServiceCIDR defines a range of IPs using CIDR format (192.168.0.0/24 or 2001:db2::/64). This range is used by the cluster to allocate the ClusterIPs associated to the Services object.",
|
||||
"": "ServiceCIDR defines a range of IP addresses using CIDR format (e.g. 192.168.0.0/24 or 2001:db2::/64). This range is used to allocate ClusterIPs to Service objects.",
|
||||
"metadata": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
|
||||
"spec": "spec is the desired state of the ServiceCIDR. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
|
||||
"status": "status represents the current state of the ServiceCIDR. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status",
|
||||
@ -90,9 +90,8 @@ func (ServiceCIDRList) SwaggerDoc() map[string]string {
|
||||
}
|
||||
|
||||
var map_ServiceCIDRSpec = map[string]string{
|
||||
"": "ServiceCIDRSpec define the CIDRs the user wants to use for allocating ClusterIPs for Services.",
|
||||
"ipv4": "IPv4 defines an IPv4 IP block in CIDR notation (e.g. \"192.168.0.0/24\"). This field is immutable.",
|
||||
"ipv6": "IPv6 defines an IPv6 IP block in CIDR notation (e.g. \"2001:db8::/64\"). This field is immutable.",
|
||||
"": "ServiceCIDRSpec define the CIDRs the user wants to use for allocating ClusterIPs for Services.",
|
||||
"cidrs": "CIDRs defines the IP blocks in CIDR notation (e.g. \"192.168.0.0/24\" or \"2001:db8::/64\") from which to assign service cluster IPs. Max of two CIDRs is allowed, one of each IP family. This field is immutable.",
|
||||
}
|
||||
|
||||
func (ServiceCIDRSpec) SwaggerDoc() map[string]string {
|
||||
|
||||
@ -128,7 +128,7 @@ func (in *ServiceCIDR) DeepCopyInto(out *ServiceCIDR) {
|
||||
*out = *in
|
||||
out.TypeMeta = in.TypeMeta
|
||||
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
|
||||
out.Spec = in.Spec
|
||||
in.Spec.DeepCopyInto(&out.Spec)
|
||||
in.Status.DeepCopyInto(&out.Status)
|
||||
return
|
||||
}
|
||||
@ -187,6 +187,11 @@ func (in *ServiceCIDRList) DeepCopyObject() runtime.Object {
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *ServiceCIDRSpec) DeepCopyInto(out *ServiceCIDRSpec) {
|
||||
*out = *in
|
||||
if in.CIDRs != nil {
|
||||
in, out := &in.CIDRs, &out.CIDRs
|
||||
*out = make([]string, len(*in))
|
||||
copy(*out, *in)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -44,8 +44,9 @@
|
||||
]
|
||||
},
|
||||
"spec": {
|
||||
"ipv4": "ipv4Value",
|
||||
"ipv6": "ipv6Value"
|
||||
"cidrs": [
|
||||
"cidrsValue"
|
||||
]
|
||||
},
|
||||
"status": {
|
||||
"conditions": [
|
||||
|
||||
Binary file not shown.
@ -33,8 +33,8 @@ metadata:
|
||||
selfLink: selfLinkValue
|
||||
uid: uidValue
|
||||
spec:
|
||||
ipv4: ipv4Value
|
||||
ipv6: ipv6Value
|
||||
cidrs:
|
||||
- cidrsValue
|
||||
status:
|
||||
conditions:
|
||||
- lastTransitionTime: "2004-01-01T01:01:01Z"
|
||||
|
||||
@ -10612,12 +10612,12 @@ var schemaYAML = typed.YAMLObject(`types:
|
||||
- name: io.k8s.api.networking.v1alpha1.ServiceCIDRSpec
|
||||
map:
|
||||
fields:
|
||||
- name: ipv4
|
||||
- name: cidrs
|
||||
type:
|
||||
scalar: string
|
||||
- name: ipv6
|
||||
type:
|
||||
scalar: string
|
||||
list:
|
||||
elementType:
|
||||
scalar: string
|
||||
elementRelationship: atomic
|
||||
- name: io.k8s.api.networking.v1alpha1.ServiceCIDRStatus
|
||||
map:
|
||||
fields:
|
||||
|
||||
@ -21,8 +21,7 @@ package v1alpha1
|
||||
// ServiceCIDRSpecApplyConfiguration represents an declarative configuration of the ServiceCIDRSpec type for use
|
||||
// with apply.
|
||||
type ServiceCIDRSpecApplyConfiguration struct {
|
||||
IPv4 *string `json:"ipv4,omitempty"`
|
||||
IPv6 *string `json:"ipv6,omitempty"`
|
||||
CIDRs []string `json:"cidrs,omitempty"`
|
||||
}
|
||||
|
||||
// ServiceCIDRSpecApplyConfiguration constructs an declarative configuration of the ServiceCIDRSpec type for use with
|
||||
@ -31,18 +30,12 @@ func ServiceCIDRSpec() *ServiceCIDRSpecApplyConfiguration {
|
||||
return &ServiceCIDRSpecApplyConfiguration{}
|
||||
}
|
||||
|
||||
// WithIPv4 sets the IPv4 field in the declarative configuration to the given value
|
||||
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
|
||||
// If called multiple times, the IPv4 field is set to the value of the last call.
|
||||
func (b *ServiceCIDRSpecApplyConfiguration) WithIPv4(value string) *ServiceCIDRSpecApplyConfiguration {
|
||||
b.IPv4 = &value
|
||||
return b
|
||||
}
|
||||
|
||||
// WithIPv6 sets the IPv6 field in the declarative configuration to the given value
|
||||
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
|
||||
// If called multiple times, the IPv6 field is set to the value of the last call.
|
||||
func (b *ServiceCIDRSpecApplyConfiguration) WithIPv6(value string) *ServiceCIDRSpecApplyConfiguration {
|
||||
b.IPv6 = &value
|
||||
// WithCIDRs adds the given value to the CIDRs field in the declarative configuration
|
||||
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
|
||||
// If called multiple times, values provided by each call will be appended to the CIDRs field.
|
||||
func (b *ServiceCIDRSpecApplyConfiguration) WithCIDRs(values ...string) *ServiceCIDRSpecApplyConfiguration {
|
||||
for i := range values {
|
||||
b.CIDRs = append(b.CIDRs, values[i])
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user