move util/intstr to apimachinery

2026-01-04 23:17:50 +00:00 · 2017-01-27 15:42:17 -05:00
parent 722c8b065a
commit c9a008dff3
198 changed files with 2049 additions and 2012 deletions
--- a/pkg/apis/apps/v1beta1/BUILD
+++ b/pkg/apis/apps/v1beta1/BUILD
@@ -27,7 +27,6 @@ go_library(
        "//pkg/api:go_default_library",
        "//pkg/api/v1:go_default_library",
        "//pkg/apis/apps:go_default_library",
-        "//pkg/util/intstr:go_default_library",
        "//vendor:github.com/gogo/protobuf/proto",
        "//vendor:github.com/ugorji/go/codec",
        "//vendor:k8s.io/apimachinery/pkg/api/resource",
@@ -36,6 +35,7 @@ go_library(
        "//vendor:k8s.io/apimachinery/pkg/runtime",
        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/intstr",
    ],
 )

--- a/pkg/apis/apps/v1beta1/generated.pb.go
+++ b/pkg/apis/apps/v1beta1/generated.pb.go
@@ -1033,46 +1033,45 @@ var (
 )

 var fileDescriptorGenerated = []byte{
-	// 647 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xc7, 0xe3, 0xa4, 0x29, 0x61, 0x53, 0xbe, 0x96, 0x0a, 0x45, 0x15, 0x72, 0xab, 0x5c, 0x08,
-	0x52, 0xbb, 0x4b, 0xda, 0x02, 0x15, 0x47, 0x23, 0x81, 0x90, 0x80, 0x22, 0x07, 0x55, 0xa2, 0x80,
-	0xc4, 0xda, 0x99, 0xa6, 0x4b, 0xec, 0xd8, 0xf2, 0x8e, 0x23, 0x71, 0xe3, 0xc2, 0x81, 0x1b, 0x6f,
-	0xc2, 0x8d, 0x67, 0xa8, 0x38, 0xf5, 0xc8, 0xa9, 0xa2, 0xe1, 0x45, 0x90, 0x37, 0x9b, 0x0f, 0xea,
-	0x94, 0x56, 0xbd, 0x65, 0xd6, 0xf3, 0xff, 0xcd, 0xcc, 0x7f, 0x26, 0xe4, 0x61, 0x77, 0x4b, 0x31,
-	0x19, 0xf1, 0x6e, 0xea, 0x41, 0xd2, 0x03, 0x04, 0xc5, 0xe3, 0x6e, 0x87, 0x8b, 0x58, 0x2a, 0x2e,
-	0xe2, 0x58, 0xf1, 0x7e, 0xd3, 0x03, 0x14, 0x4d, 0xde, 0x81, 0x1e, 0x24, 0x02, 0xa1, 0xcd, 0xe2,
-	0x24, 0xc2, 0x88, 0xde, 0x19, 0x0a, 0xd9, 0x44, 0xc8, 0xe2, 0x6e, 0x87, 0x65, 0x42, 0x96, 0x09,
-	0x99, 0x11, 0x2e, 0xad, 0x75, 0x24, 0xee, 0xa7, 0x1e, 0xf3, 0xa3, 0x90, 0x77, 0xa2, 0x4e, 0xc4,
-	0xb5, 0xde, 0x4b, 0xf7, 0x74, 0xa4, 0x03, 0xfd, 0x6b, 0xc8, 0x5d, 0xda, 0x34, 0x0d, 0x89, 0x58,
-	0x86, 0xc2, 0xdf, 0x97, 0x3d, 0x48, 0x3e, 0x8d, 0x5a, 0xe2, 0x09, 0xa8, 0x28, 0x4d, 0x7c, 0x38,
-	0xd9, 0xcd, 0x7f, 0x55, 0x8a, 0x87, 0x80, 0x82, 0xf7, 0x73, 0x33, 0x2c, 0xf1, 0xd3, 0x54, 0x49,
-	0xda, 0x43, 0x19, 0xe6, 0xcb, 0x3c, 0x38, 0x4b, 0xa0, 0xfc, 0x7d, 0x08, 0x45, 0x4e, 0xb7, 0x7a,
-	0xaa, 0xcb, 0xb3, 0xda, 0x6a, 0xce, 0xce, 0x4e, 0x51, 0x06, 0x5c, 0xf6, 0x50, 0x61, 0x72, 0x52,
-	0x52, 0xff, 0x5e, 0x24, 0xd5, 0x16, 0x0a, 0x84, 0xbd, 0x34, 0x68, 0x01, 0xd2, 0x0f, 0xa4, 0x92,
-	0x0d, 0xdd, 0x16, 0x28, 0x6a, 0xd6, 0x8a, 0xd5, 0xa8, 0xae, 0xdf, 0x63, 0x66, 0x61, 0xd3, 0xbd,
-	0x4f, 0x56, 0x96, 0x65, 0xb3, 0x7e, 0x93, 0x6d, 0x7b, 0x1f, 0xc1, 0xc7, 0x17, 0x80, 0xc2, 0xa1,
-	0x07, 0x47, 0xcb, 0x85, 0xc1, 0xd1, 0x32, 0x99, 0xbc, 0xb9, 0x63, 0x2a, 0xdd, 0x25, 0x73, 0x2a,
-	0x06, 0xbf, 0x56, 0xd4, 0xf4, 0x2d, 0x76, 0xce, 0x73, 0x60, 0x53, 0x5d, 0xb6, 0x62, 0xf0, 0x9d,
-	0x05, 0x53, 0x65, 0x2e, 0x8b, 0x5c, 0xcd, 0xa4, 0x1e, 0x99, 0x57, 0x28, 0x30, 0x55, 0xb5, 0x92,
-	0xa6, 0x3f, 0xba, 0x10, 0x5d, 0x13, 0x9c, 0xab, 0x86, 0x3f, 0x3f, 0x8c, 0x5d, 0x43, 0xae, 0xff,
-	0xb4, 0xc8, 0xb5, 0xa9, 0xec, 0xe7, 0x52, 0x21, 0x7d, 0x97, 0x73, 0x8d, 0x9d, 0xcf, 0xb5, 0x4c,
-	0xad, 0x3d, 0xbb, 0x6e, 0xaa, 0x55, 0x46, 0x2f, 0x53, 0x8e, 0xbd, 0x21, 0x65, 0x89, 0x10, 0xaa,
-	0x5a, 0x71, 0xa5, 0xd4, 0xa8, 0xae, 0x6f, 0x5e, 0x64, 0x28, 0xe7, 0x8a, 0x29, 0x50, 0x7e, 0x96,
-	0xa1, 0xdc, 0x21, 0xb1, 0xfe, 0xa3, 0xf4, 0xcf, 0x30, 0x99, 0x95, 0xb4, 0x41, 0x2a, 0x09, 0xc4,
-	0x81, 0xf4, 0x85, 0xd2, 0xc3, 0x94, 0x9d, 0x85, 0xac, 0x31, 0xd7, 0xbc, 0xb9, 0xe3, 0xaf, 0xf4,
-	0x3d, 0xa9, 0x28, 0x08, 0xc0, 0xc7, 0x28, 0x31, 0xeb, 0xdc, 0x38, 0xe7, 0xd8, 0xc2, 0x83, 0xa0,
-	0x65, 0xa4, 0x43, 0xfc, 0x28, 0x72, 0xc7, 0x48, 0xfa, 0x96, 0x54, 0x10, 0xc2, 0x38, 0x10, 0x08,
-	0x66, 0x9f, 0x6b, 0xa7, 0x8f, 0x9e, 0x61, 0x5f, 0x45, 0xed, 0xd7, 0x46, 0xa0, 0x4f, 0x64, 0x6c,
-	0xea, 0xe8, 0xd5, 0x1d, 0x03, 0xe9, 0x17, 0x8b, 0x2c, 0xf6, 0xa3, 0x20, 0x0d, 0xe1, 0x71, 0x20,
-	0x64, 0x38, 0xca, 0x50, 0xb5, 0x39, 0x6d, 0xf2, 0xc6, 0x19, 0x95, 0x20, 0x51, 0x52, 0x21, 0xf4,
-	0x70, 0x67, 0xc2, 0x70, 0x6e, 0x9b, 0x7a, 0x8b, 0x3b, 0x33, 0xc0, 0xee, 0xcc, 0x72, 0xf4, 0x3e,
-	0xa9, 0x2a, 0x48, 0xfa, 0xd2, 0x87, 0x97, 0x22, 0x84, 0x5a, 0x79, 0xc5, 0x6a, 0x5c, 0x76, 0x6e,
-	0x1a, 0x50, 0xb5, 0x35, 0xf9, 0xe4, 0x4e, 0xe7, 0xd5, 0xbf, 0x5a, 0xe4, 0x46, 0xee, 0x66, 0xe9,
-	0x13, 0x42, 0x23, 0x2f, 0x4b, 0x83, 0xf6, 0xd3, 0xe1, 0x1f, 0x5d, 0x46, 0x3d, 0xbd, 0xc4, 0x92,
-	0x73, 0x6b, 0x70, 0xb4, 0x4c, 0xb7, 0x73, 0x5f, 0xdd, 0x19, 0x0a, 0xba, 0x3a, 0x75, 0x02, 0x45,
-	0x7d, 0x02, 0x63, 0x2b, 0xf3, 0x67, 0xe0, 0xdc, 0x3d, 0x38, 0xb6, 0x0b, 0x87, 0xc7, 0x76, 0xe1,
-	0xd7, 0xb1, 0x5d, 0xf8, 0x3c, 0xb0, 0xad, 0x83, 0x81, 0x6d, 0x1d, 0x0e, 0x6c, 0xeb, 0xf7, 0xc0,
-	0xb6, 0xbe, 0xfd, 0xb1, 0x0b, 0xbb, 0x97, 0xcc, 0x45, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x39,
-	0x79, 0xea, 0x95, 0x36, 0x06, 0x00, 0x00,
+	// 635 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0x4d, 0x6f, 0xd3, 0x4c,
+	0x10, 0xc7, 0xe3, 0xa4, 0xe9, 0x93, 0x67, 0x53, 0xde, 0x96, 0x0a, 0x45, 0x15, 0x72, 0xab, 0x5c,
+	0x08, 0x52, 0xbb, 0xa6, 0x2f, 0x40, 0xc5, 0xd1, 0x48, 0x20, 0x24, 0xa0, 0xc8, 0x41, 0x95, 0x28,
+	0x20, 0xb1, 0x76, 0xa6, 0xe9, 0x12, 0xbf, 0xc9, 0x3b, 0x8e, 0xc4, 0x8d, 0x0b, 0x07, 0x6e, 0x7c,
+	0x13, 0x6e, 0x7c, 0x86, 0x8a, 0x53, 0x8f, 0x9c, 0x2a, 0x1a, 0xbe, 0x08, 0xf2, 0x66, 0x13, 0x1b,
+	0x39, 0x51, 0xab, 0xde, 0x3c, 0xbb, 0xf3, 0xff, 0xcd, 0xcc, 0x7f, 0xc7, 0xe4, 0xe1, 0x60, 0x57,
+	0x32, 0x11, 0x59, 0x83, 0xd4, 0x85, 0x24, 0x04, 0x04, 0x69, 0xc5, 0x83, 0xbe, 0xc5, 0x63, 0x21,
+	0x2d, 0x1e, 0xc7, 0xd2, 0x1a, 0x6e, 0xba, 0x80, 0x7c, 0xd3, 0xea, 0x43, 0x08, 0x09, 0x47, 0xe8,
+	0xb1, 0x38, 0x89, 0x30, 0xa2, 0x77, 0xc6, 0x42, 0x96, 0x0b, 0x59, 0x3c, 0xe8, 0xb3, 0x4c, 0xc8,
+	0x32, 0x21, 0xd3, 0xc2, 0x95, 0x8d, 0xbe, 0xc0, 0xa3, 0xd4, 0x65, 0x5e, 0x14, 0x58, 0xfd, 0xa8,
+	0x1f, 0x59, 0x4a, 0xef, 0xa6, 0x87, 0x2a, 0x52, 0x81, 0xfa, 0x1a, 0x73, 0x57, 0x76, 0x74, 0x43,
+	0x3c, 0x16, 0x01, 0xf7, 0x8e, 0x44, 0x08, 0xc9, 0xa7, 0xbc, 0xa5, 0x00, 0x90, 0x5b, 0xc3, 0x52,
+	0x37, 0x2b, 0xd6, 0x3c, 0x55, 0x92, 0x86, 0x28, 0x02, 0x28, 0x09, 0x1e, 0x9c, 0x27, 0x90, 0xde,
+	0x11, 0x04, 0xbc, 0xa4, 0xdb, 0x9e, 0xa7, 0x4b, 0x51, 0xf8, 0x96, 0x08, 0x51, 0x62, 0x52, 0x12,
+	0xad, 0xcf, 0x35, 0x79, 0xc6, 0x2c, 0xed, 0xef, 0x55, 0xd2, 0xec, 0x22, 0x47, 0x38, 0x4c, 0xfd,
+	0x2e, 0x20, 0xfd, 0x40, 0x1a, 0xd9, 0xd8, 0x3d, 0x8e, 0xbc, 0x65, 0xac, 0x19, 0x9d, 0xe6, 0xd6,
+	0x3d, 0xa6, 0xcd, 0x2f, 0x76, 0x91, 0xdb, 0x9f, 0x65, 0xb3, 0xe1, 0x26, 0xdb, 0x73, 0x3f, 0x82,
+	0x87, 0x2f, 0x00, 0xb9, 0x4d, 0x8f, 0x4f, 0x57, 0x2b, 0xa3, 0xd3, 0x55, 0x92, 0x9f, 0x39, 0x53,
+	0x2a, 0x3d, 0x20, 0x0b, 0x32, 0x06, 0xaf, 0x55, 0x55, 0xf4, 0x5d, 0x76, 0xc1, 0xa7, 0x65, 0x85,
+	0x2e, 0xbb, 0x31, 0x78, 0xf6, 0x92, 0xae, 0xb2, 0x90, 0x45, 0x8e, 0x62, 0x52, 0x97, 0x2c, 0x4a,
+	0xe4, 0x98, 0xca, 0x56, 0x4d, 0xd1, 0x1f, 0x5d, 0x8a, 0xae, 0x08, 0xf6, 0x55, 0xcd, 0x5f, 0x1c,
+	0xc7, 0x8e, 0x26, 0xb7, 0x7f, 0x1a, 0xe4, 0x5a, 0x21, 0xfb, 0xb9, 0x90, 0x48, 0xdf, 0x95, 0x5c,
+	0x63, 0x17, 0x73, 0x2d, 0x53, 0x2b, 0xcf, 0xae, 0xeb, 0x6a, 0x8d, 0xc9, 0x49, 0xc1, 0xb1, 0x37,
+	0xa4, 0x2e, 0x10, 0x02, 0xd9, 0xaa, 0xae, 0xd5, 0x3a, 0xcd, 0xad, 0x9d, 0xcb, 0x0c, 0x65, 0x5f,
+	0xd1, 0x05, 0xea, 0xcf, 0x32, 0x94, 0x33, 0x26, 0xb6, 0x7f, 0xd4, 0xfe, 0x19, 0x26, 0xb3, 0x92,
+	0x76, 0x48, 0x23, 0x81, 0xd8, 0x17, 0x1e, 0x97, 0x6a, 0x98, 0xba, 0xbd, 0x94, 0x35, 0xe6, 0xe8,
+	0x33, 0x67, 0x7a, 0x4b, 0xdf, 0x93, 0x86, 0x04, 0x1f, 0x3c, 0x8c, 0x12, 0xfd, 0x9c, 0xdb, 0x17,
+	0x1c, 0x9b, 0xbb, 0xe0, 0x77, 0xb5, 0x74, 0x8c, 0x9f, 0x44, 0xce, 0x14, 0x49, 0xdf, 0x92, 0x06,
+	0x42, 0x10, 0xfb, 0x1c, 0x41, 0xbf, 0xe7, 0xc6, 0xfc, 0xd1, 0x33, 0xec, 0xab, 0xa8, 0xf7, 0x5a,
+	0x0b, 0xd4, 0x8a, 0x4c, 0x4d, 0x9d, 0x9c, 0x3a, 0x53, 0x20, 0xfd, 0x62, 0x90, 0xe5, 0x61, 0xe4,
+	0xa7, 0x01, 0x3c, 0xf6, 0xb9, 0x08, 0x26, 0x19, 0xb2, 0xb5, 0xa0, 0x4c, 0xde, 0x3e, 0xa7, 0x12,
+	0x24, 0x52, 0x48, 0x84, 0x10, 0xf7, 0x73, 0x86, 0x7d, 0x5b, 0xd7, 0x5b, 0xde, 0x9f, 0x01, 0x76,
+	0x66, 0x96, 0xa3, 0xf7, 0x49, 0x53, 0x42, 0x32, 0x14, 0x1e, 0xbc, 0xe4, 0x01, 0xb4, 0xea, 0x6b,
+	0x46, 0xe7, 0x7f, 0xfb, 0xa6, 0x06, 0x35, 0xbb, 0xf9, 0x95, 0x53, 0xcc, 0x6b, 0x7f, 0x35, 0xc8,
+	0x8d, 0xd2, 0xce, 0xd2, 0x27, 0x84, 0x46, 0x6e, 0x96, 0x06, 0xbd, 0xa7, 0xe3, 0x1f, 0x5d, 0x44,
+	0xa1, 0x7a, 0xc4, 0x9a, 0x7d, 0x6b, 0x74, 0xba, 0x4a, 0xf7, 0x4a, 0xb7, 0xce, 0x0c, 0x05, 0x5d,
+	0x2f, 0xac, 0x40, 0x55, 0xad, 0xc0, 0xd4, 0xca, 0xf2, 0x1a, 0xd8, 0x77, 0x8f, 0xcf, 0xcc, 0xca,
+	0xc9, 0x99, 0x59, 0xf9, 0x75, 0x66, 0x56, 0x3e, 0x8f, 0x4c, 0xe3, 0x78, 0x64, 0x1a, 0x27, 0x23,
+	0xd3, 0xf8, 0x3d, 0x32, 0x8d, 0x6f, 0x7f, 0xcc, 0xca, 0xc1, 0x7f, 0x7a, 0x23, 0xff, 0x06, 0x00,
+	0x00, 0xff, 0xff, 0x85, 0x17, 0x32, 0x0e, 0x02, 0x06, 0x00, 0x00,
 }
