published by bot

(https://github.com/kubernetes/contrib/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is 3aa29bca4f6f9e43d8e2a8e3a1587d92b1b2dfe2

pkg/apis/storage/doc.go

@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
 // +groupName=storage.k8s.io
 package storage

pkg/apis/storage/v1beta1/doc.go

@@ -14,9 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/storage
 // +groupName=storage.k8s.io
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
 package v1beta1

pkg/apis/storage/v1beta1/generated.pb.go

@@ -105,14 +105,6 @@ func (m *StorageClass) MarshalTo(data []byte) (int, error) {
 			i += copy(data[i:], v)
 		}
 	}
-	data[i] = 0x22
-	i++
-	i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
-	n2, err := m.TypeMeta.MarshalTo(data[i:])
-	if err != nil {
-		return 0, err
-	}
-	i += n2
 	return i, nil
 }
 
@@ -134,11 +126,11 @@ func (m *StorageClassList) MarshalTo(data []byte) (int, error) {
 	data[i] = 0xa
 	i++
 	i = encodeVarintGenerated(data, i, uint64(m.ListMeta.Size()))
-	n3, err := m.ListMeta.MarshalTo(data[i:])
+	n2, err := m.ListMeta.MarshalTo(data[i:])
 	if err != nil {
 		return 0, err
 	}
-	i += n3
+	i += n2
 	if len(m.Items) > 0 {
 		for _, msg := range m.Items {
 			data[i] = 0x12
@@ -151,14 +143,6 @@ func (m *StorageClassList) MarshalTo(data []byte) (int, error) {
 			i += n
 		}
 	}
-	data[i] = 0x1a
-	i++
-	i = encodeVarintGenerated(data, i, uint64(m.TypeMeta.Size()))
-	n4, err := m.TypeMeta.MarshalTo(data[i:])
-	if err != nil {
-		return 0, err
-	}
-	i += n4
 	return i, nil
 }
 
@@ -204,8 +188,6 @@ func (m *StorageClass) Size() (n int) {
 			n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize))
 		}
 	}
-	l = m.TypeMeta.Size()
-	n += 1 + l + sovGenerated(uint64(l))
 	return n
 }
 
@@ -220,8 +202,6 @@ func (m *StorageClassList) Size() (n int) {
 			n += 1 + l + sovGenerated(uint64(l))
 		}
 	}
-	l = m.TypeMeta.Size()
-	n += 1 + l + sovGenerated(uint64(l))
 	return n
 }
 
