Merge pull request #45247 from mbohlool/c3

Automatic merge from submit-queue (batch tested with PRs 45247, 45810, 45034, 45898, 45899)

Apiregistration v1alpha1→v1beta1

Promoting apiregistration api from v1alpha1 to v1beta1.

API Registration is responsible for registering an API `Group`/`Version` with
another kubernetes like API server. The `APIService` holds information
about the other API server in `APIServiceSpec` type as well as general
`TypeMeta` and `ObjectMeta`. The `APIServiceSpec` type have the main
configuration needed to do the aggregation. Any request coming for
specified `Group`/`Version` will be directed to the service defined by
`ServiceReference` (on port 443) after validating the target using provided
`CABundle` or skipping validation if development flag `InsecureSkipTLSVerify`
is set. `Priority` is controlling the order of this API group in the overall
discovery document.
The return status is a set of conditions for this aggregation. Currently
there is only one condition named "Available", if true, it means the
api/server requests will be redirected to specified API server.

```release-note
API Registration is now in beta.
```
This commit is contained in:
Kubernetes Submit Queue
2017-05-16 19:01:55 -07:00
committed by GitHub
119 changed files with 3967 additions and 6430 deletions

View File

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

View File

@@ -26,7 +26,7 @@ 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/apiserver/pkg/apis/example/v1/generated.proto";
import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/generated.proto";
import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated".
option go_package = "v1beta1";