--- a/pkg/apis/apps/v1beta1/generated.proto
+++ b/pkg/apis/apps/v1beta1/generated.proto
@@ -21,12 +21,11 @@ syntax = 'proto2';

 package k8s.io.kubernetes.pkg.apis.apps.v1beta1;

-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
+import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";

 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";
--- a/pkg/apis/apps/v1beta1/types.generated.go
+++ b/pkg/apis/apps/v1beta1/types.generated.go
@@ -28,8 +28,8 @@ import (
 	pkg4_resource "k8s.io/apimachinery/pkg/api/resource"
 	pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkg2_types "k8s.io/apimachinery/pkg/types"
+	pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr"
 	pkg3_v1 "k8s.io/kubernetes/pkg/api/v1"
-	pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr"
 	"reflect"
 	"runtime"
 	time "time"
@@ -68,8 +68,8 @@ func init() {
 		var v0 pkg4_resource.Quantity
 		var v1 pkg1_v1.TypeMeta
 		var v2 pkg2_types.UID
-		var v3 pkg3_v1.PodTemplateSpec
-		var v4 pkg5_intstr.IntOrString
+		var v3 pkg5_intstr.IntOrString
+		var v4 pkg3_v1.PodTemplateSpec
 		var v5 time.Time
 		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
 	}