@@ -256,7 +236,6 @@ func (this *StorageClass) String() string {
 		`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
 		`Provisioner:` + fmt.Sprintf("%v", this.Provisioner) + `,`,
 		`Parameters:` + mapStringForParameters + `,`,
-		`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -268,7 +247,6 @@ func (this *StorageClassList) String() string {
 	s := strings.Join([]string{`&StorageClassList{`,
 		`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
 		`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StorageClass", "StorageClass", 1), `&`, ``, 1) + `,`,
-		`TypeMeta:` + strings.Replace(strings.Replace(this.TypeMeta.String(), "TypeMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.TypeMeta", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -480,36 +458,6 @@ func (m *StorageClass) Unmarshal(data []byte) error {
 			}
 			m.Parameters[mapkey] = mapvalue
 			iNdEx = postIndex
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + msglen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipGenerated(data[iNdEx:])
@@ -621,36 +569,6 @@ func (m *StorageClassList) Unmarshal(data []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field TypeMeta", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := data[iNdEx]
-				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + msglen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if err := m.TypeMeta.Unmarshal(data[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipGenerated(data[iNdEx:])
@@ -778,38 +696,36 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 518 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x92, 0x4f, 0x8b, 0xd3, 0x40,
-	0x18, 0xc6, 0x9b, 0xc6, 0x62, 0x77, 0xaa, 0x58, 0xa2, 0x87, 0xd0, 0x43, 0xb6, 0xec, 0xa9, 0x8a,
-	0xce, 0xd0, 0xa2, 0x52, 0x16, 0xbc, 0x44, 0x04, 0x05, 0xc5, 0x25, 0x7a, 0x10, 0xd1, 0xc3, 0x24,
-	0xfb, 0x9a, 0x8e, 0x69, 0x32, 0x61, 0x66, 0x12, 0x28, 0x78, 0xf0, 0x23, 0xf8, 0x45, 0xfc, 0x02,
-	0x7e, 0x82, 0x1e, 0xf7, 0xe8, 0x69, 0xb1, 0xf1, 0x8b, 0x48, 0xfe, 0xb4, 0xc9, 0xb6, 0x5b, 0x5c,
-	0xc4, 0x5b, 0xe6, 0x9d, 0xf9, 0x3d, 0xef, 0xf3, 0x3e, 0x6f, 0xd0, 0x71, 0x30, 0x95, 0x98, 0x71,
-	0x12, 0x24, 0x2e, 0x88, 0x08, 0x14, 0x48, 0x12, 0x07, 0x3e, 0xa1, 0x31, 0x93, 0x44, 0x2a, 0x2e,
-	0xa8, 0x0f, 0x24, 0x1d, 0xbb, 0xa0, 0xe8, 0x98, 0xf8, 0x10, 0x81, 0xa0, 0x0a, 0x4e, 0x71, 0x2c,
-	0xb8, 0xe2, 0xc6, 0xbd, 0x92, 0xc5, 0x35, 0x8b, 0xe3, 0xc0, 0xc7, 0x39, 0x8b, 0x2b, 0x16, 0x57,
-	0xec, 0xe0, 0x81, 0xcf, 0xd4, 0x2c, 0x71, 0xb1, 0xc7, 0x43, 0xe2, 0x73, 0x9f, 0x93, 0x42, 0xc2,
-	0x4d, 0x3e, 0x15, 0xa7, 0xe2, 0x50, 0x7c, 0x95, 0xd2, 0x83, 0x87, 0x95, 0x2d, 0x1a, 0xb3, 0x90,
-	0x7a, 0x33, 0x16, 0x81, 0x58, 0xd4, 0xc6, 0x42, 0x50, 0x94, 0xa4, 0x3b, 0x86, 0x06, 0x64, 0x1f,
-	0x25, 0x92, 0x48, 0xb1, 0x10, 0x76, 0x80, 0xc7, 0x7f, 0x03, 0xa4, 0x37, 0x83, 0x90, 0xee, 0x70,
-	0x93, 0xbd, 0xa9, 0x11, 0x01, 0x92, 0x27, 0xc2, 0xdb, 0xed, 0x75, 0x7f, 0x3f, 0x73, 0xc9, 0x28,
-	0xe3, 0xcb, 0x5f, 0x27, 0x8a, 0xcd, 0x09, 0x8b, 0x94, 0x54, 0x62, 0x1b, 0x39, 0xfa, 0xa1, 0xa3,
-	0x1b, 0x6f, 0xca, 0xd8, 0x9f, 0xce, 0xa9, 0x94, 0xc6, 0x3b, 0xd4, 0xcd, 0x93, 0x3a, 0xa5, 0x8a,
-	0x9a, 0xda, 0x50, 0x1b, 0xf5, 0x26, 0x23, 0xbc, 0x77, 0x65, 0x38, 0x1d, 0xe3, 0xd7, 0xee, 0x67,
-	0xf0, 0xd4, 0x2b, 0x50, 0xd4, 0x36, 0x96, 0xe7, 0x87, 0xad, 0xec, 0xfc, 0x10, 0xd5, 0x35, 0x67,
-	0xa3, 0x66, 0x3c, 0x42, 0xbd, 0x58, 0xf0, 0x94, 0x49, 0xc6, 0x23, 0x10, 0x66, 0x7b, 0xa8, 0x8d,
-	0x0e, 0xec, 0xdb, 0x15, 0xd2, 0x3b, 0xa9, 0xaf, 0x9c, 0xe6, 0x3b, 0xe3, 0x0b, 0x42, 0x31, 0x15,
-	0x34, 0x04, 0x05, 0x42, 0x9a, 0xfa, 0x50, 0x1f, 0xf5, 0x26, 0xcf, 0xf1, 0xd5, 0xff, 0x22, 0xdc,
-	0x1c, 0x0f, 0x9f, 0x6c, 0xa4, 0x9e, 0x45, 0x4a, 0x2c, 0x6a, 0xcb, 0xf5, 0x85, 0xd3, 0xe8, 0x67,
-	0x7c, 0x40, 0x5d, 0xb5, 0x88, 0x21, 0x1f, 0xc5, 0xbc, 0x56, 0xc4, 0x81, 0xd7, 0xbd, 0x9b, 0xfb,
-	0xaf, 0xbb, 0xe7, 0xe3, 0xe6, 0xb1, 0xbc, 0xad, 0x28, 0xbb, 0x5f, 0x75, 0xe8, 0xae, 0x2b, 0xce,
-	0x46, 0x71, 0xf0, 0x04, 0xdd, 0xda, 0x32, 0x64, 0xf4, 0x91, 0x1e, 0xc0, 0xa2, 0x88, 0xfe, 0xc0,
-	0xc9, 0x3f, 0x8d, 0x3b, 0xa8, 0x93, 0xd2, 0x79, 0x02, 0x65, 0x62, 0x4e, 0x79, 0x38, 0x6e, 0x4f,
-	0xb5, 0xa3, 0xef, 0x6d, 0xd4, 0x6f, 0x4e, 0xf7, 0x92, 0x49, 0x95, 0x3b, 0xde, 0x5a, 0xe0, 0x15,
-	0x1d, 0xe7, 0xf4, 0x45, 0xc7, 0xeb, 0x4a, 0x63, 0x89, 0x1f, 0x51, 0x87, 0x29, 0x08, 0xa5, 0xd9,
-	0x2e, 0x16, 0x31, 0xfd, 0xd7, 0x45, 0xd8, 0x37, 0xab, 0x26, 0x9d, 0x17, 0xb9, 0x9c, 0x53, 0xaa,
-	0x5e, 0x88, 0x5b, 0xff, 0xdf, 0x71, 0xdb, 0x77, 0x97, 0x2b, 0xab, 0x75, 0xb6, 0xb2, 0x5a, 0x3f,
-	0x57, 0x56, 0xeb, 0x6b, 0x66, 0x69, 0xcb, 0xcc, 0xd2, 0xce, 0x32, 0x4b, 0xfb, 0x95, 0x59, 0xda,
-	0xb7, 0xdf, 0x56, 0xeb, 0xfd, 0xf5, 0xca, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x27, 0xd0,
-	0x2e, 0x38, 0xe3, 0x04, 0x00, 0x00,
+	// 483 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8b, 0xd3, 0x40,
+	0x14, 0xc7, 0x93, 0x96, 0xe2, 0xee, 0x54, 0xb1, 0x44, 0x0f, 0xa5, 0x87, 0x6c, 0xd9, 0x53, 0x15,
+	0x9d, 0xa1, 0x45, 0xa5, 0x2c, 0x78, 0xa9, 0x08, 0x0a, 0x8a, 0x4b, 0xbc, 0x88, 0xe8, 0x61, 0x92,
+	0x7d, 0xa6, 0x63, 0x9a, 0x4c, 0x98, 0x79, 0x09, 0x14, 0x3c, 0xf8, 0x27, 0xf8, 0x67, 0xf5, 0xe6,
+	0x1e, 0x3d, 0xc8, 0x62, 0xe3, 0x3f, 0x22, 0xf9, 0xb1, 0x9b, 0xb0, 0x69, 0x51, 0xbc, 0xe5, 0xcd,
+	0xbc, 0xcf, 0xf7, 0xbd, 0xef, 0x37, 0x43, 0x4e, 0x82, 0xb9, 0xa6, 0x42, 0xb2, 0x20, 0x71, 0x41,
+	0x45, 0x80, 0xa0, 0x59, 0x1c, 0xf8, 0x8c, 0xc7, 0x42, 0x33, 0x8d, 0x52, 0x71, 0x1f, 0x58, 0x3a,
+	0x75, 0x01, 0xf9, 0x94, 0xf9, 0x10, 0x81, 0xe2, 0x08, 0x67, 0x34, 0x56, 0x12, 0xa5, 0x75, 0xbf,
+	0x64, 0x69, 0xcd, 0xd2, 0x38, 0xf0, 0x69, 0xce, 0xd2, 0x8a, 0xa5, 0x15, 0x3b, 0x7a, 0xe8, 0x0b,
+	0x5c, 0x26, 0x2e, 0xf5, 0x64, 0xc8, 0x7c, 0xe9, 0x4b, 0x56, 0x48, 0xb8, 0xc9, 0xa7, 0xa2, 0x2a,
+	0x8a, 0xe2, 0xab, 0x94, 0x1e, 0x3d, 0xaa, 0xd6, 0xe2, 0xb1, 0x08, 0xb9, 0xb7, 0x14, 0x11, 0xa8,
+	0x75, 0xbd, 0x58, 0x08, 0xc8, 0x59, 0xda, 0x5a, 0x68, 0xc4, 0xf6, 0x51, 0x2a, 0x89, 0x50, 0x84,
+	0xd0, 0x02, 0x9e, 0xfc, 0x0d, 0xd0, 0xde, 0x12, 0x42, 0xde, 0xe2, 0x66, 0x7b, 0x53, 0x63, 0x0a,
+	0xb4, 0x4c, 0x94, 0xd7, 0x9e, 0xf5, 0x60, 0x3f, 0xb3, 0xc3, 0xca, 0x74, 0x77, 0x77, 0x82, 0x62,
+	0xc5, 0x44, 0x84, 0x1a, 0xd5, 0x75, 0xe4, 0xf8, 0x67, 0x87, 0xdc, 0x7c, 0x5b, 0xc6, 0xfe, 0x6c,
+	0xc5, 0xb5, 0xb6, 0xde, 0x91, 0x83, 0x3c, 0xa9, 0x33, 0x8e, 0x7c, 0x68, 0x8e, 0xcd, 0x49, 0x7f,
+	0x36, 0xa1, 0x7b, 0x7f, 0x19, 0x4d, 0xa7, 0xf4, 0x8d, 0xfb, 0x19, 0x3c, 0x7c, 0x0d, 0xc8, 0x17,
+	0xd6, 0xe6, 0xe2, 0xc8, 0xc8, 0x2e, 0x8e, 0x48, 0x7d, 0xe6, 0x5c, 0xa9, 0x59, 0x8f, 0x49, 0x3f,
+	0x56, 0x32, 0x15, 0x5a, 0xc8, 0x08, 0xd4, 0xb0, 0x33, 0x36, 0x27, 0x87, 0x8b, 0x3b, 0x15, 0xd2,
+	0x3f, 0xad, 0xaf, 0x9c, 0x66, 0x9f, 0xf5, 0x85, 0x90, 0x98, 0x2b, 0x1e, 0x02, 0x82, 0xd2, 0xc3,
+	0xee, 0xb8, 0x3b, 0xe9, 0xcf, 0x5e, 0xd0, 0x7f, 0x7f, 0x45, 0xb4, 0x69, 0x8f, 0x9e, 0x5e, 0x49,
+	0x3d, 0x8f, 0x50, 0xad, 0xeb, 0x95, 0xeb, 0x0b, 0xa7, 0x31, 0x6f, 0xf4, 0x94, 0xdc, 0xbe, 0x86,
+	0x58, 0x03, 0xd2, 0x0d, 0x60, 0x5d, 0x84, 0x73, 0xe8, 0xe4, 0x9f, 0xd6, 0x5d, 0xd2, 0x4b, 0xf9,
+	0x2a, 0x81, 0xd2, 0x93, 0x53, 0x16, 0x27, 0x9d, 0xb9, 0x79, 0xfc, 0xdd, 0x24, 0x83, 0xe6, 0xfc,
+	0x57, 0x42, 0xa3, 0xf5, 0xa1, 0x15, 0x31, 0xbd, 0xf4, 0xd3, 0x7c, 0x53, 0xb5, 0xa3, 0xbc, 0x3b,
+	0x8f, 0x3a, 0xa7, 0x8b, 0xa0, 0x07, 0xd5, 0xd6, 0x07, 0x97, 0x27, 0x8d, 0x98, 0x3f, 0x92, 0x9e,
+	0x40, 0x08, 0xf5, 0xb0, 0x53, 0x44, 0x35, 0xff, 0xdf, 0xa8, 0x16, 0xb7, 0xaa, 0x21, 0xbd, 0x97,
+	0xb9, 0x9c, 0x53, 0xaa, 0x2e, 0xee, 0x6d, 0xb6, 0xb6, 0x71, 0xbe, 0xb5, 0x8d, 0x1f, 0x5b, 0xdb,
+	0xf8, 0x9a, 0xd9, 0xe6, 0x26, 0xb3, 0xcd, 0xf3, 0xcc, 0x36, 0x7f, 0x65, 0xb6, 0xf9, 0xed, 0xb7,
+	0x6d, 0xbc, 0xbf, 0x51, 0xa9, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x5e, 0x19, 0x8e, 0x27,
+	0x04, 0x00, 0x00,
 }

pkg/apis/storage/v1beta1/generated.proto

@@ -37,8 +37,6 @@ option go_package = "v1beta1";
 // StorageClasses are non-namespaced; the name of the storage class
 // according to etcd is in ObjectMeta.Name.
 message StorageClass {
-  optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 4;
-
   // Standard object's metadata.
   // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   // +optional
@@ -55,8 +53,6 @@ message StorageClass {
 
 // StorageClassList is a collection of storage classes.
 message StorageClassList {
-  optional k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta typeMeta = 3;
-
   // Standard list metadata
   // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   // +optional