diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 6f8f11fd22d..7972bdb94df 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -13277,10 +13277,6 @@ "resource": { "description": "Resource is the resource of the object being referenced.", "type": "string" - }, - "uid": { - "description": "UID is the uid of the object being referenced.", - "type": "string" } }, "type": "object" diff --git a/api/openapi-spec/v3/apis__networking.k8s.io__v1alpha1_openapi.json b/api/openapi-spec/v3/apis__networking.k8s.io__v1alpha1_openapi.json index f36af090036..5857701f7de 100644 --- a/api/openapi-spec/v3/apis__networking.k8s.io__v1alpha1_openapi.json +++ b/api/openapi-spec/v3/apis__networking.k8s.io__v1alpha1_openapi.json @@ -315,10 +315,6 @@ "resource": { "description": "Resource is the resource of the object being referenced.", "type": "string" - }, - "uid": { - "description": "UID is the uid of the object being referenced.", - "type": "string" } }, "type": "object" diff --git a/pkg/apis/networking/v1alpha1/zz_generated.conversion.go b/pkg/apis/networking/v1alpha1/zz_generated.conversion.go index 43e5c004eee..3339c87b502 100644 --- a/pkg/apis/networking/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/networking/v1alpha1/zz_generated.conversion.go @@ -28,7 +28,6 @@ import ( v1alpha1 "k8s.io/api/networking/v1alpha1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - types "k8s.io/apimachinery/pkg/types" core "k8s.io/kubernetes/pkg/apis/core" networking "k8s.io/kubernetes/pkg/apis/networking" ) @@ -260,7 +259,6 @@ func autoConvert_v1alpha1_ParentReference_To_networking_ParentReference(in *v1al out.Resource = in.Resource out.Namespace = in.Namespace out.Name = in.Name - out.UID = types.UID(in.UID) return nil } @@ -274,7 +272,6 @@ func autoConvert_networking_ParentReference_To_v1alpha1_ParentReference(in *netw out.Resource = in.Resource out.Namespace = in.Namespace out.Name = in.Name - out.UID = types.UID(in.UID) return nil } diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index cde6dad4b69..3e31f0ed64d 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -37418,13 +37418,6 @@ func schema_k8sio_api_networking_v1alpha1_ParentReference(ref common.ReferenceCa Format: "", }, }, - "uid": { - SchemaProps: spec.SchemaProps{ - Description: "UID is the uid of the object being referenced.", - Type: []string{"string"}, - Format: "", - }, - }, }, }, }, diff --git a/staging/src/k8s.io/api/networking/v1alpha1/generated.pb.go b/staging/src/k8s.io/api/networking/v1alpha1/generated.pb.go index f54d1f82421..d73be6ef843 100644 --- a/staging/src/k8s.io/api/networking/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/api/networking/v1alpha1/generated.pb.go @@ -31,8 +31,6 @@ import ( math_bits "math/bits" reflect "reflect" strings "strings" - - k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types" ) // Reference imports to suppress errors if they are not otherwise used. @@ -257,51 +255,49 @@ func init() { } var fileDescriptor_c1b7ac8d7d97acec = []byte{ - // 698 bytes of a gzipped FileDescriptorProto + // 666 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcf, 0x4e, 0xdb, 0x4a, - 0x14, 0xc6, 0x63, 0x92, 0x48, 0x78, 0x00, 0x85, 0xeb, 0xcd, 0x8d, 0x58, 0x38, 0xb9, 0xb9, 0x1b, - 0xae, 0x6e, 0x19, 0x03, 0x42, 0x51, 0xb7, 0x98, 0x48, 0x34, 0x52, 0x0b, 0xe9, 0x20, 0xba, 0xa8, - 0x58, 0xd4, 0xb1, 0x0f, 0x8e, 0x1b, 0xfc, 0x47, 0x33, 0xe3, 0x54, 0xec, 0xfa, 0x08, 0x7d, 0xa1, - 0x56, 0x6a, 0x57, 0x2c, 0x59, 0xb2, 0x8a, 0x8a, 0xfb, 0x02, 0x5d, 0xb7, 0x9b, 0x6a, 0x26, 0x4e, - 0xec, 0x24, 0x0d, 0xd0, 0x0d, 0xbb, 0xcc, 0x39, 0xbf, 0xf3, 0xcd, 0x39, 0x73, 0xbe, 0x24, 0xe8, - 0xb0, 0xff, 0x94, 0x61, 0x2f, 0x34, 0xfa, 0x71, 0x17, 0x68, 0x00, 0x1c, 0x98, 0x31, 0x80, 0xc0, - 0x09, 0xa9, 0x91, 0x26, 0xac, 0xc8, 0x33, 0x02, 0xe0, 0xef, 0x42, 0xda, 0xf7, 0x02, 0xd7, 0x18, - 0xec, 0x58, 0x17, 0x51, 0xcf, 0xda, 0x31, 0x5c, 0x08, 0x80, 0x5a, 0x1c, 0x1c, 0x1c, 0xd1, 0x90, - 0x87, 0x9a, 0x3e, 0xe2, 0xb1, 0x15, 0x79, 0x38, 0xe3, 0xf1, 0x98, 0xdf, 0xd8, 0x72, 0x3d, 0xde, - 0x8b, 0xbb, 0xd8, 0x0e, 0x7d, 0xc3, 0x0d, 0xdd, 0xd0, 0x90, 0x65, 0xdd, 0xf8, 0x5c, 0x9e, 0xe4, - 0x41, 0x7e, 0x1a, 0xc9, 0x6d, 0x34, 0x72, 0xd7, 0xdb, 0x21, 0x05, 0x63, 0x30, 0x77, 0xe5, 0xc6, - 0x5e, 0xc6, 0xf8, 0x96, 0xdd, 0xf3, 0x02, 0xa0, 0x97, 0x46, 0xd4, 0x77, 0x45, 0x80, 0x19, 0x3e, - 0x70, 0xeb, 0x77, 0x55, 0xc6, 0xa2, 0x2a, 0x1a, 0x07, 0xdc, 0xf3, 0x61, 0xae, 0xa0, 0x79, 0x5f, - 0x01, 0xb3, 0x7b, 0xe0, 0x5b, 0xb3, 0x75, 0x8d, 0x2f, 0x0a, 0x5a, 0x39, 0xb8, 0x88, 0x19, 0x07, - 0x7a, 0xd0, 0x6e, 0x11, 0xed, 0x0d, 0x5a, 0x16, 0x3d, 0x39, 0x16, 0xb7, 0xaa, 0x4a, 0x5d, 0xd9, - 0x5c, 0xd9, 0xdd, 0xc6, 0xd9, 0xa3, 0x4d, 0xa4, 0x71, 0xd4, 0x77, 0x45, 0x80, 0x61, 0x41, 0xe3, - 0xc1, 0x0e, 0x3e, 0xee, 0xbe, 0x05, 0x9b, 0xbf, 0x00, 0x6e, 0x99, 0xda, 0xd5, 0xb0, 0x56, 0x48, - 0x86, 0x35, 0x94, 0xc5, 0xc8, 0x44, 0x55, 0x7b, 0x89, 0x4a, 0x2c, 0x02, 0xbb, 0xba, 0x24, 0xd5, - 0x0d, 0x7c, 0xf7, 0x4a, 0x70, 0xae, 0xb9, 0x93, 0x08, 0x6c, 0x73, 0x35, 0x15, 0x2f, 0x89, 0x13, - 0x91, 0x52, 0x8d, 0xcf, 0x0a, 0xaa, 0xe4, 0xb8, 0xe7, 0x1e, 0xe3, 0xda, 0xd9, 0xdc, 0x20, 0xf8, - 0x61, 0x83, 0x88, 0x6a, 0x39, 0xc6, 0x7a, 0x7a, 0xd3, 0xf2, 0x38, 0x92, 0x1b, 0xa2, 0x83, 0xca, - 0x1e, 0x07, 0x9f, 0x55, 0x97, 0xea, 0xc5, 0xcd, 0x95, 0xdd, 0xff, 0xff, 0x60, 0x0a, 0x73, 0x2d, - 0xd5, 0x2d, 0xb7, 0x85, 0x02, 0x19, 0x09, 0x35, 0xbe, 0x4f, 0xcf, 0x20, 0xa6, 0xd3, 0x5e, 0xa1, - 0xd5, 0x20, 0x74, 0xe0, 0x04, 0x2e, 0xc0, 0xe6, 0x21, 0x4d, 0xe7, 0xa8, 0xe7, 0x2f, 0x13, 0xb6, - 0x13, 0x5d, 0x1f, 0xe5, 0x38, 0x73, 0x3d, 0x19, 0xd6, 0x56, 0xf3, 0x11, 0x32, 0xa5, 0xa3, 0xed, - 0xa3, 0x4a, 0x04, 0x54, 0x00, 0xcf, 0x42, 0xc6, 0x4d, 0x8f, 0x33, 0xb9, 0x8d, 0xb2, 0xf9, 0x77, - 0xda, 0x5a, 0xa5, 0x33, 0x9d, 0x26, 0xb3, 0xbc, 0x56, 0x47, 0x25, 0x2f, 0x1a, 0xec, 0x55, 0x8b, - 0x75, 0x65, 0x53, 0xcd, 0x96, 0xd2, 0xee, 0x0c, 0xf6, 0x88, 0xcc, 0xa4, 0x44, 0xb3, 0x5a, 0x9a, - 0x23, 0x9a, 0x92, 0x68, 0x36, 0x3e, 0x29, 0x48, 0x6d, 0x77, 0xf6, 0x1d, 0x87, 0x02, 0x63, 0x8f, - 0xe0, 0xbc, 0xe3, 0x29, 0xe7, 0x6d, 0xdd, 0xb7, 0xb3, 0x49, 0x6b, 0x0b, 0x7d, 0xf7, 0x51, 0x41, - 0x6b, 0x13, 0xea, 0x11, 0x5c, 0x77, 0x34, 0xed, 0xba, 0xff, 0x1e, 0x3c, 0xc1, 0x02, 0xcf, 0xf9, - 0xb9, 0xf6, 0xa5, 0xe1, 0xce, 0x90, 0x1a, 0x59, 0x14, 0x02, 0x4e, 0xe0, 0x3c, 0xed, 0xff, 0xde, - 0x2f, 0x68, 0x67, 0x5c, 0x00, 0x14, 0x02, 0x1b, 0xcc, 0xb5, 0x64, 0x58, 0x53, 0x27, 0x41, 0x92, - 0x09, 0x36, 0x7e, 0x2a, 0xa8, 0x32, 0x43, 0x6b, 0xff, 0xa2, 0xb2, 0x4b, 0xc3, 0x38, 0x92, 0xb7, - 0xa9, 0x59, 0x9f, 0x87, 0x22, 0x48, 0x46, 0x39, 0xed, 0x09, 0x5a, 0xa6, 0xc0, 0xc2, 0x98, 0xda, - 0x20, 0x97, 0xa7, 0x66, 0xaf, 0x44, 0xd2, 0x38, 0x99, 0x10, 0x9a, 0x81, 0xd4, 0xc0, 0xf2, 0x81, - 0x45, 0x96, 0x0d, 0xa9, 0x3f, 0xff, 0x4a, 0x71, 0xf5, 0x68, 0x9c, 0x20, 0x19, 0x23, 0x9c, 0x2a, - 0x0e, 0xb3, 0x4e, 0x15, 0x2c, 0x91, 0x19, 0xcd, 0x44, 0xc5, 0xd8, 0x73, 0xaa, 0x65, 0x09, 0x6c, - 0xa7, 0x40, 0xf1, 0xb4, 0xdd, 0xfa, 0x31, 0xac, 0xfd, 0xb3, 0xe8, 0x97, 0x97, 0x5f, 0x46, 0xc0, - 0xf0, 0x69, 0xbb, 0x45, 0x44, 0xb1, 0xd9, 0xba, 0xba, 0xd5, 0x0b, 0xd7, 0xb7, 0x7a, 0xe1, 0xe6, - 0x56, 0x2f, 0xbc, 0x4f, 0x74, 0xe5, 0x2a, 0xd1, 0x95, 0xeb, 0x44, 0x57, 0x6e, 0x12, 0x5d, 0xf9, - 0x9a, 0xe8, 0xca, 0x87, 0x6f, 0x7a, 0xe1, 0xb5, 0x7e, 0xf7, 0x3f, 0xda, 0xaf, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xf9, 0x9d, 0x9e, 0xc6, 0x0b, 0x07, 0x00, 0x00, + 0x14, 0xc6, 0x63, 0x48, 0x24, 0x3c, 0x80, 0xc2, 0xf5, 0xe6, 0x46, 0x2c, 0x9c, 0x28, 0x77, 0xc3, + 0xd5, 0xbd, 0x78, 0x0a, 0x42, 0x51, 0xb7, 0x18, 0x24, 0x1a, 0xa9, 0x85, 0x74, 0x90, 0xba, 0xa8, + 0x58, 0x74, 0xe2, 0x1c, 0x1c, 0x37, 0xd8, 0x63, 0xcd, 0x8c, 0x53, 0x75, 0xd7, 0x47, 0xe8, 0xdb, + 0x74, 0xd5, 0x4a, 0xed, 0x8a, 0x25, 0x4b, 0x56, 0x51, 0x71, 0x5f, 0xa0, 0x8f, 0x50, 0xcd, 0xc4, + 0x89, 0x9d, 0xa4, 0xfc, 0xe9, 0x86, 0x1d, 0x73, 0xce, 0xef, 0x7c, 0xe7, 0x1c, 0x9f, 0x0f, 0x05, + 0x1d, 0x0d, 0x9e, 0x0a, 0x27, 0x60, 0x78, 0x90, 0x74, 0x81, 0x47, 0x20, 0x41, 0xe0, 0x21, 0x44, + 0x3d, 0xc6, 0x71, 0x96, 0xa0, 0x71, 0x80, 0x23, 0x90, 0xef, 0x18, 0x1f, 0x04, 0x91, 0x8f, 0x87, + 0x3b, 0xf4, 0x22, 0xee, 0xd3, 0x1d, 0xec, 0x43, 0x04, 0x9c, 0x4a, 0xe8, 0x39, 0x31, 0x67, 0x92, + 0x59, 0xf6, 0x98, 0x77, 0x68, 0x1c, 0x38, 0x39, 0xef, 0x4c, 0xf8, 0xcd, 0x6d, 0x3f, 0x90, 0xfd, + 0xa4, 0xeb, 0x78, 0x2c, 0xc4, 0x3e, 0xf3, 0x19, 0xd6, 0x65, 0xdd, 0xe4, 0x5c, 0xbf, 0xf4, 0x43, + 0xff, 0x35, 0x96, 0xdb, 0x6c, 0x16, 0xda, 0x7b, 0x8c, 0x03, 0x1e, 0x2e, 0xb4, 0xdc, 0xdc, 0xcb, + 0x99, 0x90, 0x7a, 0xfd, 0x20, 0x02, 0xfe, 0x1e, 0xc7, 0x03, 0x5f, 0x05, 0x04, 0x0e, 0x41, 0xd2, + 0xdf, 0x55, 0xe1, 0xdb, 0xaa, 0x78, 0x12, 0xc9, 0x20, 0x84, 0x85, 0x82, 0xd6, 0x7d, 0x05, 0xc2, + 0xeb, 0x43, 0x48, 0xe7, 0xeb, 0x9a, 0xdf, 0x0c, 0xb4, 0x7a, 0x70, 0x91, 0x08, 0x09, 0xfc, 0xa0, + 0x7d, 0x48, 0xac, 0x37, 0x68, 0x45, 0xcd, 0xd4, 0xa3, 0x92, 0xd6, 0x8c, 0x86, 0xb1, 0xb5, 0xba, + 0xfb, 0xc4, 0xc9, 0x3f, 0xda, 0x54, 0xda, 0x89, 0x07, 0xbe, 0x0a, 0x08, 0x47, 0xd1, 0xce, 0x70, + 0xc7, 0x39, 0xe9, 0xbe, 0x05, 0x4f, 0xbe, 0x00, 0x49, 0x5d, 0xeb, 0x72, 0x54, 0x2f, 0xa5, 0xa3, + 0x3a, 0xca, 0x63, 0x64, 0xaa, 0x6a, 0xbd, 0x44, 0x65, 0x11, 0x83, 0x57, 0x5b, 0xd2, 0xea, 0xd8, + 0xb9, 0xfb, 0x24, 0x4e, 0x61, 0xb8, 0xd3, 0x18, 0x3c, 0x77, 0x2d, 0x13, 0x2f, 0xab, 0x17, 0xd1, + 0x52, 0xcd, 0xaf, 0x06, 0xaa, 0x16, 0xb8, 0xe7, 0x81, 0x90, 0xd6, 0xd9, 0xc2, 0x22, 0xce, 0xc3, + 0x16, 0x51, 0xd5, 0x7a, 0x8d, 0x8d, 0xac, 0xd3, 0xca, 0x24, 0x52, 0x58, 0xa2, 0x83, 0x2a, 0x81, + 0x84, 0x50, 0xd4, 0x96, 0x1a, 0xcb, 0x5b, 0xab, 0xbb, 0xff, 0xfd, 0xc1, 0x16, 0xee, 0x7a, 0xa6, + 0x5b, 0x69, 0x2b, 0x05, 0x32, 0x16, 0x6a, 0xfe, 0x9c, 0xdd, 0x41, 0x6d, 0x67, 0xbd, 0x42, 0x6b, + 0x11, 0xeb, 0xc1, 0x29, 0x5c, 0x80, 0x27, 0x19, 0xcf, 0xf6, 0x68, 0x14, 0x9b, 0x29, 0xdb, 0xa9, + 0xa9, 0x8f, 0x0b, 0x9c, 0xbb, 0x91, 0x8e, 0xea, 0x6b, 0xc5, 0x08, 0x99, 0xd1, 0xb1, 0xf6, 0x51, + 0x35, 0x06, 0xae, 0x80, 0x67, 0x4c, 0x48, 0x37, 0x90, 0x42, 0x5f, 0xa3, 0xe2, 0xfe, 0x9d, 0x8d, + 0x56, 0xed, 0xcc, 0xa6, 0xc9, 0x3c, 0x6f, 0x35, 0x50, 0x39, 0x88, 0x87, 0x7b, 0xb5, 0xe5, 0x86, + 0xb1, 0x65, 0xe6, 0x47, 0x69, 0x77, 0x86, 0x7b, 0x44, 0x67, 0x32, 0xa2, 0x55, 0x2b, 0x2f, 0x10, + 0x2d, 0x4d, 0xb4, 0x9a, 0x5f, 0x0c, 0x64, 0xb6, 0x3b, 0xfb, 0xbd, 0x1e, 0x07, 0x21, 0x1e, 0xc1, + 0x79, 0x27, 0x33, 0xce, 0xdb, 0xbe, 0xef, 0x66, 0xd3, 0xd1, 0x6e, 0xf5, 0xdd, 0x67, 0x03, 0xad, + 0x4f, 0xa9, 0x47, 0x70, 0xdd, 0xf1, 0xac, 0xeb, 0xfe, 0x7d, 0xf0, 0x06, 0xb7, 0x78, 0x2e, 0x2c, + 0x8c, 0xaf, 0x0d, 0x77, 0x86, 0xcc, 0x98, 0x72, 0x88, 0x24, 0x81, 0xf3, 0x6c, 0xfe, 0x7b, 0xff, + 0x41, 0x3b, 0x93, 0x02, 0xe0, 0x10, 0x79, 0xe0, 0xae, 0xa7, 0xa3, 0xba, 0x39, 0x0d, 0x92, 0x5c, + 0xb0, 0xf9, 0xc9, 0x40, 0xd5, 0x39, 0xda, 0xfa, 0x07, 0x55, 0x7c, 0xce, 0x92, 0x58, 0x77, 0x33, + 0xf3, 0x39, 0x8f, 0x54, 0x90, 0x8c, 0x73, 0xd6, 0xff, 0x68, 0x85, 0x83, 0x60, 0x09, 0xf7, 0x40, + 0x1f, 0xcf, 0xcc, 0xbf, 0x12, 0xc9, 0xe2, 0x64, 0x4a, 0x58, 0x18, 0x99, 0x11, 0x0d, 0x41, 0xc4, + 0xd4, 0x83, 0xcc, 0x9f, 0x7f, 0x65, 0xb8, 0x79, 0x3c, 0x49, 0x90, 0x9c, 0x51, 0x4e, 0x55, 0x8f, + 0x79, 0xa7, 0x2a, 0x96, 0xe8, 0x8c, 0x7b, 0x78, 0x79, 0x63, 0x97, 0xae, 0x6e, 0xec, 0xd2, 0xf5, + 0x8d, 0x5d, 0xfa, 0x90, 0xda, 0xc6, 0x65, 0x6a, 0x1b, 0x57, 0xa9, 0x6d, 0x5c, 0xa7, 0xb6, 0xf1, + 0x3d, 0xb5, 0x8d, 0x8f, 0x3f, 0xec, 0xd2, 0x6b, 0xfb, 0xee, 0x5f, 0xa3, 0x5f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x33, 0x03, 0x4c, 0x8e, 0xc7, 0x06, 0x00, 0x00, } func (m *ClusterCIDR) Marshal() (dAtA []byte, err error) { @@ -587,11 +583,6 @@ func (m *ParentReference) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - i -= len(m.UID) - copy(dAtA[i:], m.UID) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.UID))) - i-- - dAtA[i] = 0x2a i -= len(m.Name) copy(dAtA[i:], m.Name) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Name))) @@ -731,8 +722,6 @@ func (m *ParentReference) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.Name) n += 1 + l + sovGenerated(uint64(l)) - l = len(m.UID) - n += 1 + l + sovGenerated(uint64(l)) return n } @@ -828,7 +817,6 @@ func (this *ParentReference) String() string { `Resource:` + fmt.Sprintf("%v", this.Resource) + `,`, `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, `Name:` + fmt.Sprintf("%v", this.Name) + `,`, - `UID:` + fmt.Sprintf("%v", this.UID) + `,`, `}`, }, "") return s @@ -1719,38 +1707,6 @@ func (m *ParentReference) Unmarshal(dAtA []byte) error { } m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field UID", 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.UID = k8s_io_apimachinery_pkg_types.UID(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/staging/src/k8s.io/api/networking/v1alpha1/generated.proto b/staging/src/k8s.io/api/networking/v1alpha1/generated.proto index 0f1f30d7011..82fda0b9911 100644 --- a/staging/src/k8s.io/api/networking/v1alpha1/generated.proto +++ b/staging/src/k8s.io/api/networking/v1alpha1/generated.proto @@ -147,9 +147,5 @@ message ParentReference { // Name is the name of the object being referenced. // +required optional string name = 4; - - // UID is the uid of the object being referenced. - // +optional - optional string uid = 5; } diff --git a/staging/src/k8s.io/api/networking/v1alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/networking/v1alpha1/types_swagger_doc_generated.go index 85304784f4e..35105b80bfa 100644 --- a/staging/src/k8s.io/api/networking/v1alpha1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/networking/v1alpha1/types_swagger_doc_generated.go @@ -94,7 +94,6 @@ var map_ParentReference = map[string]string{ "resource": "Resource is the resource of the object being referenced.", "namespace": "Namespace is the namespace of the object being referenced.", "name": "Name is the name of the object being referenced.", - "uid": "UID is the uid of the object being referenced.", } func (ParentReference) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.json b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.json index 8910af7a723..c5f84c6f506 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.json +++ b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.json @@ -48,8 +48,7 @@ "group": "groupValue", "resource": "resourceValue", "namespace": "namespaceValue", - "name": "nameValue", - "uid": "uidValue" + "name": "nameValue" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.pb b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.pb index cf58bbab2dc..7fceacd6bca 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.pb and b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.yaml b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.yaml index 0b591beae2b..0bf2b17cb87 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1alpha1.IPAddress.yaml @@ -38,4 +38,3 @@ spec: name: nameValue namespace: namespaceValue resource: resourceValue - uid: uidValue diff --git a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go index b05d08a4b43..1fcbac1d647 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -10325,9 +10325,6 @@ var schemaYAML = typed.YAMLObject(`types: - name: resource type: scalar: string - - name: uid - type: - scalar: string - name: io.k8s.api.networking.v1beta1.HTTPIngressPath map: fields: diff --git a/staging/src/k8s.io/client-go/applyconfigurations/networking/v1alpha1/parentreference.go b/staging/src/k8s.io/client-go/applyconfigurations/networking/v1alpha1/parentreference.go index 14b10b19ff6..ce1049709a0 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/networking/v1alpha1/parentreference.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/networking/v1alpha1/parentreference.go @@ -18,18 +18,13 @@ limitations under the License. package v1alpha1 -import ( - types "k8s.io/apimachinery/pkg/types" -) - // ParentReferenceApplyConfiguration represents an declarative configuration of the ParentReference type for use // with apply. type ParentReferenceApplyConfiguration struct { - Group *string `json:"group,omitempty"` - Resource *string `json:"resource,omitempty"` - Namespace *string `json:"namespace,omitempty"` - Name *string `json:"name,omitempty"` - UID *types.UID `json:"uid,omitempty"` + Group *string `json:"group,omitempty"` + Resource *string `json:"resource,omitempty"` + Namespace *string `json:"namespace,omitempty"` + Name *string `json:"name,omitempty"` } // ParentReferenceApplyConfiguration constructs an declarative configuration of the ParentReference type for use with @@ -69,11 +64,3 @@ func (b *ParentReferenceApplyConfiguration) WithName(value string) *ParentRefere b.Name = &value return b } - -// WithUID sets the UID 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 UID field is set to the value of the last call. -func (b *ParentReferenceApplyConfiguration) WithUID(value types.UID) *ParentReferenceApplyConfiguration { - b.UID = &value - return b -}