Commit 3f0ebbe8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

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. ```
parents 8f81307b 103c1bfc
...@@ -58,7 +58,7 @@ func createAggregatorConfig(kubeAPIServerConfig genericapiserver.Config, command ...@@ -58,7 +58,7 @@ func createAggregatorConfig(kubeAPIServerConfig genericapiserver.Config, command
// copy the etcd options so we don't mutate originals. // copy the etcd options so we don't mutate originals.
etcdOptions := *commandOptions.Etcd etcdOptions := *commandOptions.Etcd
etcdOptions.StorageConfig.Codec = aggregatorapiserver.Codecs.LegacyCodec(schema.GroupVersion{Group: "apiregistration.k8s.io", Version: "v1alpha1"}) etcdOptions.StorageConfig.Codec = aggregatorapiserver.Codecs.LegacyCodec(schema.GroupVersion{Group: "apiregistration.k8s.io", Version: "v1beta1"})
etcdOptions.StorageConfig.Copier = aggregatorapiserver.Scheme etcdOptions.StorageConfig.Copier = aggregatorapiserver.Scheme
genericConfig.RESTOptionsGetter = &genericoptions.SimpleRestOptionsFactory{Options: etcdOptions} genericConfig.RESTOptionsGetter = &genericoptions.SimpleRestOptionsFactory{Options: etcdOptions}
......
...@@ -68,7 +68,7 @@ func New() *Generator { ...@@ -68,7 +68,7 @@ func New() *Generator {
`+k8s.io/apimachinery/pkg/runtime`, `+k8s.io/apimachinery/pkg/runtime`,
`k8s.io/apimachinery/pkg/apis/meta/v1`, `k8s.io/apimachinery/pkg/apis/meta/v1`,
`k8s.io/apiserver/pkg/apis/example/v1`, `k8s.io/apiserver/pkg/apis/example/v1`,
`k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1`, `k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1`,
`k8s.io/kubernetes/pkg/api/v1`, `k8s.io/kubernetes/pkg/api/v1`,
`k8s.io/kubernetes/pkg/apis/policy/v1beta1`, `k8s.io/kubernetes/pkg/apis/policy/v1beta1`,
`k8s.io/kubernetes/pkg/apis/extensions/v1beta1`, `k8s.io/kubernetes/pkg/apis/extensions/v1beta1`,
......
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -395,12 +395,12 @@ staging/src/k8s.io/kube-aggregator ...@@ -395,12 +395,12 @@ staging/src/k8s.io/kube-aggregator
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install
staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions
staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration
staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1alpha1 staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1beta1
staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion
staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration
staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion staging/src/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion
staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion
staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1 staging/src/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1
staging/src/k8s.io/kube-aggregator/pkg/controllers staging/src/k8s.io/kube-aggregator/pkg/controllers
staging/src/k8s.io/kube-apiextensions-server staging/src/k8s.io/kube-apiextensions-server
staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto"; import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto";
import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
option go_package = "v1"; option go_package = "v1";
......
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1/generated.proto"; import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1/generated.proto";
......
...@@ -1251,48 +1251,47 @@ func init() { ...@@ -1251,48 +1251,47 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 686 bytes of a gzipped FileDescriptorProto // 668 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x6f, 0x13, 0x31, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x6f, 0xd3, 0x4a,
0x10, 0xcd, 0xe6, 0xa3, 0x24, 0x0e, 0x85, 0x62, 0x09, 0x29, 0x8a, 0xc4, 0x26, 0x0a, 0x97, 0x22, 0x14, 0x8d, 0xf3, 0xd1, 0x97, 0x4c, 0x5e, 0xdf, 0xeb, 0x1b, 0xe9, 0x49, 0x51, 0x24, 0x9c, 0x28,
0x51, 0x2f, 0x29, 0xa8, 0x54, 0xad, 0x38, 0x74, 0xd5, 0x02, 0x3d, 0x20, 0x24, 0x97, 0x72, 0x40, 0x6c, 0x8a, 0x54, 0xc6, 0xa4, 0xa0, 0x52, 0xb5, 0x62, 0x51, 0xab, 0x05, 0x75, 0x81, 0x90, 0xa6,
0x42, 0xc2, 0x49, 0xa6, 0x1b, 0x93, 0xec, 0x87, 0xbc, 0xde, 0xb4, 0xbd, 0xf5, 0x27, 0x70, 0xe4, 0x94, 0x05, 0x12, 0x12, 0x13, 0xe7, 0xd6, 0x31, 0x8e, 0x3f, 0x34, 0x1e, 0xa7, 0xed, 0xae, 0x3f,
0xc8, 0x7f, 0xe1, 0xd2, 0x63, 0x0f, 0x1c, 0x38, 0xa0, 0x8a, 0x84, 0x3f, 0x82, 0xec, 0x75, 0x9b, 0x81, 0x25, 0x4b, 0xfe, 0x0b, 0x9b, 0x2e, 0xbb, 0x60, 0xc1, 0x02, 0x55, 0x24, 0xfc, 0x11, 0x34,
0x2d, 0xa1, 0x42, 0xb4, 0x37, 0xfb, 0x79, 0xde, 0x9b, 0x79, 0x33, 0x1e, 0xb4, 0x31, 0x58, 0x8d, 0xe3, 0xa1, 0x76, 0x49, 0x2b, 0x44, 0xbb, 0xf3, 0x9c, 0x7b, 0xcf, 0xb9, 0xf7, 0xdc, 0xeb, 0x8b,
0x09, 0x0f, 0x9d, 0x41, 0xd2, 0x01, 0x11, 0x80, 0x84, 0xd8, 0x89, 0x06, 0x9e, 0xc3, 0x22, 0x1e, 0xb6, 0xfc, 0xf5, 0x84, 0x78, 0x91, 0xe5, 0xa7, 0x03, 0xe0, 0x21, 0x08, 0x48, 0xac, 0xd8, 0x77,
0x3b, 0x2c, 0x91, 0x7d, 0x08, 0x24, 0xef, 0x32, 0xc9, 0xc3, 0xc0, 0x19, 0xb5, 0x3b, 0x20, 0x59, 0x2d, 0x16, 0x7b, 0x89, 0xc5, 0x52, 0x31, 0x82, 0x50, 0x78, 0x0e, 0x13, 0x5e, 0x14, 0x5a, 0x93,
0xdb, 0xf1, 0x20, 0x00, 0xc1, 0x24, 0xf4, 0x48, 0x24, 0x42, 0x19, 0xe2, 0x76, 0x2a, 0x41, 0xa6, 0xfe, 0x00, 0x04, 0xeb, 0x5b, 0x2e, 0x84, 0xc0, 0x99, 0x80, 0x21, 0x89, 0x79, 0x24, 0x22, 0xdc,
0x12, 0x24, 0x1a, 0x78, 0x44, 0x49, 0x90, 0x8b, 0x12, 0xc4, 0x48, 0xd4, 0x97, 0x3c, 0x2e, 0xfb, 0xcf, 0x24, 0x48, 0x2e, 0x41, 0x62, 0xdf, 0x25, 0x52, 0x82, 0x5c, 0x96, 0x20, 0x5a, 0xa2, 0x7d,
0x49, 0x87, 0x74, 0x43, 0xdf, 0xf1, 0x42, 0x2f, 0x74, 0xb4, 0x52, 0x27, 0xd9, 0xd3, 0x37, 0x7d, 0xdf, 0xf5, 0xc4, 0x28, 0x1d, 0x10, 0x27, 0x0a, 0x2c, 0x37, 0x72, 0x23, 0x4b, 0x29, 0x0d, 0xd2,
0xd1, 0xa7, 0x34, 0x43, 0xfd, 0x89, 0x29, 0x92, 0x45, 0xdc, 0x67, 0xdd, 0x3e, 0x0f, 0x40, 0x1c, 0x03, 0xf5, 0x52, 0x0f, 0xf5, 0x95, 0x55, 0x68, 0x3f, 0xd2, 0x4d, 0xb2, 0xd8, 0x0b, 0x98, 0x33,
0x4e, 0xcb, 0xf4, 0x41, 0x32, 0x67, 0x34, 0x53, 0x57, 0xdd, 0xb9, 0x8c, 0x25, 0x92, 0x40, 0x72, 0xf2, 0x42, 0xe0, 0xc7, 0x79, 0x9b, 0x01, 0x08, 0x66, 0x4d, 0xe6, 0xfa, 0x6a, 0x5b, 0xd7, 0xb1,
0x1f, 0x66, 0x08, 0x2b, 0xff, 0x22, 0xc4, 0xdd, 0x3e, 0xf8, 0x6c, 0x86, 0xf7, 0xf8, 0x32, 0x5e, 0x78, 0x1a, 0x0a, 0x2f, 0x80, 0x39, 0xc2, 0xda, 0xef, 0x08, 0x89, 0x33, 0x82, 0x80, 0xcd, 0xf1,
0x22, 0xf9, 0xd0, 0xe1, 0x81, 0x8c, 0xa5, 0x98, 0x21, 0x65, 0x3c, 0xc5, 0x20, 0x46, 0x20, 0xa6, 0x1e, 0x5e, 0xc7, 0x4b, 0x85, 0x37, 0xb6, 0xbc, 0x50, 0x24, 0x82, 0xcf, 0x91, 0x0a, 0x9e, 0x12,
0x86, 0xe0, 0x80, 0xf9, 0xd1, 0x10, 0xfe, 0xe6, 0xe9, 0x65, 0x66, 0x5c, 0x4b, 0xcc, 0xf3, 0x04, 0xe0, 0x13, 0xe0, 0xb9, 0x21, 0x38, 0x62, 0x41, 0x3c, 0x86, 0xab, 0x3c, 0xad, 0x5c, 0xbb, 0xae,
0x78, 0x4c, 0x86, 0x19, 0x2e, 0x8b, 0xb8, 0x00, 0x8f, 0xc7, 0x52, 0x9c, 0x0d, 0x8d, 0x0d, 0xa3, 0x2b, 0xb2, 0x7b, 0x8f, 0x11, 0xda, 0x39, 0x12, 0x9c, 0xbd, 0x62, 0xe3, 0x14, 0x70, 0x07, 0xd5,
0xfe, 0xec, 0xd4, 0x5a, 0x4f, 0x11, 0xda, 0x3a, 0x90, 0x82, 0xbd, 0x65, 0xc3, 0x04, 0x70, 0x03, 0x3c, 0x01, 0x41, 0xd2, 0x32, 0xba, 0x95, 0xe5, 0x86, 0xdd, 0x98, 0x9d, 0x77, 0x6a, 0xbb, 0x12,
0x95, 0xb8, 0x04, 0x3f, 0xae, 0x59, 0xcd, 0xc2, 0x62, 0xc5, 0xad, 0x4c, 0x4e, 0x1b, 0xa5, 0x6d, 0xa0, 0x19, 0xbe, 0x51, 0xff, 0xf0, 0xb1, 0x53, 0x3a, 0xf9, 0xda, 0x2d, 0xf5, 0x3e, 0x95, 0x51,
0x05, 0xd0, 0x14, 0x5f, 0x2b, 0x7f, 0xfe, 0xd2, 0xc8, 0x1d, 0xfd, 0x68, 0xe6, 0x5a, 0x5f, 0xf3, 0xf3, 0x65, 0xe4, 0x43, 0x48, 0x61, 0xe2, 0xc1, 0x21, 0x7e, 0x8b, 0xea, 0x72, 0xca, 0x43, 0x26,
0xa8, 0xfa, 0x26, 0x1c, 0x40, 0x40, 0x61, 0xc4, 0x61, 0x1f, 0x7f, 0x40, 0x65, 0x35, 0x81, 0x1e, 0x58, 0xcb, 0xe8, 0x1a, 0xcb, 0xcd, 0xd5, 0x07, 0x44, 0x6f, 0xbd, 0x68, 0x3a, 0xdf, 0xbb, 0xcc,
0x93, 0xac, 0x66, 0x35, 0xad, 0xc5, 0xea, 0xf2, 0x23, 0x62, 0x7e, 0x44, 0xb6, 0x21, 0xd3, 0x3f, 0x26, 0x93, 0x3e, 0x79, 0x31, 0x78, 0x07, 0x8e, 0x78, 0x0e, 0x82, 0xd9, 0xf8, 0xf4, 0xbc, 0x53,
0xa1, 0xa2, 0xc9, 0xa8, 0x4d, 0x5e, 0x77, 0x3e, 0x42, 0x57, 0xbe, 0x02, 0xc9, 0x5c, 0x7c, 0x7c, 0x9a, 0x9d, 0x77, 0x50, 0x8e, 0xd1, 0x0b, 0x55, 0x3c, 0x44, 0xd5, 0x24, 0x06, 0xa7, 0x55, 0x56,
0xda, 0xc8, 0x4d, 0x4e, 0x1b, 0x68, 0x8a, 0xd1, 0x73, 0x55, 0xdc, 0x43, 0xc5, 0x38, 0x82, 0x6e, 0xea, 0x36, 0xf9, 0xe3, 0x7f, 0x8a, 0x14, 0xfa, 0xdd, 0x8b, 0xc1, 0xb1, 0xff, 0xd6, 0xf5, 0xaa,
0x2d, 0xaf, 0xd5, 0x5d, 0xf2, 0xdf, 0xff, 0x8d, 0x64, 0xea, 0xdd, 0x89, 0xa0, 0xeb, 0xde, 0x34, 0xf2, 0x45, 0x95, 0x3a, 0x1e, 0xa3, 0x85, 0x44, 0x30, 0x91, 0x26, 0xad, 0x8a, 0xaa, 0xb3, 0x7d,
0xf9, 0x8a, 0xea, 0x46, 0xb5, 0x3a, 0x1e, 0xa2, 0xb9, 0x58, 0x32, 0x99, 0xc4, 0xb5, 0x82, 0xce, 0xcb, 0x3a, 0x4a, 0xcb, 0xfe, 0x47, 0x57, 0x5a, 0xc8, 0xde, 0x54, 0xd7, 0xe8, 0xad, 0xa1, 0x7f,
0xb3, 0x79, 0xcd, 0x3c, 0x5a, 0xcb, 0xbd, 0x65, 0x32, 0xcd, 0xa5, 0x77, 0x6a, 0x72, 0xb4, 0x56, 0x7f, 0x69, 0x0a, 0xdf, 0x45, 0x35, 0x21, 0x21, 0x35, 0xc5, 0x86, 0xbd, 0xa8, 0x99, 0xb5, 0x2c,
0xd0, 0xed, 0x3f, 0x8a, 0xc2, 0xf7, 0x51, 0x49, 0x2a, 0x48, 0x77, 0xb1, 0xe2, 0xce, 0x1b, 0x66, 0x2f, 0x8b, 0xf5, 0x3e, 0x1b, 0xe8, 0xbf, 0xb9, 0x2a, 0x78, 0x13, 0x2d, 0x16, 0x3a, 0x82, 0xa1,
0x29, 0x8d, 0x4b, 0xdf, 0x5a, 0xdf, 0x2c, 0x74, 0x67, 0x26, 0x0b, 0x5e, 0x47, 0xf3, 0x99, 0x8a, 0x92, 0xa8, 0xdb, 0xff, 0x6b, 0x89, 0xc5, 0xad, 0x62, 0x90, 0x5e, 0xce, 0xc5, 0x6f, 0x50, 0x35,
0xa0, 0xa7, 0x25, 0xca, 0xee, 0x5d, 0x23, 0x31, 0xbf, 0x91, 0x7d, 0xa4, 0x17, 0x63, 0xf1, 0x7b, 0x4d, 0x80, 0xeb, 0xf1, 0x6e, 0xde, 0xc0, 0xf6, 0x7e, 0x02, 0x7c, 0x37, 0x3c, 0x88, 0xf2, 0xb9,
0x54, 0x4c, 0x62, 0x10, 0xa6, 0xbd, 0xeb, 0x57, 0xb0, 0xbd, 0x1b, 0x83, 0xd8, 0x0e, 0xf6, 0xc2, 0x4a, 0x84, 0x2a, 0x59, 0x69, 0x0b, 0x38, 0x8f, 0xb8, 0x1a, 0x6b, 0xc1, 0xd6, 0x8e, 0x04, 0x69,
0x69, 0x5f, 0x15, 0x42, 0xb5, 0xac, 0xb2, 0x05, 0x42, 0x84, 0x42, 0xb7, 0x35, 0x63, 0x6b, 0x4b, 0x16, 0xeb, 0x4d, 0xcb, 0xa8, 0xfe, 0x53, 0x05, 0xaf, 0xa0, 0xba, 0x64, 0x86, 0x2c, 0x00, 0x3d,
0x81, 0x34, 0x7d, 0x6b, 0x8d, 0xf3, 0xa8, 0x7c, 0xa6, 0x82, 0x1f, 0xa2, 0xb2, 0x62, 0x06, 0xcc, 0x8b, 0x25, 0x4d, 0x52, 0x39, 0x12, 0xa7, 0x17, 0x19, 0xf8, 0x0e, 0xaa, 0xa4, 0xde, 0x50, 0x75,
0x07, 0xd3, 0x8b, 0x05, 0x43, 0xd2, 0x31, 0x0a, 0xa7, 0xe7, 0x11, 0xf8, 0x1e, 0x2a, 0x24, 0xbc, 0xdf, 0xb0, 0x9b, 0x3a, 0xb1, 0xb2, 0xbf, 0xbb, 0x4d, 0x25, 0x8e, 0x7b, 0x68, 0xc1, 0xe5, 0x51,
0xa7, 0xab, 0xaf, 0xb8, 0x55, 0x13, 0x58, 0xd8, 0xdd, 0xde, 0xa4, 0x0a, 0xc7, 0x2d, 0x34, 0xe7, 0x1a, 0xcb, 0xb5, 0xca, 0x5f, 0x1b, 0xc9, 0x65, 0x3c, 0x53, 0x08, 0xd5, 0x11, 0xec, 0xa3, 0x1a,
0x89, 0x30, 0x89, 0xd4, 0x58, 0xd5, 0xd7, 0x46, 0x6a, 0x18, 0x2f, 0x34, 0x42, 0xcd, 0x0b, 0x1e, 0xc8, 0x5b, 0x68, 0x55, 0xbb, 0x95, 0xe5, 0xe6, 0xea, 0xd3, 0x5b, 0x8c, 0x80, 0xa8, 0xa3, 0xda,
0xa0, 0x12, 0xa8, 0x5d, 0xa8, 0x15, 0x9b, 0x85, 0xc5, 0xea, 0xf2, 0xf3, 0x6b, 0xb4, 0x80, 0xe8, 0x09, 0x05, 0x3f, 0x2e, 0x58, 0x95, 0x18, 0xcd, 0x6a, 0xb4, 0x0f, 0xf5, 0xe1, 0xa9, 0x1c, 0xbc,
0xa5, 0xda, 0x0a, 0xa4, 0x38, 0xcc, 0x58, 0x55, 0x18, 0x4d, 0x73, 0xd4, 0xf7, 0xcd, 0xe2, 0xe9, 0x84, 0x2a, 0x3e, 0x1c, 0x67, 0x36, 0xa9, 0xfc, 0xc4, 0x7b, 0xa8, 0x36, 0x91, 0x37, 0xa9, 0xf7,
0x18, 0xbc, 0x80, 0x0a, 0x03, 0x38, 0x4c, 0x6d, 0x52, 0x75, 0xc4, 0x3b, 0xa8, 0x34, 0x52, 0x3b, 0xf1, 0xe4, 0x06, 0xcd, 0xe4, 0x87, 0x4d, 0x33, 0xad, 0x8d, 0xf2, 0xba, 0x61, 0xdf, 0x3b, 0x9d,
0x69, 0xe6, 0xf1, 0xec, 0x0a, 0xc5, 0x4c, 0x17, 0x9b, 0xa6, 0x5a, 0x6b, 0xf9, 0x55, 0xcb, 0x7d, 0x9a, 0xa5, 0xb3, 0xa9, 0x59, 0xfa, 0x32, 0x35, 0x4b, 0x27, 0x33, 0xd3, 0x38, 0x9d, 0x99, 0xc6,
0x70, 0x3c, 0xb6, 0x73, 0x27, 0x63, 0x3b, 0xf7, 0x7d, 0x6c, 0xe7, 0x8e, 0x26, 0xb6, 0x75, 0x3c, 0xd9, 0xcc, 0x34, 0xbe, 0xcd, 0x4c, 0xe3, 0xfd, 0x77, 0xb3, 0xf4, 0xfa, 0x2f, 0x2d, 0xf0, 0x23,
0xb1, 0xad, 0x93, 0x89, 0x6d, 0xfd, 0x9c, 0xd8, 0xd6, 0xa7, 0x5f, 0x76, 0xee, 0xdd, 0x0d, 0x23, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x87, 0xc6, 0x94, 0xfa, 0x05, 0x00, 0x00,
0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x8a, 0x39, 0x26, 0x16, 0x06, 0x00, 0x00,
} }
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1"; option go_package = "v1";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
import "k8s.io/kubernetes/pkg/apis/autoscaling/v1/generated.proto"; import "k8s.io/kubernetes/pkg/apis/autoscaling/v1/generated.proto";
......
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -1457,57 +1457,55 @@ func init() { ...@@ -1457,57 +1457,55 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 826 bytes of a gzipped FileDescriptorProto // 799 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4d, 0x8f, 0xdb, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4d, 0x4f, 0xe3, 0x46,
0x18, 0xc7, 0xe3, 0x6c, 0xde, 0x3a, 0xa1, 0xb0, 0x35, 0xa8, 0x8d, 0x82, 0xe4, 0x44, 0x91, 0x90, 0x18, 0xc7, 0xe3, 0x90, 0x37, 0x26, 0xa5, 0x05, 0xb7, 0x82, 0x28, 0x95, 0x9c, 0x28, 0x52, 0xa5,
0x42, 0xb5, 0x6b, 0xb3, 0x29, 0xaa, 0x0a, 0x37, 0x5c, 0x84, 0xca, 0x6a, 0x79, 0x91, 0xd3, 0x0a, 0x14, 0x81, 0x5d, 0x42, 0x85, 0x68, 0x6f, 0x35, 0x55, 0xd5, 0x22, 0xfa, 0x22, 0x07, 0xd4, 0xaa,
0x84, 0x2a, 0xd4, 0xb1, 0xf3, 0xc4, 0x99, 0xc6, 0xf6, 0x98, 0x99, 0x71, 0x44, 0x6e, 0x7c, 0x04, 0x42, 0x15, 0x63, 0xe7, 0x49, 0x32, 0xc4, 0x6f, 0xf5, 0x8c, 0xa3, 0xe6, 0xd6, 0x8f, 0xd0, 0x6f,
0xbe, 0x05, 0xdf, 0x82, 0x0b, 0x1c, 0xf6, 0xd8, 0x03, 0x07, 0xb8, 0x44, 0xac, 0xf9, 0x16, 0x9c, 0xd1, 0x6f, 0xb1, 0x97, 0xdd, 0x03, 0x47, 0x0e, 0x7b, 0xd8, 0xbd, 0x44, 0x8b, 0xf7, 0x5b, 0xec,
0x90, 0x27, 0x4e, 0xec, 0xae, 0x63, 0x9a, 0x05, 0x69, 0x6f, 0x9e, 0xf1, 0xf3, 0xff, 0xcd, 0xf3, 0x69, 0xe5, 0x89, 0x13, 0x07, 0x1c, 0x2f, 0x61, 0x57, 0xe2, 0xe6, 0x19, 0x3f, 0xff, 0xdf, 0x3c,
0xf2, 0x9f, 0x41, 0x1f, 0xcc, 0x1f, 0x70, 0x9d, 0x50, 0x63, 0x1e, 0xd9, 0xc0, 0x02, 0x10, 0xc0, 0xcf, 0xf3, 0x7f, 0x66, 0xd0, 0x37, 0x83, 0x43, 0x2a, 0x13, 0x47, 0x19, 0xf8, 0x3a, 0x78, 0x36,
0x8d, 0x70, 0xee, 0x1a, 0x38, 0x24, 0xdc, 0xb0, 0xb1, 0x70, 0x66, 0xc6, 0x62, 0x84, 0xbd, 0x70, 0x30, 0xa0, 0x8a, 0x3b, 0xe8, 0x29, 0xd8, 0x25, 0x54, 0xd1, 0x31, 0x33, 0xfa, 0xca, 0xb0, 0x85,
0x86, 0x4f, 0x0c, 0x17, 0x02, 0x60, 0x58, 0xc0, 0x44, 0x0f, 0x19, 0x15, 0x54, 0x7d, 0x77, 0x2d, 0x4d, 0xb7, 0x8f, 0xf7, 0x94, 0x1e, 0xd8, 0xe0, 0x61, 0x06, 0x1d, 0xd9, 0xf5, 0x1c, 0xe6, 0x88,
0xd5, 0x33, 0xa9, 0x1e, 0xce, 0x5d, 0x3d, 0x91, 0xea, 0x52, 0xaa, 0x6f, 0xa4, 0xdd, 0x63, 0x97, 0x5f, 0x4e, 0xa4, 0x72, 0x2c, 0x95, 0xdd, 0x41, 0x4f, 0x0e, 0xa5, 0x32, 0x97, 0xca, 0x53, 0x69,
0x88, 0x59, 0x64, 0xeb, 0x0e, 0xf5, 0x0d, 0x97, 0xba, 0xd4, 0x90, 0x04, 0x3b, 0x9a, 0xca, 0x95, 0x75, 0xb7, 0x47, 0x58, 0xdf, 0xd7, 0x65, 0xc3, 0xb1, 0x94, 0x9e, 0xd3, 0x73, 0x14, 0x4e, 0xd0,
0x5c, 0xc8, 0xaf, 0x35, 0xb9, 0xfb, 0x7e, 0x9a, 0x14, 0x0e, 0x89, 0x8f, 0x9d, 0x19, 0x09, 0x80, 0xfd, 0x2e, 0x5f, 0xf1, 0x05, 0xff, 0x9a, 0x90, 0xab, 0x5f, 0x47, 0x49, 0x61, 0x97, 0x58, 0xd8,
0x2d, 0xb3, 0xb4, 0x7c, 0x10, 0xd8, 0x58, 0x14, 0xf2, 0xe9, 0x1a, 0x65, 0x2a, 0x16, 0x05, 0x82, 0xe8, 0x13, 0x1b, 0xbc, 0x51, 0x9c, 0x96, 0x05, 0x0c, 0x2b, 0xc3, 0x44, 0x3e, 0x55, 0x25, 0x4d,
0xf8, 0x50, 0x10, 0xdc, 0x7f, 0x95, 0x80, 0x3b, 0x33, 0xf0, 0x71, 0x41, 0x77, 0xaf, 0x4c, 0x17, 0xe5, 0xf9, 0x36, 0x23, 0x16, 0x24, 0x04, 0x07, 0xf7, 0x09, 0xa8, 0xd1, 0x07, 0x0b, 0x27, 0x74,
0x09, 0xe2, 0x19, 0x24, 0x10, 0x5c, 0xb0, 0x82, 0x28, 0x57, 0x13, 0x07, 0xb6, 0x00, 0x96, 0x15, 0xfb, 0x69, 0x3a, 0x9f, 0x11, 0x53, 0x21, 0x36, 0xa3, 0xcc, 0x4b, 0x88, 0xe6, 0x6a, 0xa2, 0xe0,
0x04, 0xdf, 0x63, 0x3f, 0xf4, 0x60, 0x57, 0x4d, 0x8f, 0x72, 0xe3, 0x39, 0xc6, 0xae, 0xcb, 0xc0, 0x0d, 0xc1, 0x8b, 0x0b, 0x82, 0x7f, 0xb0, 0xe5, 0x9a, 0xb0, 0xa8, 0xa6, 0x9d, 0x54, 0x7b, 0x16,
0xc5, 0x82, 0xe6, 0xb4, 0x38, 0x24, 0x0c, 0x5c, 0xc2, 0x05, 0xc3, 0x82, 0xd0, 0xc0, 0x58, 0x9c, 0x45, 0xef, 0xdf, 0x6f, 0x66, 0x42, 0xd4, 0xf8, 0x3f, 0x8b, 0x8a, 0x47, 0x9e, 0x63, 0x1f, 0x3b,
0xec, 0x9e, 0x56, 0xf7, 0xa8, 0x74, 0xd0, 0xbb, 0xce, 0xbd, 0xf7, 0x6a, 0x5b, 0x14, 0x44, 0x83, 0xba, 0x78, 0x81, 0x4a, 0x61, 0x77, 0x3b, 0x98, 0xe1, 0x8a, 0x50, 0x17, 0x9a, 0xe5, 0xd6, 0x57,
0x9f, 0xaa, 0xa8, 0xf9, 0x90, 0xd1, 0xe0, 0x94, 0xda, 0xea, 0x33, 0xd4, 0x4a, 0xe6, 0x34, 0xc1, 0x72, 0xe4, 0xf2, 0x7c, 0xb1, 0xb1, 0xcf, 0x61, 0xb4, 0x3c, 0xdc, 0x93, 0x7f, 0xd5, 0x2f, 0xc1,
0x02, 0x77, 0x94, 0xbe, 0x32, 0x6c, 0x8f, 0xde, 0xd3, 0x53, 0xbf, 0xe4, 0xdb, 0x96, 0x39, 0x26, 0x60, 0x3f, 0x03, 0xc3, 0xaa, 0x78, 0x35, 0xae, 0x65, 0x82, 0x71, 0x0d, 0xc5, 0x7b, 0xda, 0x8c,
0x89, 0xd6, 0x17, 0x27, 0xfa, 0x17, 0xf6, 0x73, 0x70, 0xc4, 0x67, 0x20, 0xb0, 0xa9, 0x9e, 0xaf, 0x2a, 0xfe, 0x81, 0x72, 0xd4, 0x05, 0xa3, 0x92, 0xe5, 0xf4, 0x03, 0x79, 0xe9, 0x19, 0x92, 0xa3,
0x7a, 0x95, 0x78, 0xd5, 0x43, 0xd9, 0x9e, 0xb5, 0xa5, 0xaa, 0x5f, 0xa3, 0x1a, 0x0f, 0xc1, 0xe9, 0x1c, 0xdb, 0x2e, 0x18, 0xea, 0x47, 0xd1, 0x19, 0xb9, 0x70, 0xa5, 0x71, 0xa2, 0x78, 0x81, 0x0a,
0x54, 0x25, 0xfd, 0xbe, 0xbe, 0xb7, 0x1b, 0xf5, 0x34, 0xc7, 0x71, 0x08, 0x8e, 0xf9, 0x5a, 0x7a, 0x94, 0x61, 0xe6, 0xd3, 0xca, 0x0a, 0x67, 0x1f, 0xbe, 0x07, 0x9b, 0xeb, 0xd5, 0x8f, 0x23, 0x7a,
0x46, 0x2d, 0x59, 0x59, 0x92, 0xa8, 0x3e, 0x43, 0x0d, 0x2e, 0xb0, 0x88, 0x78, 0xe7, 0x40, 0xb2, 0x61, 0xb2, 0xd6, 0x22, 0x6e, 0xe3, 0x99, 0x80, 0xca, 0x51, 0xe4, 0x09, 0xa1, 0x4c, 0x3c, 0x4f,
0x1f, 0xfc, 0x07, 0xb6, 0xd4, 0x9b, 0xaf, 0xa7, 0xf4, 0xc6, 0x7a, 0x6d, 0xa5, 0xdc, 0xc1, 0xaf, 0x74, 0x4b, 0x5e, 0xae, 0x5b, 0xa1, 0x9a, 0xf7, 0x6a, 0x3d, 0x3a, 0xa9, 0x34, 0xdd, 0x99, 0xeb,
0x0a, 0x6a, 0xa7, 0x91, 0x67, 0x84, 0x0b, 0xf5, 0x69, 0xa1, 0x5b, 0xfa, 0x7e, 0xdd, 0x4a, 0xd4, 0xd4, 0xef, 0x28, 0x4f, 0x18, 0x58, 0xb4, 0x92, 0xad, 0xaf, 0x34, 0xcb, 0xad, 0xd6, 0xc3, 0xcb,
0xb2, 0x57, 0x87, 0xe9, 0x49, 0xad, 0xcd, 0x4e, 0xae, 0x53, 0x5f, 0xa1, 0x3a, 0x11, 0xe0, 0xf3, 0x51, 0xd7, 0x22, 0x7c, 0xfe, 0xa7, 0x10, 0xa4, 0x4d, 0x78, 0x8d, 0x27, 0xb9, 0x59, 0x19, 0x61,
0x4e, 0xb5, 0x7f, 0x30, 0x6c, 0x8f, 0x46, 0x57, 0x2f, 0xc7, 0xbc, 0x99, 0xe2, 0xeb, 0x9f, 0x26, 0xfb, 0xc4, 0x1d, 0x54, 0x0a, 0x07, 0xbd, 0xe3, 0x9b, 0xc0, 0xcb, 0x58, 0x8d, 0xd3, 0x6a, 0x47,
0x20, 0x6b, 0xcd, 0x1b, 0xfc, 0x5c, 0xdb, 0x96, 0x91, 0xb4, 0x4f, 0x3d, 0x42, 0xad, 0xe4, 0xca, 0xfb, 0xda, 0x2c, 0x42, 0x3c, 0x43, 0x5b, 0x94, 0x61, 0x8f, 0x11, 0xbb, 0xf7, 0x3d, 0xe0, 0x8e,
0x4c, 0x22, 0x0f, 0x64, 0x19, 0x37, 0xb2, 0xb4, 0xc6, 0xe9, 0xbe, 0xb5, 0x8d, 0x50, 0x9f, 0xa0, 0x49, 0x6c, 0x68, 0x83, 0xe1, 0xd8, 0x1d, 0xca, 0x3d, 0x5d, 0x51, 0x3f, 0x0f, 0xc6, 0xb5, 0xad,
0x3b, 0x5c, 0x60, 0x26, 0x48, 0xe0, 0x7e, 0x0c, 0x78, 0xe2, 0x91, 0x00, 0xc6, 0xe0, 0xd0, 0x60, 0xf6, 0xe2, 0x10, 0x2d, 0x4d, 0x2b, 0x9e, 0xa3, 0x0d, 0xc3, 0xb1, 0x0d, 0xdf, 0xf3, 0xc0, 0x36,
0xc2, 0xe5, 0x4c, 0x0f, 0xcc, 0xb7, 0xe3, 0x55, 0xef, 0xce, 0x78, 0x77, 0x88, 0x55, 0xa6, 0x55, 0x46, 0xbf, 0x39, 0x26, 0x31, 0x46, 0xdc, 0xc8, 0x55, 0x55, 0x8e, 0xb2, 0xd9, 0x38, 0xba, 0x1b,
0x9f, 0xa2, 0x5b, 0x0e, 0x0d, 0x9c, 0x88, 0x31, 0x08, 0x9c, 0xe5, 0x97, 0xd4, 0x23, 0xce, 0x52, 0xf0, 0x66, 0xd1, 0xa6, 0x96, 0x04, 0x89, 0x5f, 0xa0, 0x22, 0xf5, 0xa9, 0x0b, 0x76, 0xa7, 0x92,
0x0e, 0xf2, 0x86, 0xa9, 0xa7, 0xd9, 0xdc, 0x7a, 0x78, 0x39, 0xe0, 0xef, 0x5d, 0x9b, 0x56, 0x11, 0xab, 0x0b, 0xcd, 0x92, 0x5a, 0x0e, 0xc6, 0xb5, 0x62, 0x7b, 0xb2, 0xa5, 0x4d, 0xff, 0x89, 0x7f,
0xa4, 0xbe, 0x83, 0x9a, 0x3c, 0xe2, 0x21, 0x04, 0x93, 0x4e, 0xad, 0xaf, 0x0c, 0x5b, 0x66, 0x3b, 0xa3, 0xf2, 0xa5, 0xa3, 0x9f, 0x82, 0xe5, 0x9a, 0x98, 0x41, 0x25, 0xcf, 0x3d, 0xfd, 0xf6, 0x01,
0x5e, 0xf5, 0x9a, 0xe3, 0xf5, 0x96, 0xb5, 0xf9, 0xa7, 0x7e, 0x87, 0xda, 0xcf, 0xa9, 0xfd, 0x18, 0x8d, 0x3f, 0x8e, 0xd5, 0x7c, 0x4e, 0x3f, 0x8d, 0x52, 0x2f, 0xcf, 0xfd, 0xd0, 0xe6, 0xcf, 0x10,
0xfc, 0xd0, 0xc3, 0x02, 0x3a, 0x75, 0x39, 0xd3, 0x0f, 0xaf, 0xd0, 0xf8, 0xd3, 0x4c, 0x2d, 0x7d, 0xff, 0x42, 0x55, 0xea, 0x1b, 0x06, 0x50, 0xda, 0xf5, 0xcd, 0x63, 0x47, 0xa7, 0x3f, 0x12, 0xca,
0xfa, 0x66, 0x9a, 0x7a, 0x3b, 0xf7, 0xc3, 0xca, 0x9f, 0xa1, 0x7e, 0x8b, 0xba, 0x3c, 0x72, 0x1c, 0x1c, 0x6f, 0x74, 0x42, 0x2c, 0xc2, 0x2a, 0x85, 0xba, 0xd0, 0xcc, 0xab, 0x52, 0x30, 0xae, 0x55,
0xe0, 0x7c, 0x1a, 0x79, 0xa7, 0xd4, 0xe6, 0x8f, 0x08, 0x17, 0x94, 0x2d, 0xcf, 0x88, 0x4f, 0x44, 0xdb, 0xa9, 0x51, 0xda, 0x3b, 0x08, 0xa2, 0x86, 0x36, 0xbb, 0x98, 0x98, 0xd0, 0x49, 0xb0, 0x8b,
0xa7, 0xd1, 0x57, 0x86, 0x75, 0x53, 0x8b, 0x57, 0xbd, 0xee, 0xb8, 0x34, 0xca, 0xfa, 0x17, 0x82, 0x9c, 0x5d, 0x0d, 0xc6, 0xb5, 0xcd, 0x1f, 0x16, 0x46, 0x68, 0x29, 0xca, 0xc6, 0x73, 0x01, 0xad,
0x6a, 0xa1, 0xdb, 0x53, 0x4c, 0x3c, 0x98, 0x14, 0xd8, 0x4d, 0xc9, 0xee, 0xc6, 0xab, 0xde, 0xed, 0xdd, 0xba, 0x31, 0xe2, 0x19, 0x2a, 0x60, 0x83, 0x91, 0x61, 0x38, 0x40, 0xe1, 0xb0, 0xee, 0xa6,
0x4f, 0x76, 0x46, 0x58, 0x25, 0xca, 0xc1, 0x6f, 0x0a, 0xba, 0xf9, 0xd2, 0x8d, 0x51, 0x9f, 0xa0, 0xf7, 0x2c, 0x7e, 0x2d, 0x34, 0xe8, 0x42, 0x68, 0x12, 0xc4, 0x17, 0xee, 0x3b, 0x0e, 0xd1, 0x22,
0x06, 0x76, 0x04, 0x59, 0x24, 0x06, 0x4a, 0xcc, 0x7a, 0x5c, 0xde, 0xb3, 0xec, 0xb5, 0xb0, 0x60, 0x98, 0x68, 0xa2, 0x75, 0x13, 0x53, 0x36, 0x9d, 0xc2, 0x53, 0x62, 0x01, 0xf7, 0xaf, 0xdc, 0xda,
0x0a, 0xc9, 0x90, 0x20, 0xbb, 0x70, 0x1f, 0x49, 0x88, 0x95, 0xc2, 0x54, 0x0f, 0x1d, 0x7a, 0x98, 0x5e, 0xee, 0xa2, 0x85, 0x0a, 0xf5, 0xb3, 0x60, 0x5c, 0x5b, 0x3f, 0xb9, 0xc3, 0xd1, 0x12, 0xe4,
0x8b, 0x8d, 0x0b, 0x1f, 0x13, 0x1f, 0xe4, 0xfc, 0xda, 0xa3, 0xbb, 0xfb, 0x5d, 0xb4, 0x44, 0x61, 0xc6, 0x4b, 0x01, 0xcd, 0xfb, 0xf4, 0x08, 0x8f, 0x61, 0x1f, 0x95, 0xd8, 0x74, 0xd8, 0xb2, 0x1f,
0xbe, 0x15, 0xaf, 0x7a, 0x87, 0x67, 0x97, 0x38, 0x56, 0x81, 0x3c, 0xf8, 0x43, 0x41, 0xf9, 0x39, 0x3c, 0x6c, 0xb3, 0x5b, 0x3b, 0x9b, 0xb4, 0x19, 0xbd, 0xf1, 0x54, 0x40, 0x9f, 0xdc, 0x89, 0x7f,
0x5d, 0xc3, 0x63, 0x38, 0x43, 0x2d, 0xb1, 0x31, 0x5b, 0xf5, 0x7f, 0x9b, 0x6d, 0x7b, 0x6b, 0xb7, 0x84, 0xfa, 0x7e, 0xb9, 0xf5, 0xd8, 0xef, 0x2c, 0x51, 0x1b, 0xaf, 0x2a, 0xed, 0x89, 0x57, 0xb7,
0x4e, 0xdb, 0xd2, 0x07, 0xbf, 0x28, 0xe8, 0x8d, 0x4b, 0xf1, 0xd7, 0x50, 0xdf, 0xe7, 0x2f, 0x3d, 0xaf, 0x6e, 0xa4, 0xcc, 0xf5, 0x8d, 0x94, 0x79, 0x71, 0x23, 0x65, 0xfe, 0x0d, 0x24, 0xe1, 0x2a,
0xf6, 0x47, 0x7b, 0xd4, 0x26, 0xab, 0x2a, 0x7b, 0xe2, 0xcd, 0xbb, 0xe7, 0x17, 0x5a, 0xe5, 0xc5, 0x90, 0x84, 0xeb, 0x40, 0x12, 0x5e, 0x05, 0x92, 0xf0, 0xdf, 0x6b, 0x29, 0xf3, 0x67, 0x69, 0xda,
0x85, 0x56, 0xf9, 0xfd, 0x42, 0xab, 0xfc, 0x10, 0x6b, 0xca, 0x79, 0xac, 0x29, 0x2f, 0x62, 0x4d, 0x9d, 0xb7, 0x01, 0x00, 0x00, 0xff, 0xff, 0x32, 0x5e, 0xac, 0x56, 0xd9, 0x08, 0x00, 0x00,
0xf9, 0x33, 0xd6, 0x94, 0x1f, 0xff, 0xd2, 0x2a, 0xdf, 0xb4, 0x36, 0xdd, 0xf9, 0x27, 0x00, 0x00,
0xff, 0xff, 0x39, 0x84, 0x09, 0xee, 0x23, 0x09, 0x00, 0x00,
} }
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
import "k8s.io/kubernetes/pkg/apis/batch/v1/generated.proto"; import "k8s.io/kubernetes/pkg/apis/batch/v1/generated.proto";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -1030,44 +1030,43 @@ func init() { ...@@ -1030,44 +1030,43 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 616 bytes of a gzipped FileDescriptorProto // 599 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x4f, 0x6f, 0xd3, 0x4c, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x3f, 0x6f, 0xd4, 0x4c,
0x10, 0xc6, 0xe3, 0xa4, 0xff, 0xb2, 0x79, 0x5f, 0xda, 0x2e, 0x1c, 0xa2, 0x1c, 0xdc, 0x2a, 0x48, 0x10, 0xc6, 0xcf, 0x77, 0xf9, 0x77, 0x7b, 0xef, 0x4b, 0x92, 0x85, 0xe2, 0x74, 0x85, 0x13, 0x1d,
0xa8, 0x20, 0x75, 0x97, 0x16, 0x84, 0x2a, 0x0e, 0x94, 0x1a, 0x21, 0xd1, 0x03, 0x20, 0xcc, 0x8d, 0x12, 0x0a, 0x08, 0x76, 0x49, 0x40, 0x28, 0xa2, 0x20, 0xc4, 0x88, 0x22, 0x05, 0x20, 0x96, 0x8e,
0x13, 0x13, 0x77, 0xea, 0x6c, 0x13, 0x7b, 0xad, 0xdd, 0x75, 0x4a, 0x0e, 0x48, 0x1c, 0x39, 0x70, 0x8a, 0x3d, 0x67, 0xe2, 0xdb, 0x9c, 0xbd, 0x6b, 0x79, 0xd7, 0x0e, 0x57, 0x20, 0x51, 0x52, 0x50,
0xe0, 0x1b, 0x71, 0xed, 0xb1, 0x47, 0x4e, 0x15, 0x0d, 0x5f, 0x04, 0x79, 0xed, 0xd4, 0xa6, 0xa1, 0xf0, 0x8d, 0x68, 0x53, 0xa6, 0xa4, 0x8a, 0xc8, 0xf1, 0x45, 0x90, 0xd7, 0xbe, 0xd8, 0xe4, 0x12,
0x42, 0xa8, 0x37, 0xcf, 0x8e, 0x9f, 0xdf, 0x3c, 0xb3, 0xcf, 0x92, 0xdd, 0xc1, 0x8e, 0x66, 0x42, 0x21, 0x94, 0x6e, 0x67, 0x67, 0xe7, 0x37, 0xcf, 0xcc, 0xb3, 0x68, 0x67, 0xb4, 0xad, 0x89, 0x50,
0xf2, 0x41, 0xda, 0x43, 0x15, 0xa3, 0x41, 0xcd, 0x93, 0x41, 0xc8, 0x21, 0x11, 0x9a, 0x8b, 0x08, 0x74, 0x94, 0x0e, 0x20, 0x91, 0x60, 0x40, 0xd3, 0x78, 0x14, 0x50, 0x1e, 0x0b, 0x4d, 0x45, 0xc4,
0x42, 0x4c, 0xe4, 0x50, 0x04, 0x63, 0x3e, 0xda, 0x82, 0x61, 0xd2, 0x87, 0x2d, 0x1e, 0x62, 0x8c, 0x03, 0x88, 0x55, 0x28, 0xfc, 0x31, 0xcd, 0x36, 0x79, 0x18, 0x0f, 0xf9, 0x26, 0x0d, 0x40, 0x42,
0x0a, 0x0c, 0x1e, 0xb0, 0x44, 0x49, 0x23, 0x29, 0xcf, 0x01, 0xac, 0x04, 0xb0, 0x64, 0x10, 0xb2, 0xc2, 0x0d, 0xec, 0x93, 0x38, 0x51, 0x46, 0x61, 0x5a, 0x00, 0x48, 0x05, 0x20, 0xf1, 0x28, 0x20,
0x0c, 0xc0, 0x2a, 0x00, 0x36, 0x05, 0x74, 0x36, 0x43, 0x61, 0xfa, 0x69, 0x8f, 0x05, 0x32, 0xe2, 0x39, 0x80, 0xd4, 0x00, 0x64, 0x0a, 0xe8, 0x3d, 0x08, 0x84, 0x19, 0xa6, 0x03, 0xe2, 0xab, 0x88,
0xa1, 0x0c, 0x25, 0xb7, 0x9c, 0x5e, 0x7a, 0x68, 0x2b, 0x5b, 0xd8, 0xaf, 0x9c, 0xdf, 0x79, 0x58, 0x06, 0x2a, 0x50, 0xd4, 0x72, 0x06, 0xe9, 0x81, 0x8d, 0x6c, 0x60, 0x4f, 0x05, 0xbf, 0xf7, 0xb8,
0x18, 0x84, 0x44, 0x44, 0x10, 0xf4, 0x45, 0x8c, 0x6a, 0x5c, 0x5a, 0x8c, 0xd0, 0x00, 0x1f, 0xcd, 0x14, 0xc8, 0x63, 0x11, 0x71, 0x7f, 0x28, 0x24, 0x24, 0xe3, 0x4a, 0x62, 0x04, 0x86, 0xd3, 0x6c,
0xb8, 0xea, 0xf0, 0xab, 0x54, 0x2a, 0x8d, 0x8d, 0x88, 0x70, 0x46, 0xf0, 0xe8, 0x6f, 0x02, 0x1d, 0x46, 0x55, 0x8f, 0x5e, 0x55, 0x95, 0xa4, 0xd2, 0x88, 0x08, 0x66, 0x0a, 0x9e, 0xfc, 0xad, 0x40,
0xf4, 0x31, 0x82, 0x19, 0xdd, 0x83, 0xab, 0x74, 0xa9, 0x11, 0x43, 0x2e, 0x62, 0xa3, 0x8d, 0x9a, 0xfb, 0x43, 0x88, 0xf8, 0x4c, 0xdd, 0xa3, 0xab, 0xea, 0x52, 0x23, 0x42, 0x2a, 0xa4, 0xd1, 0x26,
0x11, 0x55, 0x76, 0xd2, 0xa8, 0x46, 0xa8, 0xca, 0x85, 0xf0, 0x03, 0x44, 0xc9, 0x10, 0xff, 0xb4, 0x99, 0x29, 0xaa, 0xcd, 0xa4, 0x21, 0xc9, 0x20, 0xa9, 0x06, 0x82, 0x8f, 0x3c, 0x8a, 0x43, 0xb8,
0xd3, 0x8b, 0x4a, 0x54, 0x9b, 0x10, 0x86, 0x0a, 0x43, 0x30, 0xb2, 0xa2, 0x85, 0x44, 0x28, 0x0c, 0x6c, 0xa6, 0xfb, 0x57, 0x5a, 0x75, 0xc9, 0xeb, 0xfe, 0xf7, 0x26, 0xea, 0xec, 0xe5, 0xfb, 0x67,
0x85, 0x36, 0x0a, 0x8c, 0x90, 0xf1, 0x95, 0x99, 0x75, 0xbf, 0xd5, 0x49, 0x6b, 0x3f, 0xcb, 0xc6, 0x90, 0x09, 0x38, 0xc2, 0x1f, 0xd0, 0x52, 0xbe, 0xac, 0x7d, 0x6e, 0x78, 0xd7, 0x59, 0x77, 0x36,
0xc7, 0x91, 0xc0, 0x63, 0xfa, 0x9e, 0x2c, 0x65, 0x17, 0x79, 0x00, 0x06, 0xda, 0xce, 0xba, 0xb3, 0x3a, 0x5b, 0x0f, 0x49, 0x69, 0x5d, 0x5d, 0x7b, 0x65, 0x5e, 0xfe, 0x9a, 0x64, 0x9b, 0xe4, 0xcd,
0xd1, 0xda, 0xbe, 0xcf, 0x8a, 0x58, 0xab, 0x7b, 0x95, 0xc1, 0x66, 0x7f, 0xb3, 0xd1, 0x16, 0x7b, 0xe0, 0x10, 0x7c, 0xf3, 0x0a, 0x0c, 0xf7, 0xf0, 0xf1, 0xe9, 0x5a, 0x63, 0x72, 0xba, 0x86, 0xaa,
0xdd, 0x3b, 0xc2, 0xc0, 0xbc, 0x44, 0x03, 0x1e, 0x3d, 0x39, 0x5b, 0xab, 0x4d, 0xce, 0xd6, 0x48, 0x3b, 0x76, 0x4e, 0xc5, 0x03, 0x34, 0xa7, 0x63, 0xf0, 0xbb, 0x4d, 0x4b, 0x7f, 0x4e, 0xfe, 0xf1,
0x79, 0xe6, 0x5f, 0x50, 0x69, 0x8f, 0xcc, 0xe9, 0x04, 0x83, 0x76, 0xdd, 0xd2, 0x9f, 0xb2, 0x7f, 0x63, 0x90, 0x9a, 0xda, 0x77, 0x31, 0xf8, 0xde, 0x7f, 0x65, 0xb7, 0xb9, 0x3c, 0x62, 0x96, 0x8d,
0x7c, 0x34, 0xac, 0xe2, 0xf6, 0x6d, 0x82, 0x81, 0xf7, 0x5f, 0x31, 0x6d, 0x2e, 0xab, 0x7c, 0xcb, 0x0f, 0xd1, 0x82, 0x36, 0xdc, 0xa4, 0xba, 0xdb, 0xb2, 0x5d, 0xbc, 0x6b, 0x75, 0xb1, 0x24, 0xef,
0xa6, 0x47, 0x64, 0x41, 0x1b, 0x30, 0xa9, 0x6e, 0x37, 0xec, 0x14, 0xef, 0x5a, 0x53, 0x2c, 0xc9, 0x46, 0xd9, 0x67, 0xa1, 0x88, 0x59, 0xd9, 0xa1, 0xbf, 0x83, 0xba, 0xb5, 0xc7, 0x2f, 0x94, 0x34,
0xbb, 0x51, 0xcc, 0x59, 0xc8, 0x6b, 0xbf, 0x98, 0xd0, 0xdd, 0x25, 0xed, 0xca, 0xcf, 0xcf, 0x64, 0x3c, 0x5f, 0x51, 0xae, 0x06, 0xdf, 0x46, 0xf3, 0x96, 0x6e, 0x57, 0xd9, 0xf6, 0xfe, 0x2f, 0x11,
0x6c, 0x20, 0xbb, 0xa2, 0xcc, 0x0d, 0xbd, 0x4d, 0xe6, 0x2d, 0xdd, 0x5e, 0x65, 0xd3, 0xfb, 0xbf, 0xf3, 0x45, 0x41, 0x91, 0xeb, 0x7f, 0x6d, 0xa1, 0xe5, 0x0b, 0x43, 0xe1, 0x4f, 0x08, 0xf9, 0x53,
0x40, 0xcc, 0xe7, 0x82, 0xbc, 0xd7, 0xfd, 0xd2, 0x20, 0xcb, 0x97, 0x96, 0xa2, 0x1f, 0x09, 0x09, 0x92, 0xee, 0x3a, 0xeb, 0xad, 0x8d, 0xce, 0xd6, 0xde, 0x75, 0x86, 0xf8, 0x43, 0x57, 0xe5, 0xd0,
0xa6, 0x24, 0xdd, 0x76, 0xd6, 0x1b, 0x1b, 0xad, 0xed, 0xfd, 0xeb, 0x2c, 0xf1, 0x9b, 0xaf, 0x32, 0xf9, 0xb5, 0x66, 0xb5, 0x86, 0xf8, 0x8b, 0x83, 0x3a, 0x5c, 0x4a, 0x65, 0xb8, 0x11, 0x4a, 0xea,
0xa1, 0x8b, 0x63, 0xed, 0x57, 0x06, 0xd2, 0xcf, 0x0e, 0x69, 0x41, 0x1c, 0x4b, 0x63, 0x5f, 0x8f, 0x6e, 0xd3, 0x0a, 0x78, 0x7b, 0x5d, 0xaf, 0xc8, 0x6e, 0xc5, 0x7c, 0x29, 0x4d, 0x32, 0xf6, 0x6e,
0x6e, 0xd7, 0xad, 0x81, 0x37, 0xd7, 0xcd, 0x8a, 0xed, 0x95, 0xcc, 0xe7, 0xb1, 0x51, 0x63, 0xef, 0x96, 0x42, 0x3a, 0xb5, 0x0c, 0xab, 0xb7, 0xc6, 0x14, 0xb5, 0x25, 0x8f, 0x40, 0xc7, 0xdc, 0x07,
0x66, 0x61, 0xa4, 0x55, 0xe9, 0xf8, 0xd5, 0xd1, 0x94, 0x93, 0x66, 0x0c, 0x11, 0xea, 0x04, 0x02, 0xeb, 0x66, 0xdb, 0x5b, 0x2d, 0x8b, 0xda, 0xaf, 0xa7, 0x09, 0x56, 0xbd, 0xe9, 0x3d, 0x43, 0x2b,
0xb4, 0x69, 0x36, 0xbd, 0xd5, 0x42, 0xd4, 0x7c, 0x35, 0x6d, 0xf8, 0xe5, 0x3f, 0x9d, 0x27, 0x64, 0x17, 0xdb, 0xe0, 0x15, 0xd4, 0x1a, 0xc1, 0xb8, 0x70, 0x81, 0xe5, 0x47, 0x7c, 0x0b, 0xcd, 0x67,
0xe5, 0xf2, 0x18, 0xba, 0x42, 0x1a, 0x03, 0x1c, 0xe7, 0x29, 0xf8, 0xd9, 0x27, 0xbd, 0x45, 0xe6, 0x3c, 0x4c, 0xc1, 0x7e, 0xc3, 0x36, 0x2b, 0x82, 0xa7, 0xcd, 0x6d, 0xa7, 0x7f, 0x80, 0x56, 0x67,
0x47, 0x30, 0x4c, 0xd1, 0x3e, 0xc3, 0xa6, 0x9f, 0x17, 0x8f, 0xeb, 0x3b, 0x4e, 0xf7, 0x90, 0xac, 0xcc, 0xc7, 0x77, 0xd1, 0x22, 0x0f, 0x43, 0x75, 0x04, 0xfb, 0x16, 0xb2, 0xe4, 0x2d, 0x97, 0x1a,
0xce, 0x84, 0x4f, 0xef, 0x92, 0x45, 0x18, 0x0e, 0xe5, 0x31, 0x1e, 0x58, 0xc8, 0x92, 0xb7, 0x5c, 0x16, 0x77, 0x8b, 0x6b, 0x36, 0xcd, 0xe3, 0x3b, 0x68, 0x21, 0x01, 0xae, 0x95, 0x2c, 0xd0, 0xd5,
0x78, 0x58, 0xdc, 0xcb, 0x8f, 0xfd, 0x69, 0x9f, 0xde, 0x21, 0x0b, 0x0a, 0x41, 0xcb, 0x38, 0x47, 0xbf, 0x61, 0xf6, 0x96, 0x95, 0x59, 0xef, 0xde, 0xf1, 0x99, 0xdb, 0x38, 0x39, 0x73, 0x1b, 0x3f,
0x97, 0xef, 0xc6, 0xb7, 0xa7, 0x7e, 0xd1, 0xf5, 0xee, 0x9d, 0x9c, 0xbb, 0xb5, 0xd3, 0x73, 0xb7, 0xce, 0xdc, 0xc6, 0xe7, 0x89, 0xeb, 0x1c, 0x4f, 0x5c, 0xe7, 0x64, 0xe2, 0x3a, 0x3f, 0x27, 0xae,
0xf6, 0xfd, 0xdc, 0xad, 0x7d, 0x9a, 0xb8, 0xce, 0xc9, 0xc4, 0x75, 0x4e, 0x27, 0xae, 0xf3, 0x63, 0xf3, 0xed, 0x97, 0xdb, 0x78, 0xbf, 0x34, 0xdd, 0xe3, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b,
0xe2, 0x3a, 0x5f, 0x7f, 0xba, 0xb5, 0x77, 0x4b, 0xd3, 0x7b, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0xf0, 0xb2, 0x2b, 0x7f, 0x05, 0x00, 0x00,
0x81, 0x49, 0xe7, 0x98, 0x9b, 0x05, 0x00, 0x00,
} }
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1alpha1"; option go_package = "v1alpha1";
......
...@@ -1337,56 +1337,54 @@ func init() { ...@@ -1337,56 +1337,54 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 807 bytes of a gzipped FileDescriptorProto // 773 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4d, 0x6f, 0xdc, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcb, 0x6e, 0xf3, 0x44,
0x18, 0xc7, 0xd7, 0x49, 0x36, 0x84, 0xe9, 0x6e, 0x54, 0x06, 0x0a, 0x61, 0x25, 0x1c, 0xb4, 0xa7, 0x18, 0x86, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0xac, 0x5a,
0x16, 0xd1, 0x31, 0x69, 0x11, 0x0a, 0x1c, 0x2a, 0x6a, 0x36, 0xa2, 0x45, 0x8d, 0x52, 0x39, 0x48, 0x04, 0x63, 0xda, 0x22, 0x54, 0x58, 0x54, 0xd4, 0xa4, 0x82, 0xa2, 0x56, 0xa9, 0x5c, 0x24, 0x24,
0x48, 0x08, 0x24, 0xc6, 0xf6, 0x83, 0x77, 0xba, 0xe3, 0x17, 0xcd, 0x8c, 0x4d, 0xf7, 0xc6, 0x47, 0x04, 0x12, 0x63, 0xfb, 0xc3, 0x99, 0xc6, 0x27, 0x8d, 0xc7, 0xa1, 0xd9, 0x71, 0x09, 0x2c, 0xb8,
0xe0, 0xc0, 0x87, 0x8a, 0xc4, 0xa5, 0x47, 0x84, 0x50, 0x44, 0x16, 0xbe, 0x02, 0x77, 0xe4, 0xf1, 0xa8, 0x4a, 0x6c, 0xba, 0x44, 0x08, 0x55, 0x34, 0x70, 0x0b, 0xec, 0x91, 0xc7, 0x93, 0x83, 0x9b,
0xec, 0xae, 0x5d, 0xef, 0xaa, 0x8b, 0x8a, 0xb8, 0x79, 0x5e, 0x7e, 0xff, 0xff, 0xf3, 0xe6, 0x41, 0x44, 0x0d, 0xea, 0xaf, 0x7f, 0xe7, 0x39, 0x3c, 0xef, 0xfb, 0x9d, 0xc6, 0xe8, 0x93, 0xfe, 0x51,
0x1f, 0x4f, 0x8e, 0x25, 0x61, 0xa9, 0x33, 0xc9, 0x7d, 0x10, 0x09, 0x28, 0x90, 0x4e, 0x36, 0x89, 0x42, 0x58, 0x64, 0xf4, 0x53, 0x1b, 0x78, 0x08, 0x02, 0x12, 0x23, 0xee, 0x7b, 0x06, 0x8d, 0x59,
0x1c, 0x9a, 0x31, 0xe9, 0x64, 0x29, 0x67, 0xc1, 0xd4, 0x29, 0x8e, 0x7c, 0x50, 0xf4, 0xc8, 0x89, 0x62, 0xc4, 0x91, 0xcf, 0x9c, 0xa1, 0x31, 0xd8, 0xb7, 0x41, 0xd0, 0x7d, 0xc3, 0x83, 0x10, 0x38,
0x20, 0x01, 0x41, 0x15, 0x84, 0x24, 0x13, 0xa9, 0x4a, 0xf1, 0xad, 0x0a, 0x25, 0x4b, 0x94, 0x64, 0x15, 0xe0, 0x92, 0x98, 0x47, 0x22, 0xc2, 0x7b, 0x39, 0x4a, 0xa6, 0x28, 0x89, 0xfb, 0x1e, 0xc9,
0x93, 0x88, 0x94, 0x28, 0xa9, 0x50, 0x62, 0xd0, 0xc1, 0xed, 0x88, 0xa9, 0x71, 0xee, 0x93, 0x20, 0x50, 0x92, 0xa3, 0x44, 0xa1, 0xad, 0x0f, 0x3c, 0x26, 0x7a, 0xa9, 0x4d, 0x9c, 0x28, 0x30, 0xbc,
0x8d, 0x9d, 0x28, 0x8d, 0x52, 0x47, 0x2b, 0xf8, 0xf9, 0xf7, 0x7a, 0xa5, 0x17, 0xfa, 0xab, 0x52, 0xc8, 0x8b, 0x0c, 0xa9, 0x60, 0xa7, 0x3f, 0xca, 0x95, 0x5c, 0xc8, 0xaf, 0x5c, 0xb9, 0xf5, 0x91,
0x1e, 0x7c, 0x68, 0x82, 0xa2, 0x19, 0x8b, 0x69, 0x30, 0x66, 0x09, 0x88, 0xe9, 0x32, 0xac, 0x18, 0x0a, 0x8a, 0xc6, 0x2c, 0xa0, 0x4e, 0x8f, 0x85, 0xc0, 0x87, 0xd3, 0xb0, 0x02, 0x10, 0xd4, 0x18,
0x14, 0x75, 0x8a, 0x56, 0x3c, 0x03, 0x67, 0x1d, 0x25, 0xf2, 0x44, 0xb1, 0x18, 0x5a, 0xc0, 0x47, 0xcc, 0xc5, 0xd3, 0x32, 0x96, 0x51, 0x3c, 0x0d, 0x05, 0x0b, 0x60, 0x0e, 0xf8, 0xf8, 0x29, 0x20,
0x2f, 0x02, 0x64, 0x30, 0x86, 0x98, 0xb6, 0xb8, 0xbb, 0xeb, 0xb8, 0x5c, 0x31, 0xee, 0xb0, 0x44, 0x71, 0x7a, 0x10, 0xd0, 0x39, 0xee, 0x70, 0x19, 0x97, 0x0a, 0xe6, 0x1b, 0x2c, 0x14, 0x89, 0xe0,
0x49, 0x25, 0x5a, 0x50, 0x2d, 0x27, 0x09, 0xa2, 0x00, 0xb1, 0x4c, 0x08, 0x9e, 0xd2, 0x38, 0xe3, 0x73, 0xd0, 0x4c, 0x4e, 0x09, 0xf0, 0x01, 0xf0, 0x69, 0x42, 0x70, 0x43, 0x83, 0xd8, 0x87, 0x45,
0xb0, 0x2a, 0xa7, 0x07, 0xb5, 0xf6, 0xdc, 0xa6, 0x51, 0x24, 0x20, 0xa2, 0x2a, 0xad, 0xb1, 0x34, 0x39, 0xbd, 0xbf, 0xb4, 0x3d, 0x0b, 0x6e, 0xb7, 0xff, 0xd0, 0x50, 0xed, 0x74, 0xc0, 0x1c, 0xc1,
0x63, 0x02, 0x22, 0x26, 0x95, 0xa0, 0x8a, 0xa5, 0x89, 0x53, 0x1c, 0x51, 0x9e, 0x8d, 0xdb, 0xdd, 0xa2, 0x10, 0xff, 0x80, 0x6a, 0x59, 0xa5, 0x5c, 0x2a, 0x68, 0x53, 0x7b, 0x57, 0xdb, 0xdd, 0x38,
0x1a, 0xbc, 0xbf, 0xb6, 0xd1, 0x2b, 0x7c, 0x87, 0xbf, 0x59, 0x68, 0xef, 0xa4, 0x60, 0x41, 0xa9, 0xf8, 0x90, 0xa8, 0x8e, 0xcd, 0x06, 0x3e, 0xed, 0x59, 0x76, 0x9b, 0x0c, 0xf6, 0x49, 0xd7, 0xbe,
0x89, 0xbf, 0x43, 0x7b, 0x65, 0xcd, 0x43, 0xaa, 0xe8, 0x81, 0xf5, 0xae, 0x75, 0xf3, 0xda, 0x9d, 0x06, 0x47, 0x5c, 0x80, 0xa0, 0x26, 0xbe, 0xbd, 0xdf, 0x29, 0x8d, 0xee, 0x77, 0xd0, 0x74, 0xcf,
0x0f, 0x88, 0xe9, 0x7d, 0xbd, 0x04, 0xcb, 0xee, 0x97, 0xb7, 0x49, 0x71, 0x44, 0xce, 0xfc, 0x27, 0x9a, 0xa8, 0x62, 0x1f, 0x35, 0x5c, 0xf0, 0x41, 0x40, 0x37, 0xce, 0x1c, 0x93, 0xe6, 0x9a, 0xb4,
0x10, 0xa8, 0x53, 0x50, 0xd4, 0xc5, 0x17, 0x97, 0x87, 0x9d, 0xd9, 0xe5, 0x21, 0x5a, 0xee, 0x79, 0x39, 0x5c, 0xcd, 0xa6, 0x33, 0x8b, 0x9a, 0xaf, 0x8d, 0xee, 0x77, 0x1a, 0x85, 0x2d, 0xab, 0x28,
0x0b, 0x55, 0xcc, 0x51, 0x3f, 0x04, 0x0e, 0x0a, 0xce, 0xb2, 0xd2, 0x51, 0x1e, 0x6c, 0x69, 0x9b, 0xde, 0xfe, 0x6d, 0x0d, 0xbd, 0x7e, 0x19, 0xb9, 0x1d, 0x96, 0xf0, 0x54, 0x6e, 0x99, 0xa9, 0xeb,
0xbb, 0x9b, 0xd9, 0x8c, 0xea, 0xa8, 0xfb, 0xda, 0xec, 0xf2, 0xb0, 0xdf, 0xd8, 0xf2, 0x9a, 0xe2, 0x81, 0x78, 0x09, 0x79, 0xba, 0xa8, 0x92, 0xc4, 0xe0, 0xa8, 0xf4, 0x4c, 0xb2, 0xf2, 0xdc, 0x93,
0xc3, 0x5f, 0xb6, 0xd0, 0xeb, 0x8f, 0xd3, 0x70, 0xc4, 0xa4, 0xc8, 0xf5, 0x96, 0x9b, 0x87, 0x11, 0x05, 0xf1, 0x5e, 0xc5, 0xe0, 0x98, 0x75, 0xe5, 0x57, 0xc9, 0x56, 0x96, 0x54, 0xc7, 0x3e, 0x5a,
0xa8, 0xff, 0x21, 0xcf, 0x10, 0xed, 0xc8, 0x0c, 0x02, 0x93, 0x9e, 0x4b, 0x36, 0xfe, 0x83, 0xc8, 0x4f, 0x04, 0x15, 0x69, 0xd2, 0x2c, 0x4b, 0x9f, 0xce, 0x33, 0x7d, 0xa4, 0x96, 0xb9, 0xa9, 0x9c,
0x8a, 0x78, 0xcf, 0x33, 0x08, 0xdc, 0x9e, 0xf1, 0xdb, 0x29, 0x57, 0x9e, 0x56, 0xc7, 0x1c, 0xed, 0xd6, 0xf3, 0xb5, 0xa5, 0x3c, 0xda, 0x7f, 0x6a, 0xe8, 0xad, 0x05, 0xd4, 0x39, 0x4b, 0x04, 0xfe,
0x4a, 0x45, 0x55, 0x2e, 0x0f, 0xb6, 0xb5, 0xcf, 0xe8, 0x25, 0x7d, 0xb4, 0x96, 0xbb, 0x6f, 0x9c, 0x6e, 0xae, 0xa2, 0x64, 0xb5, 0x8a, 0x66, 0xb4, 0xac, 0xe7, 0x96, 0x72, 0xad, 0x8d, 0x77, 0x66,
0x76, 0xab, 0xb5, 0x67, 0x3c, 0x86, 0xbf, 0x5b, 0xe8, 0xad, 0x15, 0xd4, 0x23, 0x26, 0x15, 0xfe, 0xaa, 0xe9, 0xa0, 0x2a, 0x13, 0x10, 0x64, 0xd3, 0x52, 0xde, 0xdd, 0x38, 0x38, 0x7e, 0x5e, 0x9a,
0xa6, 0x55, 0x51, 0xb2, 0x59, 0x45, 0x4b, 0x5a, 0xd7, 0xf3, 0xba, 0x71, 0xdd, 0x9b, 0xef, 0xd4, 0x66, 0x43, 0x59, 0x55, 0xcf, 0x32, 0x51, 0x2b, 0xd7, 0x6e, 0xff, 0xb3, 0x38, 0xbd, 0xac, 0xdc,
0xaa, 0x19, 0xa0, 0x2e, 0x53, 0x10, 0x97, 0xd3, 0xb2, 0x7d, 0xf3, 0xda, 0x9d, 0x7b, 0x2f, 0x97, 0xf8, 0x1a, 0xd5, 0x03, 0x16, 0x9e, 0x0c, 0x28, 0xf3, 0xa9, 0xed, 0xc3, 0x93, 0x43, 0x93, 0xbd,
0xa6, 0xdb, 0x37, 0x56, 0xdd, 0x87, 0xa5, 0xa8, 0x57, 0x69, 0x0f, 0xff, 0x5a, 0x9d, 0x5e, 0x59, 0x6a, 0x92, 0xbf, 0x6a, 0x72, 0x16, 0x8a, 0x2e, 0xbf, 0x12, 0x9c, 0x85, 0x9e, 0xf9, 0x86, 0x72,
0x6e, 0xfc, 0x04, 0xf5, 0x62, 0x96, 0xdc, 0x2f, 0x28, 0xe3, 0xd4, 0xe7, 0xf0, 0xc2, 0xa1, 0x29, 0xae, 0x5f, 0xcc, 0xa8, 0x59, 0x05, 0x6d, 0xfc, 0x3d, 0xaa, 0x25, 0xe0, 0x83, 0x23, 0x22, 0xfe,
0xdf, 0x07, 0x52, 0xbd, 0x0f, 0xe4, 0x61, 0xa2, 0xce, 0xc4, 0xb9, 0x12, 0x2c, 0x89, 0xdc, 0x37, 0xff, 0x5e, 0xc7, 0x39, 0xb5, 0xc1, 0xbf, 0x52, 0xa8, 0x59, 0xcf, 0x6a, 0x39, 0x5e, 0x59, 0x13,
0x8c, 0x73, 0xef, 0xb4, 0xa6, 0xe6, 0x35, 0xb4, 0xf1, 0xb7, 0x68, 0x4f, 0x02, 0x87, 0x40, 0xa5, 0xc9, 0xf6, 0xbf, 0x15, 0xf4, 0xf6, 0xd2, 0xde, 0xe3, 0xaf, 0x10, 0x8e, 0x6c, 0xf9, 0xb3, 0x71,
0xe2, 0xdf, 0xfd, 0x1d, 0x8f, 0xa8, 0x0f, 0xfc, 0xdc, 0xa0, 0x6e, 0xaf, 0xac, 0xe5, 0x7c, 0xe5, 0xbf, 0xc8, 0xff, 0x14, 0x2c, 0x0a, 0x65, 0xba, 0x65, 0xb3, 0xa5, 0x82, 0xc7, 0xdd, 0xb9, 0x1b,
0x2d, 0x24, 0x87, 0x7f, 0xef, 0xa0, 0xb7, 0xd7, 0xf6, 0x1e, 0x7f, 0x81, 0x70, 0xea, 0xeb, 0x67, 0xd6, 0x02, 0x0a, 0xff, 0xaa, 0xa1, 0x86, 0x9b, 0xdb, 0x80, 0x7b, 0x19, 0xb9, 0xe3, 0xf6, 0x7d,
0x2b, 0xfc, 0xbc, 0x7a, 0x29, 0x58, 0x9a, 0xe8, 0x74, 0xb7, 0xdd, 0x81, 0x09, 0x1e, 0x9f, 0xb5, 0xf3, 0x22, 0xa6, 0x94, 0x74, 0x66, 0x95, 0x4f, 0x43, 0xc1, 0x87, 0xe6, 0xb6, 0x0a, 0xb0, 0x51,
0x6e, 0x78, 0x2b, 0x28, 0xfc, 0xb3, 0x85, 0xfa, 0x61, 0x65, 0x03, 0xe1, 0xe3, 0x34, 0x9c, 0xb7, 0x38, 0xb3, 0x8a, 0x41, 0xe0, 0x0b, 0x84, 0xdd, 0x89, 0x64, 0x72, 0xe2, 0xfb, 0xd1, 0x4f, 0xe0,
0xef, 0xab, 0xff, 0x62, 0x4a, 0xc9, 0xa8, 0xae, 0x7c, 0x92, 0x28, 0x31, 0x75, 0x6f, 0x98, 0x00, 0xca, 0x07, 0x54, 0x35, 0xdf, 0x51, 0x0a, 0xdb, 0x05, 0xdf, 0xf1, 0x25, 0x6b, 0x01, 0x88, 0x8f,
0xfb, 0x8d, 0x33, 0xaf, 0x19, 0x04, 0x3e, 0x45, 0x38, 0x5c, 0x48, 0xca, 0xfb, 0x9c, 0xa7, 0x3f, 0xd1, 0xa6, 0x93, 0x72, 0x0e, 0xa1, 0xf8, 0x12, 0xa8, 0x2f, 0x7a, 0xc3, 0x66, 0x45, 0x4a, 0xbd,
0x40, 0xa8, 0x7f, 0xa0, 0xae, 0xfb, 0x8e, 0x51, 0xb8, 0xd1, 0xf0, 0x9d, 0x5f, 0xf2, 0x56, 0x80, 0xa9, 0xa4, 0x36, 0x3f, 0x2f, 0x9c, 0x5a, 0x8f, 0x6e, 0x67, 0xbc, 0x0b, 0x09, 0xe3, 0xe0, 0x8e,
0xf8, 0x1e, 0xda, 0x0f, 0x72, 0x21, 0x20, 0x51, 0x0f, 0x80, 0x72, 0x35, 0x9e, 0x1e, 0xec, 0x68, 0xf9, 0x6a, 0x91, 0xef, 0x14, 0x4e, 0xad, 0x47, 0xb7, 0xf1, 0x11, 0xaa, 0xc3, 0x4d, 0x0c, 0xce,
0xa9, 0x37, 0x8d, 0xd4, 0xfe, 0x67, 0x8d, 0x53, 0xef, 0xb9, 0xdb, 0x25, 0x1f, 0x82, 0x64, 0x02, 0xb8, 0xc6, 0xeb, 0x92, 0x9e, 0x0c, 0xda, 0xe9, 0xcc, 0x99, 0x55, 0xb8, 0xd9, 0xf2, 0x11, 0x9e,
0xc2, 0x39, 0xdf, 0x6d, 0xf2, 0xa3, 0xc6, 0xa9, 0xf7, 0xdc, 0x6d, 0x7c, 0x8c, 0x7a, 0xf0, 0x34, 0x2f, 0x22, 0xde, 0x42, 0xe5, 0x3e, 0x0c, 0x65, 0xcb, 0x5f, 0xb5, 0xb2, 0x4f, 0xfc, 0x19, 0xaa,
0x83, 0x60, 0x5e, 0xe3, 0x5d, 0x4d, 0x2f, 0x06, 0xed, 0xa4, 0x76, 0xe6, 0x35, 0x6e, 0x0e, 0x38, 0x0e, 0xa8, 0x9f, 0x82, 0x9a, 0xc6, 0xf7, 0x56, 0x9b, 0xc6, 0xaf, 0x59, 0x00, 0x56, 0x0e, 0x7e,
0xc2, 0xed, 0x22, 0xe2, 0xeb, 0x68, 0x7b, 0x02, 0x53, 0xdd, 0xf2, 0x57, 0xbd, 0xf2, 0x13, 0x7f, 0xba, 0x76, 0xa4, 0x99, 0x7b, 0xb7, 0x0f, 0x7a, 0xe9, 0xee, 0x41, 0x2f, 0xfd, 0xfe, 0xa0, 0x97,
0x8a, 0xba, 0x05, 0xe5, 0x39, 0x98, 0x69, 0x7c, 0x6f, 0xb3, 0x69, 0xfc, 0x92, 0xc5, 0xe0, 0x55, 0x7e, 0x1e, 0xe9, 0xda, 0xed, 0x48, 0xd7, 0xee, 0x46, 0xba, 0xf6, 0xd7, 0x48, 0xd7, 0x7e, 0xf9,
0xe0, 0x27, 0x5b, 0xc7, 0x96, 0x7b, 0xeb, 0xe2, 0xca, 0xee, 0x3c, 0xbb, 0xb2, 0x3b, 0xbf, 0x5e, 0x5b, 0x2f, 0x7d, 0xfb, 0x8a, 0x6a, 0xfa, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xe9, 0x2f,
0xd9, 0x9d, 0x1f, 0x67, 0xb6, 0x75, 0x31, 0xb3, 0xad, 0x67, 0x33, 0xdb, 0xfa, 0x63, 0x66, 0x5b, 0xf1, 0x61, 0x08, 0x00, 0x00,
0x3f, 0xfd, 0x69, 0x77, 0xbe, 0x7e, 0xc5, 0x34, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56,
0x2d, 0x62, 0x87, 0xab, 0x08, 0x00, 0x00,
} }
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1alpha1"; option go_package = "v1alpha1";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -707,37 +707,36 @@ func init() { ...@@ -707,37 +707,36 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 509 bytes of a gzipped FileDescriptorProto // 486 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8a, 0x13, 0x41, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8b, 0xd3, 0x40,
0x10, 0xc6, 0x33, 0x09, 0xc1, 0xdd, 0x8e, 0x62, 0x18, 0x3d, 0x84, 0x1c, 0x66, 0xc3, 0x9e, 0xa2, 0x14, 0xc7, 0x33, 0x5d, 0x8a, 0xbb, 0x53, 0xc5, 0x12, 0x3d, 0x94, 0x1e, 0xb2, 0x65, 0x4f, 0x55,
0xb0, 0xdd, 0x66, 0xfd, 0x43, 0x58, 0xf0, 0x12, 0x11, 0x56, 0x50, 0x5c, 0xc6, 0x9b, 0x28, 0x58, 0x74, 0xc6, 0xae, 0x3f, 0x28, 0x0b, 0x5e, 0x2a, 0x82, 0x82, 0xe2, 0x12, 0x6f, 0xa2, 0xe0, 0xa4,
0xc9, 0x96, 0x9d, 0x36, 0x99, 0xe9, 0xa1, 0xbb, 0x66, 0x30, 0xe0, 0xc1, 0x47, 0xf0, 0xb1, 0x72, 0xfb, 0x4c, 0xc7, 0x34, 0x99, 0x30, 0xf3, 0x12, 0x2c, 0x78, 0xf0, 0x4f, 0xf0, 0xcf, 0xea, 0xcd,
0x73, 0x8f, 0x9e, 0x16, 0x13, 0x7d, 0x10, 0x99, 0x3f, 0xee, 0x0c, 0x8e, 0x8b, 0x8b, 0xb7, 0xa9, 0x3d, 0x7a, 0x5a, 0x6c, 0xf4, 0x0f, 0x91, 0xfc, 0x70, 0x13, 0xcc, 0x16, 0x17, 0x6f, 0x99, 0x99,
0xee, 0xfe, 0x7d, 0x55, 0xdf, 0x57, 0xc3, 0x8e, 0x16, 0x63, 0xcb, 0x95, 0x16, 0x8b, 0x78, 0x8a, 0xf7, 0xf9, 0xbe, 0xef, 0xfb, 0xbe, 0xd0, 0xa3, 0x60, 0x6a, 0x98, 0x54, 0x3c, 0x48, 0x3c, 0xd0,
0x26, 0x44, 0x42, 0x2b, 0xa2, 0x85, 0x14, 0x10, 0x29, 0x2b, 0x2c, 0x69, 0x03, 0x12, 0x45, 0x32, 0x11, 0x20, 0x18, 0x1e, 0x07, 0x3e, 0x17, 0xb1, 0x34, 0xdc, 0xa0, 0xd2, 0xc2, 0x07, 0x9e, 0x4e,
0x9a, 0x22, 0xc1, 0x48, 0x48, 0x0c, 0xd1, 0x00, 0xe1, 0x29, 0x8f, 0x8c, 0x26, 0xed, 0xde, 0xcd, 0x3c, 0x40, 0x31, 0xe1, 0x3e, 0x44, 0xa0, 0x05, 0xc2, 0x09, 0x8b, 0xb5, 0x42, 0x65, 0xdf, 0x2e,
0x59, 0x5e, 0xb2, 0x3c, 0x5a, 0x48, 0x9e, 0xb2, 0xbc, 0x60, 0x79, 0xc1, 0xf6, 0x0f, 0xa4, 0xa2, 0x59, 0x56, 0xb3, 0x2c, 0x0e, 0x7c, 0x96, 0xb3, 0xac, 0x62, 0x59, 0xc5, 0x0e, 0xef, 0xfa, 0x12,
0x79, 0x3c, 0xe5, 0x33, 0x1d, 0x08, 0xa9, 0xa5, 0x16, 0x99, 0xc4, 0x34, 0x7e, 0x9f, 0x55, 0x59, 0x17, 0x89, 0xc7, 0xe6, 0x2a, 0xe4, 0xbe, 0xf2, 0x15, 0x2f, 0x24, 0xbc, 0xe4, 0x43, 0x71, 0x2a,
0x91, 0x7d, 0xe5, 0xd2, 0xfd, 0x07, 0xc5, 0x58, 0x10, 0xa9, 0x00, 0x66, 0x73, 0x15, 0xa2, 0x59, 0x0e, 0xc5, 0x57, 0x29, 0x3d, 0x7c, 0x50, 0xd9, 0x12, 0xb1, 0x0c, 0xc5, 0x7c, 0x21, 0x23, 0xd0,
0x95, 0x83, 0x05, 0x48, 0x20, 0x92, 0xda, 0x40, 0x7d, 0x71, 0x19, 0x65, 0xe2, 0x90, 0x54, 0x80, 0xab, 0xda, 0x58, 0x08, 0x28, 0x78, 0xda, 0x32, 0x34, 0xe4, 0xdb, 0x28, 0x9d, 0x44, 0x28, 0x43,
0x35, 0xe0, 0xd1, 0xbf, 0x00, 0x3b, 0x9b, 0x63, 0x00, 0x35, 0xee, 0xfe, 0x65, 0x5c, 0x4c, 0x6a, 0x68, 0x01, 0x8f, 0xfe, 0x05, 0x98, 0xf9, 0x02, 0x42, 0xd1, 0xe2, 0xee, 0x6f, 0xe3, 0x12, 0x94,
0x29, 0x54, 0x48, 0x96, 0x4c, 0x0d, 0xaa, 0x78, 0xb2, 0x68, 0x12, 0x34, 0xa5, 0x21, 0xfc, 0x08, 0x4b, 0x2e, 0x23, 0x34, 0xa8, 0x5b, 0x50, 0x63, 0x26, 0x03, 0x3a, 0x05, 0x5d, 0x0f, 0x04, 0x9f,
0x41, 0xb4, 0xc4, 0xbf, 0x79, 0x3a, 0xae, 0x2c, 0xe8, 0x00, 0xa4, 0x34, 0x28, 0x81, 0x74, 0x85, 0x44, 0x18, 0x2f, 0xe1, 0xa2, 0x99, 0xee, 0x6c, 0x5d, 0xd0, 0x05, 0xd5, 0x07, 0xbf, 0x3a, 0xf4,
0x85, 0x48, 0x19, 0x94, 0xca, 0x92, 0x01, 0x52, 0x3a, 0x14, 0xc9, 0x08, 0x96, 0xd1, 0xbc, 0xbe, 0xea, 0xeb, 0x32, 0xfa, 0x27, 0x4b, 0x61, 0x8c, 0xfd, 0x9e, 0xee, 0xe6, 0x69, 0x9d, 0x08, 0x14,
0xae, 0xfd, 0x9f, 0x4d, 0x76, 0xfd, 0x55, 0xbe, 0x96, 0x27, 0x4b, 0xb0, 0xd6, 0x7d, 0xc7, 0x76, 0x03, 0x32, 0x22, 0xe3, 0xde, 0xe1, 0x3d, 0x56, 0xad, 0xad, 0x69, 0xbe, 0x5e, 0x5c, 0x5e, 0xcd,
0xd2, 0x24, 0x4f, 0x81, 0xa0, 0xe7, 0x0c, 0x9c, 0x61, 0xe7, 0xf0, 0x1e, 0x2f, 0x56, 0x5a, 0x35, 0xd2, 0x09, 0x7b, 0xe5, 0x7d, 0x84, 0x39, 0xbe, 0x04, 0x14, 0x33, 0x7b, 0x7d, 0xb6, 0x6f, 0x65,
0x56, 0x2e, 0x35, 0x7d, 0xcd, 0x93, 0x11, 0x7f, 0x39, 0xfd, 0x80, 0x33, 0x7a, 0x81, 0x04, 0x13, 0x67, 0xfb, 0xb4, 0xbe, 0x73, 0xcf, 0x55, 0xed, 0x87, 0xb4, 0x17, 0x6b, 0x95, 0x4a, 0x23, 0x55,
0x77, 0x7d, 0xbe, 0xd7, 0xd8, 0x9e, 0xef, 0xb1, 0xf2, 0xcc, 0xbf, 0x50, 0x75, 0x1f, 0xb2, 0x4e, 0x04, 0x7a, 0xd0, 0x19, 0x91, 0xf1, 0xde, 0xec, 0x46, 0x85, 0xf4, 0x8e, 0xeb, 0x27, 0xb7, 0x59,
0x64, 0x74, 0xa2, 0xac, 0xd2, 0x21, 0x9a, 0x5e, 0x73, 0xe0, 0x0c, 0x77, 0x27, 0xb7, 0x0a, 0xa4, 0x67, 0x7f, 0xa6, 0x34, 0x16, 0x5a, 0x84, 0x80, 0xa0, 0xcd, 0x60, 0x67, 0xb4, 0x33, 0xee, 0x1d,
0x73, 0x52, 0x5e, 0xf9, 0xd5, 0x77, 0xee, 0x27, 0xc6, 0x22, 0x30, 0x10, 0x20, 0xa1, 0xb1, 0xbd, 0x3e, 0x63, 0x97, 0xff, 0xa3, 0x58, 0x73, 0x4c, 0x76, 0x7c, 0x2e, 0xf5, 0x34, 0x42, 0xbd, 0xaa,
0xd6, 0xa0, 0x35, 0xec, 0x1c, 0x1e, 0xf3, 0xab, 0xff, 0x6d, 0xbc, 0x6a, 0x93, 0x9f, 0x5c, 0x48, 0x2d, 0xd7, 0x0f, 0x6e, 0xa3, 0xdf, 0xf0, 0x31, 0xbd, 0xfe, 0x17, 0x62, 0xf7, 0xe9, 0x4e, 0x00,
0x3d, 0x0d, 0xc9, 0xac, 0xca, 0x91, 0xcb, 0x0b, 0xbf, 0xd2, 0xaf, 0xff, 0x98, 0xdd, 0xfc, 0x03, 0xab, 0x22, 0xa4, 0x3d, 0x37, 0xff, 0xb4, 0x6f, 0xd2, 0x6e, 0x2a, 0x96, 0x09, 0x94, 0x33, 0xb9,
0x71, 0xbb, 0xac, 0xb5, 0xc0, 0x55, 0x16, 0xd2, 0xae, 0x9f, 0x7e, 0xba, 0xb7, 0x59, 0x3b, 0x81, 0xe5, 0xe1, 0xa8, 0x33, 0x25, 0x07, 0xdf, 0x08, 0xed, 0x37, 0xfb, 0xbf, 0x90, 0x06, 0xed, 0xb7,
0x65, 0x8c, 0xb9, 0x27, 0x3f, 0x2f, 0x8e, 0x9a, 0x63, 0x67, 0xff, 0xab, 0xc3, 0xba, 0xd5, 0xfe, 0xad, 0xa8, 0xd9, 0xe5, 0xa2, 0xce, 0xe9, 0x22, 0xe8, 0x7e, 0xe5, 0x7a, 0xf7, 0xcf, 0x4d, 0x23,
0xcf, 0x95, 0x25, 0xf7, 0x4d, 0x2d, 0x6a, 0x7e, 0xb5, 0xa8, 0x53, 0x3a, 0x0b, 0xba, 0x5b, 0x4c, 0xe6, 0x77, 0xb4, 0x2b, 0x11, 0x42, 0x33, 0xe8, 0x14, 0x51, 0x4d, 0xff, 0x37, 0xaa, 0xd9, 0xb5,
0xbd, 0xf3, 0xfb, 0xa4, 0x12, 0xf3, 0x5b, 0xd6, 0x56, 0x84, 0x81, 0xed, 0x35, 0xb3, 0xa8, 0xc6, 0xaa, 0x49, 0xf7, 0x79, 0x2e, 0xe7, 0x96, 0xaa, 0xb3, 0x5b, 0xeb, 0x8d, 0x63, 0x9d, 0x6e, 0x1c,
0xff, 0x1b, 0xd5, 0xe4, 0x46, 0xd1, 0xa4, 0xfd, 0x2c, 0x95, 0xf3, 0x73, 0xd5, 0xc9, 0x9d, 0xf5, 0xeb, 0xfb, 0xc6, 0xb1, 0xbe, 0x64, 0x0e, 0x59, 0x67, 0x0e, 0x39, 0xcd, 0x1c, 0xf2, 0x23, 0x73,
0xc6, 0x6b, 0x9c, 0x6d, 0xbc, 0xc6, 0xb7, 0x8d, 0xd7, 0xf8, 0xbc, 0xf5, 0x9c, 0xf5, 0xd6, 0x73, 0xc8, 0xd7, 0x9f, 0x8e, 0xf5, 0xe6, 0x4a, 0xa5, 0xf6, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x99, 0xdf,
0xce, 0xb6, 0x9e, 0xf3, 0x7d, 0xeb, 0x39, 0x5f, 0x7e, 0x78, 0x8d, 0xd7, 0xd7, 0x0a, 0xb5, 0x5f, 0x66, 0x94, 0x33, 0x04, 0x00, 0x00,
0x01, 0x00, 0x00, 0xff, 0xff, 0x43, 0x0c, 0x4d, 0xd8, 0x4f, 0x04, 0x00, 0x00,
} }
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -216,7 +216,7 @@ var ignoredResources = map[schema.GroupVersionResource]struct{}{ ...@@ -216,7 +216,7 @@ var ignoredResources = map[schema.GroupVersionResource]struct{}{
{Group: "authorization.k8s.io", Version: "v1beta1", Resource: "subjectaccessreviews"}: {}, {Group: "authorization.k8s.io", Version: "v1beta1", Resource: "subjectaccessreviews"}: {},
{Group: "authorization.k8s.io", Version: "v1beta1", Resource: "selfsubjectaccessreviews"}: {}, {Group: "authorization.k8s.io", Version: "v1beta1", Resource: "selfsubjectaccessreviews"}: {},
{Group: "authorization.k8s.io", Version: "v1beta1", Resource: "localsubjectaccessreviews"}: {}, {Group: "authorization.k8s.io", Version: "v1beta1", Resource: "localsubjectaccessreviews"}: {},
{Group: "apiregistration.k8s.io", Version: "v1alpha1", Resource: "apiservices"}: {}, {Group: "apiregistration.k8s.io", Version: "v1beta1", Resource: "apiservices"}: {},
} }
func (gb *GraphBuilder) enqueueChanges(e *event) { func (gb *GraphBuilder) enqueueChanges(e *event) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto"; import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto";
import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
option go_package = "v1"; option go_package = "v1";
......
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1/generated.proto"; import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1/generated.proto";
......
...@@ -1251,48 +1251,47 @@ func init() { ...@@ -1251,48 +1251,47 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 686 bytes of a gzipped FileDescriptorProto // 668 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x6f, 0x13, 0x31, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x6f, 0xd3, 0x4a,
0x10, 0xcd, 0xe6, 0xa3, 0x24, 0x0e, 0x85, 0x62, 0x09, 0x29, 0x8a, 0xc4, 0x26, 0x0a, 0x97, 0x22, 0x14, 0x8d, 0xf3, 0xd1, 0x97, 0x4c, 0x5e, 0xdf, 0xeb, 0x1b, 0xe9, 0x49, 0x51, 0x24, 0x9c, 0x28,
0x51, 0x2f, 0x29, 0xa8, 0x54, 0xad, 0x38, 0x74, 0xd5, 0x02, 0x3d, 0x20, 0x24, 0x97, 0x72, 0x40, 0x6c, 0x8a, 0x54, 0xc6, 0xa4, 0xa0, 0x52, 0xb5, 0x62, 0x51, 0xab, 0x05, 0x75, 0x81, 0x90, 0xa6,
0x42, 0xc2, 0x49, 0xa6, 0x1b, 0x93, 0xec, 0x87, 0xbc, 0xde, 0xb4, 0xbd, 0xf5, 0x27, 0x70, 0xe4, 0x94, 0x05, 0x12, 0x12, 0x13, 0xe7, 0xd6, 0x31, 0x8e, 0x3f, 0x34, 0x1e, 0xa7, 0xed, 0xae, 0x3f,
0xc8, 0x7f, 0xe1, 0xd2, 0x63, 0x0f, 0x1c, 0x38, 0xa0, 0x8a, 0x84, 0x3f, 0x82, 0xec, 0x75, 0x9b, 0x81, 0x25, 0x4b, 0xfe, 0x0b, 0x9b, 0x2e, 0xbb, 0x60, 0xc1, 0x02, 0x55, 0x24, 0xfc, 0x11, 0x34,
0x2d, 0xa1, 0x42, 0xb4, 0x37, 0xfb, 0x79, 0xde, 0x9b, 0x79, 0x33, 0x1e, 0xb4, 0x31, 0x58, 0x8d, 0xe3, 0xa1, 0x76, 0x49, 0x2b, 0x44, 0xbb, 0xf3, 0x9c, 0x7b, 0xcf, 0xb9, 0xf7, 0xdc, 0xeb, 0x8b,
0x09, 0x0f, 0x9d, 0x41, 0xd2, 0x01, 0x11, 0x80, 0x84, 0xd8, 0x89, 0x06, 0x9e, 0xc3, 0x22, 0x1e, 0xb6, 0xfc, 0xf5, 0x84, 0x78, 0x91, 0xe5, 0xa7, 0x03, 0xe0, 0x21, 0x08, 0x48, 0xac, 0xd8, 0x77,
0x3b, 0x2c, 0x91, 0x7d, 0x08, 0x24, 0xef, 0x32, 0xc9, 0xc3, 0xc0, 0x19, 0xb5, 0x3b, 0x20, 0x59, 0x2d, 0x16, 0x7b, 0x89, 0xc5, 0x52, 0x31, 0x82, 0x50, 0x78, 0x0e, 0x13, 0x5e, 0x14, 0x5a, 0x93,
0xdb, 0xf1, 0x20, 0x00, 0xc1, 0x24, 0xf4, 0x48, 0x24, 0x42, 0x19, 0xe2, 0x76, 0x2a, 0x41, 0xa6, 0xfe, 0x00, 0x04, 0xeb, 0x5b, 0x2e, 0x84, 0xc0, 0x99, 0x80, 0x21, 0x89, 0x79, 0x24, 0x22, 0xdc,
0x12, 0x24, 0x1a, 0x78, 0x44, 0x49, 0x90, 0x8b, 0x12, 0xc4, 0x48, 0xd4, 0x97, 0x3c, 0x2e, 0xfb, 0xcf, 0x24, 0x48, 0x2e, 0x41, 0x62, 0xdf, 0x25, 0x52, 0x82, 0x5c, 0x96, 0x20, 0x5a, 0xa2, 0x7d,
0x49, 0x87, 0x74, 0x43, 0xdf, 0xf1, 0x42, 0x2f, 0x74, 0xb4, 0x52, 0x27, 0xd9, 0xd3, 0x37, 0x7d, 0xdf, 0xf5, 0xc4, 0x28, 0x1d, 0x10, 0x27, 0x0a, 0x2c, 0x37, 0x72, 0x23, 0x4b, 0x29, 0x0d, 0xd2,
0xd1, 0xa7, 0x34, 0x43, 0xfd, 0x89, 0x29, 0x92, 0x45, 0xdc, 0x67, 0xdd, 0x3e, 0x0f, 0x40, 0x1c, 0x03, 0xf5, 0x52, 0x0f, 0xf5, 0x95, 0x55, 0x68, 0x3f, 0xd2, 0x4d, 0xb2, 0xd8, 0x0b, 0x98, 0x33,
0x4e, 0xcb, 0xf4, 0x41, 0x32, 0x67, 0x34, 0x53, 0x57, 0xdd, 0xb9, 0x8c, 0x25, 0x92, 0x40, 0x72, 0xf2, 0x42, 0xe0, 0xc7, 0x79, 0x9b, 0x01, 0x08, 0x66, 0x4d, 0xe6, 0xfa, 0x6a, 0x5b, 0xd7, 0xb1,
0x1f, 0x66, 0x08, 0x2b, 0xff, 0x22, 0xc4, 0xdd, 0x3e, 0xf8, 0x6c, 0x86, 0xf7, 0xf8, 0x32, 0x5e, 0x78, 0x1a, 0x0a, 0x2f, 0x80, 0x39, 0xc2, 0xda, 0xef, 0x08, 0x89, 0x33, 0x82, 0x80, 0xcd, 0xf1,
0x22, 0xf9, 0xd0, 0xe1, 0x81, 0x8c, 0xa5, 0x98, 0x21, 0x65, 0x3c, 0xc5, 0x20, 0x46, 0x20, 0xa6, 0x1e, 0x5e, 0xc7, 0x4b, 0x85, 0x37, 0xb6, 0xbc, 0x50, 0x24, 0x82, 0xcf, 0x91, 0x0a, 0x9e, 0x12,
0x86, 0xe0, 0x80, 0xf9, 0xd1, 0x10, 0xfe, 0xe6, 0xe9, 0x65, 0x66, 0x5c, 0x4b, 0xcc, 0xf3, 0x04, 0xe0, 0x13, 0xe0, 0xb9, 0x21, 0x38, 0x62, 0x41, 0x3c, 0x86, 0xab, 0x3c, 0xad, 0x5c, 0xbb, 0xae,
0x78, 0x4c, 0x86, 0x19, 0x2e, 0x8b, 0xb8, 0x00, 0x8f, 0xc7, 0x52, 0x9c, 0x0d, 0x8d, 0x0d, 0xa3, 0x2b, 0xb2, 0x7b, 0x8f, 0x11, 0xda, 0x39, 0x12, 0x9c, 0xbd, 0x62, 0xe3, 0x14, 0x70, 0x07, 0xd5,
0xfe, 0xec, 0xd4, 0x5a, 0x4f, 0x11, 0xda, 0x3a, 0x90, 0x82, 0xbd, 0x65, 0xc3, 0x04, 0x70, 0x03, 0x3c, 0x01, 0x41, 0xd2, 0x32, 0xba, 0x95, 0xe5, 0x86, 0xdd, 0x98, 0x9d, 0x77, 0x6a, 0xbb, 0x12,
0x95, 0xb8, 0x04, 0x3f, 0xae, 0x59, 0xcd, 0xc2, 0x62, 0xc5, 0xad, 0x4c, 0x4e, 0x1b, 0xa5, 0x6d, 0xa0, 0x19, 0xbe, 0x51, 0xff, 0xf0, 0xb1, 0x53, 0x3a, 0xf9, 0xda, 0x2d, 0xf5, 0x3e, 0x95, 0x51,
0x05, 0xd0, 0x14, 0x5f, 0x2b, 0x7f, 0xfe, 0xd2, 0xc8, 0x1d, 0xfd, 0x68, 0xe6, 0x5a, 0x5f, 0xf3, 0xf3, 0x65, 0xe4, 0x43, 0x48, 0x61, 0xe2, 0xc1, 0x21, 0x7e, 0x8b, 0xea, 0x72, 0xca, 0x43, 0x26,
0xa8, 0xfa, 0x26, 0x1c, 0x40, 0x40, 0x61, 0xc4, 0x61, 0x1f, 0x7f, 0x40, 0x65, 0x35, 0x81, 0x1e, 0x58, 0xcb, 0xe8, 0x1a, 0xcb, 0xcd, 0xd5, 0x07, 0x44, 0x6f, 0xbd, 0x68, 0x3a, 0xdf, 0xbb, 0xcc,
0x93, 0xac, 0x66, 0x35, 0xad, 0xc5, 0xea, 0xf2, 0x23, 0x62, 0x7e, 0x44, 0xb6, 0x21, 0xd3, 0x3f, 0x26, 0x93, 0x3e, 0x79, 0x31, 0x78, 0x07, 0x8e, 0x78, 0x0e, 0x82, 0xd9, 0xf8, 0xf4, 0xbc, 0x53,
0xa1, 0xa2, 0xc9, 0xa8, 0x4d, 0x5e, 0x77, 0x3e, 0x42, 0x57, 0xbe, 0x02, 0xc9, 0x5c, 0x7c, 0x7c, 0x9a, 0x9d, 0x77, 0x50, 0x8e, 0xd1, 0x0b, 0x55, 0x3c, 0x44, 0xd5, 0x24, 0x06, 0xa7, 0x55, 0x56,
0xda, 0xc8, 0x4d, 0x4e, 0x1b, 0x68, 0x8a, 0xd1, 0x73, 0x55, 0xdc, 0x43, 0xc5, 0x38, 0x82, 0x6e, 0xea, 0x36, 0xf9, 0xe3, 0x7f, 0x8a, 0x14, 0xfa, 0xdd, 0x8b, 0xc1, 0xb1, 0xff, 0xd6, 0xf5, 0xaa,
0x2d, 0xaf, 0xd5, 0x5d, 0xf2, 0xdf, 0xff, 0x8d, 0x64, 0xea, 0xdd, 0x89, 0xa0, 0xeb, 0xde, 0x34, 0xf2, 0x45, 0x95, 0x3a, 0x1e, 0xa3, 0x85, 0x44, 0x30, 0x91, 0x26, 0xad, 0x8a, 0xaa, 0xb3, 0x7d,
0xf9, 0x8a, 0xea, 0x46, 0xb5, 0x3a, 0x1e, 0xa2, 0xb9, 0x58, 0x32, 0x99, 0xc4, 0xb5, 0x82, 0xce, 0xcb, 0x3a, 0x4a, 0xcb, 0xfe, 0x47, 0x57, 0x5a, 0xc8, 0xde, 0x54, 0xd7, 0xe8, 0xad, 0xa1, 0x7f,
0xb3, 0x79, 0xcd, 0x3c, 0x5a, 0xcb, 0xbd, 0x65, 0x32, 0xcd, 0xa5, 0x77, 0x6a, 0x72, 0xb4, 0x56, 0x7f, 0x69, 0x0a, 0xdf, 0x45, 0x35, 0x21, 0x21, 0x35, 0xc5, 0x86, 0xbd, 0xa8, 0x99, 0xb5, 0x2c,
0xd0, 0xed, 0x3f, 0x8a, 0xc2, 0xf7, 0x51, 0x49, 0x2a, 0x48, 0x77, 0xb1, 0xe2, 0xce, 0x1b, 0x66, 0x2f, 0x8b, 0xf5, 0x3e, 0x1b, 0xe8, 0xbf, 0xb9, 0x2a, 0x78, 0x13, 0x2d, 0x16, 0x3a, 0x82, 0xa1,
0x29, 0x8d, 0x4b, 0xdf, 0x5a, 0xdf, 0x2c, 0x74, 0x67, 0x26, 0x0b, 0x5e, 0x47, 0xf3, 0x99, 0x8a, 0x92, 0xa8, 0xdb, 0xff, 0x6b, 0x89, 0xc5, 0xad, 0x62, 0x90, 0x5e, 0xce, 0xc5, 0x6f, 0x50, 0x35,
0xa0, 0xa7, 0x25, 0xca, 0xee, 0x5d, 0x23, 0x31, 0xbf, 0x91, 0x7d, 0xa4, 0x17, 0x63, 0xf1, 0x7b, 0x4d, 0x80, 0xeb, 0xf1, 0x6e, 0xde, 0xc0, 0xf6, 0x7e, 0x02, 0x7c, 0x37, 0x3c, 0x88, 0xf2, 0xb9,
0x54, 0x4c, 0x62, 0x10, 0xa6, 0xbd, 0xeb, 0x57, 0xb0, 0xbd, 0x1b, 0x83, 0xd8, 0x0e, 0xf6, 0xc2, 0x4a, 0x84, 0x2a, 0x59, 0x69, 0x0b, 0x38, 0x8f, 0xb8, 0x1a, 0x6b, 0xc1, 0xd6, 0x8e, 0x04, 0x69,
0x69, 0x5f, 0x15, 0x42, 0xb5, 0xac, 0xb2, 0x05, 0x42, 0x84, 0x42, 0xb7, 0x35, 0x63, 0x6b, 0x4b, 0x16, 0xeb, 0x4d, 0xcb, 0xa8, 0xfe, 0x53, 0x05, 0xaf, 0xa0, 0xba, 0x64, 0x86, 0x2c, 0x00, 0x3d,
0x81, 0x34, 0x7d, 0x6b, 0x8d, 0xf3, 0xa8, 0x7c, 0xa6, 0x82, 0x1f, 0xa2, 0xb2, 0x62, 0x06, 0xcc, 0x8b, 0x25, 0x4d, 0x52, 0x39, 0x12, 0xa7, 0x17, 0x19, 0xf8, 0x0e, 0xaa, 0xa4, 0xde, 0x50, 0x75,
0x07, 0xd3, 0x8b, 0x05, 0x43, 0xd2, 0x31, 0x0a, 0xa7, 0xe7, 0x11, 0xf8, 0x1e, 0x2a, 0x24, 0xbc, 0xdf, 0xb0, 0x9b, 0x3a, 0xb1, 0xb2, 0xbf, 0xbb, 0x4d, 0x25, 0x8e, 0x7b, 0x68, 0xc1, 0xe5, 0x51,
0xa7, 0xab, 0xaf, 0xb8, 0x55, 0x13, 0x58, 0xd8, 0xdd, 0xde, 0xa4, 0x0a, 0xc7, 0x2d, 0x34, 0xe7, 0x1a, 0xcb, 0xb5, 0xca, 0x5f, 0x1b, 0xc9, 0x65, 0x3c, 0x53, 0x08, 0xd5, 0x11, 0xec, 0xa3, 0x1a,
0x89, 0x30, 0x89, 0xd4, 0x58, 0xd5, 0xd7, 0x46, 0x6a, 0x18, 0x2f, 0x34, 0x42, 0xcd, 0x0b, 0x1e, 0xc8, 0x5b, 0x68, 0x55, 0xbb, 0x95, 0xe5, 0xe6, 0xea, 0xd3, 0x5b, 0x8c, 0x80, 0xa8, 0xa3, 0xda,
0xa0, 0x12, 0xa8, 0x5d, 0xa8, 0x15, 0x9b, 0x85, 0xc5, 0xea, 0xf2, 0xf3, 0x6b, 0xb4, 0x80, 0xe8, 0x09, 0x05, 0x3f, 0x2e, 0x58, 0x95, 0x18, 0xcd, 0x6a, 0xb4, 0x0f, 0xf5, 0xe1, 0xa9, 0x1c, 0xbc,
0xa5, 0xda, 0x0a, 0xa4, 0x38, 0xcc, 0x58, 0x55, 0x18, 0x4d, 0x73, 0xd4, 0xf7, 0xcd, 0xe2, 0xe9, 0x84, 0x2a, 0x3e, 0x1c, 0x67, 0x36, 0xa9, 0xfc, 0xc4, 0x7b, 0xa8, 0x36, 0x91, 0x37, 0xa9, 0xf7,
0x18, 0xbc, 0x80, 0x0a, 0x03, 0x38, 0x4c, 0x6d, 0x52, 0x75, 0xc4, 0x3b, 0xa8, 0x34, 0x52, 0x3b, 0xf1, 0xe4, 0x06, 0xcd, 0xe4, 0x87, 0x4d, 0x33, 0xad, 0x8d, 0xf2, 0xba, 0x61, 0xdf, 0x3b, 0x9d,
0x69, 0xe6, 0xf1, 0xec, 0x0a, 0xc5, 0x4c, 0x17, 0x9b, 0xa6, 0x5a, 0x6b, 0xf9, 0x55, 0xcb, 0x7d, 0x9a, 0xa5, 0xb3, 0xa9, 0x59, 0xfa, 0x32, 0x35, 0x4b, 0x27, 0x33, 0xd3, 0x38, 0x9d, 0x99, 0xc6,
0x70, 0x3c, 0xb6, 0x73, 0x27, 0x63, 0x3b, 0xf7, 0x7d, 0x6c, 0xe7, 0x8e, 0x26, 0xb6, 0x75, 0x3c, 0xd9, 0xcc, 0x34, 0xbe, 0xcd, 0x4c, 0xe3, 0xfd, 0x77, 0xb3, 0xf4, 0xfa, 0x2f, 0x2d, 0xf0, 0x23,
0xb1, 0xad, 0x93, 0x89, 0x6d, 0xfd, 0x9c, 0xd8, 0xd6, 0xa7, 0x5f, 0x76, 0xee, 0xdd, 0x0d, 0x23, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x87, 0xc6, 0x94, 0xfa, 0x05, 0x00, 0x00,
0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x8a, 0x39, 0x26, 0x16, 0x06, 0x00, 0x00,
} }
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1"; option go_package = "v1";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
import "k8s.io/kubernetes/pkg/apis/autoscaling/v1/generated.proto"; import "k8s.io/kubernetes/pkg/apis/autoscaling/v1/generated.proto";
......
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
import "k8s.io/kubernetes/pkg/apis/batch/v1/generated.proto"; import "k8s.io/kubernetes/pkg/apis/batch/v1/generated.proto";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -27,7 +27,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -1337,56 +1337,54 @@ func init() { ...@@ -1337,56 +1337,54 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 807 bytes of a gzipped FileDescriptorProto // 773 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4d, 0x6f, 0xdc, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcb, 0x6e, 0xf3, 0x44,
0x18, 0xc7, 0xd7, 0x49, 0x36, 0x84, 0xe9, 0x6e, 0x54, 0x06, 0x0a, 0x61, 0x25, 0x1c, 0xb4, 0xa7, 0x18, 0x86, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0xac, 0x5a,
0x16, 0xd1, 0x31, 0x69, 0x11, 0x0a, 0x1c, 0x2a, 0x6a, 0x36, 0xa2, 0x45, 0x8d, 0x52, 0x39, 0x48, 0x04, 0x63, 0xda, 0x22, 0x54, 0x58, 0x54, 0xd4, 0xa4, 0x82, 0xa2, 0x56, 0xa9, 0x5c, 0x24, 0x24,
0x48, 0x08, 0x24, 0xc6, 0xf6, 0x83, 0x77, 0xba, 0xe3, 0x17, 0xcd, 0x8c, 0x4d, 0xf7, 0xc6, 0x47, 0x04, 0x12, 0x63, 0xfb, 0xc3, 0x99, 0xc6, 0x27, 0x8d, 0xc7, 0xa1, 0xd9, 0x71, 0x09, 0x2c, 0xb8,
0xe0, 0xc0, 0x87, 0x8a, 0xc4, 0xa5, 0x47, 0x84, 0x50, 0x44, 0x16, 0xbe, 0x02, 0x77, 0xe4, 0xf1, 0xa8, 0x4a, 0x6c, 0xba, 0x44, 0x08, 0x55, 0x34, 0x70, 0x0b, 0xec, 0x91, 0xc7, 0x93, 0x83, 0x9b,
0xec, 0xae, 0x5d, 0xef, 0xaa, 0x8b, 0x8a, 0xb8, 0x79, 0x5e, 0x7e, 0xff, 0xff, 0xf3, 0xe6, 0x41, 0x44, 0x0d, 0xea, 0xaf, 0x7f, 0xe7, 0x39, 0x3c, 0xef, 0xfb, 0x9d, 0xc6, 0xe8, 0x93, 0xfe, 0x51,
0x1f, 0x4f, 0x8e, 0x25, 0x61, 0xa9, 0x33, 0xc9, 0x7d, 0x10, 0x09, 0x28, 0x90, 0x4e, 0x36, 0x89, 0x42, 0x58, 0x64, 0xf4, 0x53, 0x1b, 0x78, 0x08, 0x02, 0x12, 0x23, 0xee, 0x7b, 0x06, 0x8d, 0x59,
0x1c, 0x9a, 0x31, 0xe9, 0x64, 0x29, 0x67, 0xc1, 0xd4, 0x29, 0x8e, 0x7c, 0x50, 0xf4, 0xc8, 0x89, 0x62, 0xc4, 0x91, 0xcf, 0x9c, 0xa1, 0x31, 0xd8, 0xb7, 0x41, 0xd0, 0x7d, 0xc3, 0x83, 0x10, 0x38,
0x20, 0x01, 0x41, 0x15, 0x84, 0x24, 0x13, 0xa9, 0x4a, 0xf1, 0xad, 0x0a, 0x25, 0x4b, 0x94, 0x64, 0x15, 0xe0, 0x92, 0x98, 0x47, 0x22, 0xc2, 0x7b, 0x39, 0x4a, 0xa6, 0x28, 0x89, 0xfb, 0x1e, 0xc9,
0x93, 0x88, 0x94, 0x28, 0xa9, 0x50, 0x62, 0xd0, 0xc1, 0xed, 0x88, 0xa9, 0x71, 0xee, 0x93, 0x20, 0x50, 0x92, 0xa3, 0x44, 0xa1, 0xad, 0x0f, 0x3c, 0x26, 0x7a, 0xa9, 0x4d, 0x9c, 0x28, 0x30, 0xbc,
0x8d, 0x9d, 0x28, 0x8d, 0x52, 0x47, 0x2b, 0xf8, 0xf9, 0xf7, 0x7a, 0xa5, 0x17, 0xfa, 0xab, 0x52, 0xc8, 0x8b, 0x0c, 0xa9, 0x60, 0xa7, 0x3f, 0xca, 0x95, 0x5c, 0xc8, 0xaf, 0x5c, 0xb9, 0xf5, 0x91,
0x1e, 0x7c, 0x68, 0x82, 0xa2, 0x19, 0x8b, 0x69, 0x30, 0x66, 0x09, 0x88, 0xe9, 0x32, 0xac, 0x18, 0x0a, 0x8a, 0xc6, 0x2c, 0xa0, 0x4e, 0x8f, 0x85, 0xc0, 0x87, 0xd3, 0xb0, 0x02, 0x10, 0xd4, 0x18,
0x14, 0x75, 0x8a, 0x56, 0x3c, 0x03, 0x67, 0x1d, 0x25, 0xf2, 0x44, 0xb1, 0x18, 0x5a, 0xc0, 0x47, 0xcc, 0xc5, 0xd3, 0x32, 0x96, 0x51, 0x3c, 0x0d, 0x05, 0x0b, 0x60, 0x0e, 0xf8, 0xf8, 0x29, 0x20,
0x2f, 0x02, 0x64, 0x30, 0x86, 0x98, 0xb6, 0xb8, 0xbb, 0xeb, 0xb8, 0x5c, 0x31, 0xee, 0xb0, 0x44, 0x71, 0x7a, 0x10, 0xd0, 0x39, 0xee, 0x70, 0x19, 0x97, 0x0a, 0xe6, 0x1b, 0x2c, 0x14, 0x89, 0xe0,
0x49, 0x25, 0x5a, 0x50, 0x2d, 0x27, 0x09, 0xa2, 0x00, 0xb1, 0x4c, 0x08, 0x9e, 0xd2, 0x38, 0xe3, 0x73, 0xd0, 0x4c, 0x4e, 0x09, 0xf0, 0x01, 0xf0, 0x69, 0x42, 0x70, 0x43, 0x83, 0xd8, 0x87, 0x45,
0xb0, 0x2a, 0xa7, 0x07, 0xb5, 0xf6, 0xdc, 0xa6, 0x51, 0x24, 0x20, 0xa2, 0x2a, 0xad, 0xb1, 0x34, 0x39, 0xbd, 0xbf, 0xb4, 0x3d, 0x0b, 0x6e, 0xb7, 0xff, 0xd0, 0x50, 0xed, 0x74, 0xc0, 0x1c, 0xc1,
0x63, 0x02, 0x22, 0x26, 0x95, 0xa0, 0x8a, 0xa5, 0x89, 0x53, 0x1c, 0x51, 0x9e, 0x8d, 0xdb, 0xdd, 0xa2, 0x10, 0xff, 0x80, 0x6a, 0x59, 0xa5, 0x5c, 0x2a, 0x68, 0x53, 0x7b, 0x57, 0xdb, 0xdd, 0x38,
0x1a, 0xbc, 0xbf, 0xb6, 0xd1, 0x2b, 0x7c, 0x87, 0xbf, 0x59, 0x68, 0xef, 0xa4, 0x60, 0x41, 0xa9, 0xf8, 0x90, 0xa8, 0x8e, 0xcd, 0x06, 0x3e, 0xed, 0x59, 0x76, 0x9b, 0x0c, 0xf6, 0x49, 0xd7, 0xbe,
0x89, 0xbf, 0x43, 0x7b, 0x65, 0xcd, 0x43, 0xaa, 0xe8, 0x81, 0xf5, 0xae, 0x75, 0xf3, 0xda, 0x9d, 0x06, 0x47, 0x5c, 0x80, 0xa0, 0x26, 0xbe, 0xbd, 0xdf, 0x29, 0x8d, 0xee, 0x77, 0xd0, 0x74, 0xcf,
0x0f, 0x88, 0xe9, 0x7d, 0xbd, 0x04, 0xcb, 0xee, 0x97, 0xb7, 0x49, 0x71, 0x44, 0xce, 0xfc, 0x27, 0x9a, 0xa8, 0x62, 0x1f, 0x35, 0x5c, 0xf0, 0x41, 0x40, 0x37, 0xce, 0x1c, 0x93, 0xe6, 0x9a, 0xb4,
0x10, 0xa8, 0x53, 0x50, 0xd4, 0xc5, 0x17, 0x97, 0x87, 0x9d, 0xd9, 0xe5, 0x21, 0x5a, 0xee, 0x79, 0x39, 0x5c, 0xcd, 0xa6, 0x33, 0x8b, 0x9a, 0xaf, 0x8d, 0xee, 0x77, 0x1a, 0x85, 0x2d, 0xab, 0x28,
0x0b, 0x55, 0xcc, 0x51, 0x3f, 0x04, 0x0e, 0x0a, 0xce, 0xb2, 0xd2, 0x51, 0x1e, 0x6c, 0x69, 0x9b, 0xde, 0xfe, 0x6d, 0x0d, 0xbd, 0x7e, 0x19, 0xb9, 0x1d, 0x96, 0xf0, 0x54, 0x6e, 0x99, 0xa9, 0xeb,
0xbb, 0x9b, 0xd9, 0x8c, 0xea, 0xa8, 0xfb, 0xda, 0xec, 0xf2, 0xb0, 0xdf, 0xd8, 0xf2, 0x9a, 0xe2, 0x81, 0x78, 0x09, 0x79, 0xba, 0xa8, 0x92, 0xc4, 0xe0, 0xa8, 0xf4, 0x4c, 0xb2, 0xf2, 0xdc, 0x93,
0xc3, 0x5f, 0xb6, 0xd0, 0xeb, 0x8f, 0xd3, 0x70, 0xc4, 0xa4, 0xc8, 0xf5, 0x96, 0x9b, 0x87, 0x11, 0x05, 0xf1, 0x5e, 0xc5, 0xe0, 0x98, 0x75, 0xe5, 0x57, 0xc9, 0x56, 0x96, 0x54, 0xc7, 0x3e, 0x5a,
0xa8, 0xff, 0x21, 0xcf, 0x10, 0xed, 0xc8, 0x0c, 0x02, 0x93, 0x9e, 0x4b, 0x36, 0xfe, 0x83, 0xc8, 0x4f, 0x04, 0x15, 0x69, 0xd2, 0x2c, 0x4b, 0x9f, 0xce, 0x33, 0x7d, 0xa4, 0x96, 0xb9, 0xa9, 0x9c,
0x8a, 0x78, 0xcf, 0x33, 0x08, 0xdc, 0x9e, 0xf1, 0xdb, 0x29, 0x57, 0x9e, 0x56, 0xc7, 0x1c, 0xed, 0xd6, 0xf3, 0xb5, 0xa5, 0x3c, 0xda, 0x7f, 0x6a, 0xe8, 0xad, 0x05, 0xd4, 0x39, 0x4b, 0x04, 0xfe,
0x4a, 0x45, 0x55, 0x2e, 0x0f, 0xb6, 0xb5, 0xcf, 0xe8, 0x25, 0x7d, 0xb4, 0x96, 0xbb, 0x6f, 0x9c, 0x6e, 0xae, 0xa2, 0x64, 0xb5, 0x8a, 0x66, 0xb4, 0xac, 0xe7, 0x96, 0x72, 0xad, 0x8d, 0x77, 0x66,
0x76, 0xab, 0xb5, 0x67, 0x3c, 0x86, 0xbf, 0x5b, 0xe8, 0xad, 0x15, 0xd4, 0x23, 0x26, 0x15, 0xfe, 0xaa, 0xe9, 0xa0, 0x2a, 0x13, 0x10, 0x64, 0xd3, 0x52, 0xde, 0xdd, 0x38, 0x38, 0x7e, 0x5e, 0x9a,
0xa6, 0x55, 0x51, 0xb2, 0x59, 0x45, 0x4b, 0x5a, 0xd7, 0xf3, 0xba, 0x71, 0xdd, 0x9b, 0xef, 0xd4, 0x66, 0x43, 0x59, 0x55, 0xcf, 0x32, 0x51, 0x2b, 0xd7, 0x6e, 0xff, 0xb3, 0x38, 0xbd, 0xac, 0xdc,
0xaa, 0x19, 0xa0, 0x2e, 0x53, 0x10, 0x97, 0xd3, 0xb2, 0x7d, 0xf3, 0xda, 0x9d, 0x7b, 0x2f, 0x97, 0xf8, 0x1a, 0xd5, 0x03, 0x16, 0x9e, 0x0c, 0x28, 0xf3, 0xa9, 0xed, 0xc3, 0x93, 0x43, 0x93, 0xbd,
0xa6, 0xdb, 0x37, 0x56, 0xdd, 0x87, 0xa5, 0xa8, 0x57, 0x69, 0x0f, 0xff, 0x5a, 0x9d, 0x5e, 0x59, 0x6a, 0x92, 0xbf, 0x6a, 0x72, 0x16, 0x8a, 0x2e, 0xbf, 0x12, 0x9c, 0x85, 0x9e, 0xf9, 0x86, 0x72,
0x6e, 0xfc, 0x04, 0xf5, 0x62, 0x96, 0xdc, 0x2f, 0x28, 0xe3, 0xd4, 0xe7, 0xf0, 0xc2, 0xa1, 0x29, 0xae, 0x5f, 0xcc, 0xa8, 0x59, 0x05, 0x6d, 0xfc, 0x3d, 0xaa, 0x25, 0xe0, 0x83, 0x23, 0x22, 0xfe,
0xdf, 0x07, 0x52, 0xbd, 0x0f, 0xe4, 0x61, 0xa2, 0xce, 0xc4, 0xb9, 0x12, 0x2c, 0x89, 0xdc, 0x37, 0xff, 0x5e, 0xc7, 0x39, 0xb5, 0xc1, 0xbf, 0x52, 0xa8, 0x59, 0xcf, 0x6a, 0x39, 0x5e, 0x59, 0x13,
0x8c, 0x73, 0xef, 0xb4, 0xa6, 0xe6, 0x35, 0xb4, 0xf1, 0xb7, 0x68, 0x4f, 0x02, 0x87, 0x40, 0xa5, 0xc9, 0xf6, 0xbf, 0x15, 0xf4, 0xf6, 0xd2, 0xde, 0xe3, 0xaf, 0x10, 0x8e, 0x6c, 0xf9, 0xb3, 0x71,
0xe2, 0xdf, 0xfd, 0x1d, 0x8f, 0xa8, 0x0f, 0xfc, 0xdc, 0xa0, 0x6e, 0xaf, 0xac, 0xe5, 0x7c, 0xe5, 0xbf, 0xc8, 0xff, 0x14, 0x2c, 0x0a, 0x65, 0xba, 0x65, 0xb3, 0xa5, 0x82, 0xc7, 0xdd, 0xb9, 0x1b,
0x2d, 0x24, 0x87, 0x7f, 0xef, 0xa0, 0xb7, 0xd7, 0xf6, 0x1e, 0x7f, 0x81, 0x70, 0xea, 0xeb, 0x67, 0xd6, 0x02, 0x0a, 0xff, 0xaa, 0xa1, 0x86, 0x9b, 0xdb, 0x80, 0x7b, 0x19, 0xb9, 0xe3, 0xf6, 0x7d,
0x2b, 0xfc, 0xbc, 0x7a, 0x29, 0x58, 0x9a, 0xe8, 0x74, 0xb7, 0xdd, 0x81, 0x09, 0x1e, 0x9f, 0xb5, 0xf3, 0x22, 0xa6, 0x94, 0x74, 0x66, 0x95, 0x4f, 0x43, 0xc1, 0x87, 0xe6, 0xb6, 0x0a, 0xb0, 0x51,
0x6e, 0x78, 0x2b, 0x28, 0xfc, 0xb3, 0x85, 0xfa, 0x61, 0x65, 0x03, 0xe1, 0xe3, 0x34, 0x9c, 0xb7, 0x38, 0xb3, 0x8a, 0x41, 0xe0, 0x0b, 0x84, 0xdd, 0x89, 0x64, 0x72, 0xe2, 0xfb, 0xd1, 0x4f, 0xe0,
0xef, 0xab, 0xff, 0x62, 0x4a, 0xc9, 0xa8, 0xae, 0x7c, 0x92, 0x28, 0x31, 0x75, 0x6f, 0x98, 0x00, 0xca, 0x07, 0x54, 0x35, 0xdf, 0x51, 0x0a, 0xdb, 0x05, 0xdf, 0xf1, 0x25, 0x6b, 0x01, 0x88, 0x8f,
0xfb, 0x8d, 0x33, 0xaf, 0x19, 0x04, 0x3e, 0x45, 0x38, 0x5c, 0x48, 0xca, 0xfb, 0x9c, 0xa7, 0x3f, 0xd1, 0xa6, 0x93, 0x72, 0x0e, 0xa1, 0xf8, 0x12, 0xa8, 0x2f, 0x7a, 0xc3, 0x66, 0x45, 0x4a, 0xbd,
0x40, 0xa8, 0x7f, 0xa0, 0xae, 0xfb, 0x8e, 0x51, 0xb8, 0xd1, 0xf0, 0x9d, 0x5f, 0xf2, 0x56, 0x80, 0xa9, 0xa4, 0x36, 0x3f, 0x2f, 0x9c, 0x5a, 0x8f, 0x6e, 0x67, 0xbc, 0x0b, 0x09, 0xe3, 0xe0, 0x8e,
0xf8, 0x1e, 0xda, 0x0f, 0x72, 0x21, 0x20, 0x51, 0x0f, 0x80, 0x72, 0x35, 0x9e, 0x1e, 0xec, 0x68, 0xf9, 0x6a, 0x91, 0xef, 0x14, 0x4e, 0xad, 0x47, 0xb7, 0xf1, 0x11, 0xaa, 0xc3, 0x4d, 0x0c, 0xce,
0xa9, 0x37, 0x8d, 0xd4, 0xfe, 0x67, 0x8d, 0x53, 0xef, 0xb9, 0xdb, 0x25, 0x1f, 0x82, 0x64, 0x02, 0xb8, 0xc6, 0xeb, 0x92, 0x9e, 0x0c, 0xda, 0xe9, 0xcc, 0x99, 0x55, 0xb8, 0xd9, 0xf2, 0x11, 0x9e,
0xc2, 0x39, 0xdf, 0x6d, 0xf2, 0xa3, 0xc6, 0xa9, 0xf7, 0xdc, 0x6d, 0x7c, 0x8c, 0x7a, 0xf0, 0x34, 0x2f, 0x22, 0xde, 0x42, 0xe5, 0x3e, 0x0c, 0x65, 0xcb, 0x5f, 0xb5, 0xb2, 0x4f, 0xfc, 0x19, 0xaa,
0x83, 0x60, 0x5e, 0xe3, 0x5d, 0x4d, 0x2f, 0x06, 0xed, 0xa4, 0x76, 0xe6, 0x35, 0x6e, 0x0e, 0x38, 0x0e, 0xa8, 0x9f, 0x82, 0x9a, 0xc6, 0xf7, 0x56, 0x9b, 0xc6, 0xaf, 0x59, 0x00, 0x56, 0x0e, 0x7e,
0xc2, 0xed, 0x22, 0xe2, 0xeb, 0x68, 0x7b, 0x02, 0x53, 0xdd, 0xf2, 0x57, 0xbd, 0xf2, 0x13, 0x7f, 0xba, 0x76, 0xa4, 0x99, 0x7b, 0xb7, 0x0f, 0x7a, 0xe9, 0xee, 0x41, 0x2f, 0xfd, 0xfe, 0xa0, 0x97,
0x8a, 0xba, 0x05, 0xe5, 0x39, 0x98, 0x69, 0x7c, 0x6f, 0xb3, 0x69, 0xfc, 0x92, 0xc5, 0xe0, 0x55, 0x7e, 0x1e, 0xe9, 0xda, 0xed, 0x48, 0xd7, 0xee, 0x46, 0xba, 0xf6, 0xd7, 0x48, 0xd7, 0x7e, 0xf9,
0xe0, 0x27, 0x5b, 0xc7, 0x96, 0x7b, 0xeb, 0xe2, 0xca, 0xee, 0x3c, 0xbb, 0xb2, 0x3b, 0xbf, 0x5e, 0x5b, 0x2f, 0x7d, 0xfb, 0x8a, 0x6a, 0xfa, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xe9, 0x2f,
0xd9, 0x9d, 0x1f, 0x67, 0xb6, 0x75, 0x31, 0xb3, 0xad, 0x67, 0x33, 0xdb, 0xfa, 0x63, 0x66, 0x5b, 0xf1, 0x61, 0x08, 0x00, 0x00,
0x3f, 0xfd, 0x69, 0x77, 0xbe, 0x7e, 0xc5, 0x34, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56,
0x2d, 0x62, 0x87, 0xab, 0x08, 0x00, 0x00,
} }
...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -26,7 +26,6 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1alpha1"; option go_package = "v1alpha1";
......
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -707,37 +707,36 @@ func init() { ...@@ -707,37 +707,36 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 509 bytes of a gzipped FileDescriptorProto // 486 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8a, 0x13, 0x41, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8b, 0xd3, 0x40,
0x10, 0xc6, 0x33, 0x09, 0xc1, 0xdd, 0x8e, 0x62, 0x18, 0x3d, 0x84, 0x1c, 0x66, 0xc3, 0x9e, 0xa2, 0x14, 0xc7, 0x33, 0x5d, 0x8a, 0xbb, 0x53, 0xc5, 0x12, 0x3d, 0x94, 0x1e, 0xb2, 0x65, 0x4f, 0x55,
0xb0, 0xdd, 0x66, 0xfd, 0x43, 0x58, 0xf0, 0x12, 0x11, 0x56, 0x50, 0x5c, 0xc6, 0x9b, 0x28, 0x58, 0x74, 0xc6, 0xae, 0x3f, 0x28, 0x0b, 0x5e, 0x2a, 0x82, 0x82, 0xe2, 0x12, 0x6f, 0xa2, 0xe0, 0xa4,
0xc9, 0x96, 0x9d, 0x36, 0x99, 0xe9, 0xa1, 0xbb, 0x66, 0x30, 0xe0, 0xc1, 0x47, 0xf0, 0xb1, 0x72, 0xfb, 0x4c, 0xc7, 0x34, 0x99, 0x30, 0xf3, 0x12, 0x2c, 0x78, 0xf0, 0x4f, 0xf0, 0xcf, 0xea, 0xcd,
0x73, 0x8f, 0x9e, 0x16, 0x13, 0x7d, 0x10, 0x99, 0x3f, 0xee, 0x0c, 0x8e, 0x8b, 0x8b, 0xb7, 0xa9, 0x3d, 0x7a, 0x5a, 0x6c, 0xf4, 0x0f, 0x91, 0xfc, 0x70, 0x13, 0xcc, 0x16, 0x17, 0x6f, 0x99, 0x99,
0xee, 0xfe, 0x7d, 0x55, 0xdf, 0x57, 0xc3, 0x8e, 0x16, 0x63, 0xcb, 0x95, 0x16, 0x8b, 0x78, 0x8a, 0xf7, 0xf9, 0xbe, 0xef, 0xfb, 0xbe, 0xd0, 0xa3, 0x60, 0x6a, 0x98, 0x54, 0x3c, 0x48, 0x3c, 0xd0,
0x26, 0x44, 0x42, 0x2b, 0xa2, 0x85, 0x14, 0x10, 0x29, 0x2b, 0x2c, 0x69, 0x03, 0x12, 0x45, 0x32, 0x11, 0x20, 0x18, 0x1e, 0x07, 0x3e, 0x17, 0xb1, 0x34, 0xdc, 0xa0, 0xd2, 0xc2, 0x07, 0x9e, 0x4e,
0x9a, 0x22, 0xc1, 0x48, 0x48, 0x0c, 0xd1, 0x00, 0xe1, 0x29, 0x8f, 0x8c, 0x26, 0xed, 0xde, 0xcd, 0x3c, 0x40, 0x31, 0xe1, 0x3e, 0x44, 0xa0, 0x05, 0xc2, 0x09, 0x8b, 0xb5, 0x42, 0x65, 0xdf, 0x2e,
0x59, 0x5e, 0xb2, 0x3c, 0x5a, 0x48, 0x9e, 0xb2, 0xbc, 0x60, 0x79, 0xc1, 0xf6, 0x0f, 0xa4, 0xa2, 0x59, 0x56, 0xb3, 0x2c, 0x0e, 0x7c, 0x96, 0xb3, 0xac, 0x62, 0x59, 0xc5, 0x0e, 0xef, 0xfa, 0x12,
0x79, 0x3c, 0xe5, 0x33, 0x1d, 0x08, 0xa9, 0xa5, 0x16, 0x99, 0xc4, 0x34, 0x7e, 0x9f, 0x55, 0x59, 0x17, 0x89, 0xc7, 0xe6, 0x2a, 0xe4, 0xbe, 0xf2, 0x15, 0x2f, 0x24, 0xbc, 0xe4, 0x43, 0x71, 0x2a,
0x91, 0x7d, 0xe5, 0xd2, 0xfd, 0x07, 0xc5, 0x58, 0x10, 0xa9, 0x00, 0x66, 0x73, 0x15, 0xa2, 0x59, 0x0e, 0xc5, 0x57, 0x29, 0x3d, 0x7c, 0x50, 0xd9, 0x12, 0xb1, 0x0c, 0xc5, 0x7c, 0x21, 0x23, 0xd0,
0x95, 0x83, 0x05, 0x48, 0x20, 0x92, 0xda, 0x40, 0x7d, 0x71, 0x19, 0x65, 0xe2, 0x90, 0x54, 0x80, 0xab, 0xda, 0x58, 0x08, 0x28, 0x78, 0xda, 0x32, 0x34, 0xe4, 0xdb, 0x28, 0x9d, 0x44, 0x28, 0x43,
0x35, 0xe0, 0xd1, 0xbf, 0x00, 0x3b, 0x9b, 0x63, 0x00, 0x35, 0xee, 0xfe, 0x65, 0x5c, 0x4c, 0x6a, 0x68, 0x01, 0x8f, 0xfe, 0x05, 0x98, 0xf9, 0x02, 0x42, 0xd1, 0xe2, 0xee, 0x6f, 0xe3, 0x12, 0x94,
0x29, 0x54, 0x48, 0x96, 0x4c, 0x0d, 0xaa, 0x78, 0xb2, 0x68, 0x12, 0x34, 0xa5, 0x21, 0xfc, 0x08, 0x4b, 0x2e, 0x23, 0x34, 0xa8, 0x5b, 0x50, 0x63, 0x26, 0x03, 0x3a, 0x05, 0x5d, 0x0f, 0x04, 0x9f,
0x41, 0xb4, 0xc4, 0xbf, 0x79, 0x3a, 0xae, 0x2c, 0xe8, 0x00, 0xa4, 0x34, 0x28, 0x81, 0x74, 0x85, 0x44, 0x18, 0x2f, 0xe1, 0xa2, 0x99, 0xee, 0x6c, 0x5d, 0xd0, 0x05, 0xd5, 0x07, 0xbf, 0x3a, 0xf4,
0x85, 0x48, 0x19, 0x94, 0xca, 0x92, 0x01, 0x52, 0x3a, 0x14, 0xc9, 0x08, 0x96, 0xd1, 0xbc, 0xbe, 0xea, 0xeb, 0x32, 0xfa, 0x27, 0x4b, 0x61, 0x8c, 0xfd, 0x9e, 0xee, 0xe6, 0x69, 0x9d, 0x08, 0x14,
0xae, 0xfd, 0x9f, 0x4d, 0x76, 0xfd, 0x55, 0xbe, 0x96, 0x27, 0x4b, 0xb0, 0xd6, 0x7d, 0xc7, 0x76, 0x03, 0x32, 0x22, 0xe3, 0xde, 0xe1, 0x3d, 0x56, 0xad, 0xad, 0x69, 0xbe, 0x5e, 0x5c, 0x5e, 0xcd,
0xd2, 0x24, 0x4f, 0x81, 0xa0, 0xe7, 0x0c, 0x9c, 0x61, 0xe7, 0xf0, 0x1e, 0x2f, 0x56, 0x5a, 0x35, 0xd2, 0x09, 0x7b, 0xe5, 0x7d, 0x84, 0x39, 0xbe, 0x04, 0x14, 0x33, 0x7b, 0x7d, 0xb6, 0x6f, 0x65,
0x56, 0x2e, 0x35, 0x7d, 0xcd, 0x93, 0x11, 0x7f, 0x39, 0xfd, 0x80, 0x33, 0x7a, 0x81, 0x04, 0x13, 0x67, 0xfb, 0xb4, 0xbe, 0x73, 0xcf, 0x55, 0xed, 0x87, 0xb4, 0x17, 0x6b, 0x95, 0x4a, 0x23, 0x55,
0x77, 0x7d, 0xbe, 0xd7, 0xd8, 0x9e, 0xef, 0xb1, 0xf2, 0xcc, 0xbf, 0x50, 0x75, 0x1f, 0xb2, 0x4e, 0x04, 0x7a, 0xd0, 0x19, 0x91, 0xf1, 0xde, 0xec, 0x46, 0x85, 0xf4, 0x8e, 0xeb, 0x27, 0xb7, 0x59,
0x64, 0x74, 0xa2, 0xac, 0xd2, 0x21, 0x9a, 0x5e, 0x73, 0xe0, 0x0c, 0x77, 0x27, 0xb7, 0x0a, 0xa4, 0x67, 0x7f, 0xa6, 0x34, 0x16, 0x5a, 0x84, 0x80, 0xa0, 0xcd, 0x60, 0x67, 0xb4, 0x33, 0xee, 0x1d,
0x73, 0x52, 0x5e, 0xf9, 0xd5, 0x77, 0xee, 0x27, 0xc6, 0x22, 0x30, 0x10, 0x20, 0xa1, 0xb1, 0xbd, 0x3e, 0x63, 0x97, 0xff, 0xa3, 0x58, 0x73, 0x4c, 0x76, 0x7c, 0x2e, 0xf5, 0x34, 0x42, 0xbd, 0xaa,
0xd6, 0xa0, 0x35, 0xec, 0x1c, 0x1e, 0xf3, 0xab, 0xff, 0x6d, 0xbc, 0x6a, 0x93, 0x9f, 0x5c, 0x48, 0x2d, 0xd7, 0x0f, 0x6e, 0xa3, 0xdf, 0xf0, 0x31, 0xbd, 0xfe, 0x17, 0x62, 0xf7, 0xe9, 0x4e, 0x00,
0x3d, 0x0d, 0xc9, 0xac, 0xca, 0x91, 0xcb, 0x0b, 0xbf, 0xd2, 0xaf, 0xff, 0x98, 0xdd, 0xfc, 0x03, 0xab, 0x22, 0xa4, 0x3d, 0x37, 0xff, 0xb4, 0x6f, 0xd2, 0x6e, 0x2a, 0x96, 0x09, 0x94, 0x33, 0xb9,
0x71, 0xbb, 0xac, 0xb5, 0xc0, 0x55, 0x16, 0xd2, 0xae, 0x9f, 0x7e, 0xba, 0xb7, 0x59, 0x3b, 0x81, 0xe5, 0xe1, 0xa8, 0x33, 0x25, 0x07, 0xdf, 0x08, 0xed, 0x37, 0xfb, 0xbf, 0x90, 0x06, 0xed, 0xb7,
0x65, 0x8c, 0xb9, 0x27, 0x3f, 0x2f, 0x8e, 0x9a, 0x63, 0x67, 0xff, 0xab, 0xc3, 0xba, 0xd5, 0xfe, 0xad, 0xa8, 0xd9, 0xe5, 0xa2, 0xce, 0xe9, 0x22, 0xe8, 0x7e, 0xe5, 0x7a, 0xf7, 0xcf, 0x4d, 0x23,
0xcf, 0x95, 0x25, 0xf7, 0x4d, 0x2d, 0x6a, 0x7e, 0xb5, 0xa8, 0x53, 0x3a, 0x0b, 0xba, 0x5b, 0x4c, 0xe6, 0x77, 0xb4, 0x2b, 0x11, 0x42, 0x33, 0xe8, 0x14, 0x51, 0x4d, 0xff, 0x37, 0xaa, 0xd9, 0xb5,
0xbd, 0xf3, 0xfb, 0xa4, 0x12, 0xf3, 0x5b, 0xd6, 0x56, 0x84, 0x81, 0xed, 0x35, 0xb3, 0xa8, 0xc6, 0xaa, 0x49, 0xf7, 0x79, 0x2e, 0xe7, 0x96, 0xaa, 0xb3, 0x5b, 0xeb, 0x8d, 0x63, 0x9d, 0x6e, 0x1c,
0xff, 0x1b, 0xd5, 0xe4, 0x46, 0xd1, 0xa4, 0xfd, 0x2c, 0x95, 0xf3, 0x73, 0xd5, 0xc9, 0x9d, 0xf5, 0xeb, 0xfb, 0xc6, 0xb1, 0xbe, 0x64, 0x0e, 0x59, 0x67, 0x0e, 0x39, 0xcd, 0x1c, 0xf2, 0x23, 0x73,
0xc6, 0x6b, 0x9c, 0x6d, 0xbc, 0xc6, 0xb7, 0x8d, 0xd7, 0xf8, 0xbc, 0xf5, 0x9c, 0xf5, 0xd6, 0x73, 0xc8, 0xd7, 0x9f, 0x8e, 0xf5, 0xe6, 0x4a, 0xa5, 0xf6, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x99, 0xdf,
0xce, 0xb6, 0x9e, 0xf3, 0x7d, 0xeb, 0x39, 0x5f, 0x7e, 0x78, 0x8d, 0xd7, 0xd7, 0x0a, 0xb5, 0x5f, 0x66, 0x94, 0x33, 0x04, 0x00, 0x00,
0x01, 0x00, 0x00, 0xff, 0xff, 0x43, 0x0c, 0x4d, 0xd8, 0x4f, 0x04, 0x00, 0x00,
} }
...@@ -26,7 +26,7 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto"; ...@@ -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/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/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". // Package-wide variables from generator "generated".
option go_package = "v1beta1"; option go_package = "v1beta1";
......
...@@ -32,7 +32,7 @@ go_library( ...@@ -32,7 +32,7 @@ go_library(
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/cmd/server:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/cmd/server:go_default_library",
], ],
) )
apiVersion: apiregistration.k8s.io/v1alpha1 apiVersion: apiregistration.k8s.io/v1beta1
kind: APIService kind: APIService
metadata: metadata:
name: RESOURCE_NAME name: RESOURCE_NAME
......
...@@ -47,20 +47,20 @@ PREFIX=k8s.io/kube-aggregator/pkg/apis ...@@ -47,20 +47,20 @@ PREFIX=k8s.io/kube-aggregator/pkg/apis
INPUT_BASE="--input-base ${PREFIX}" INPUT_BASE="--input-base ${PREFIX}"
INPUT_APIS=( INPUT_APIS=(
apiregistration/ apiregistration/
apiregistration/v1alpha1 apiregistration/v1beta1
) )
INPUT="--input ${INPUT_APIS[@]}" INPUT="--input ${INPUT_APIS[@]}"
CLIENTSET_PATH="--clientset-path k8s.io/kube-aggregator/pkg/client/clientset_generated" CLIENTSET_PATH="--clientset-path k8s.io/kube-aggregator/pkg/client/clientset_generated"
${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor ${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor
echo "Building lister-gen" echo "Building lister-gen"
listergen="${PWD}/lister-gen" listergen="${PWD}/lister-gen"
go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers" LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers"
${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
...@@ -71,7 +71,7 @@ go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen ...@@ -71,7 +71,7 @@ go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
${informergen} \ ${informergen} \
--output-base ${KUBE_ROOT}/vendor \ --output-base ${KUBE_ROOT}/vendor \
--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1 \ --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 \
--versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \ --versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \
--internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \ --internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \
--listers-package k8s.io/kube-aggregator/pkg/client/listers \ --listers-package k8s.io/kube-aggregator/pkg/client/listers \
......
...@@ -30,7 +30,7 @@ import ( ...@@ -30,7 +30,7 @@ import (
_ "k8s.io/kube-aggregator/pkg/apis/apiregistration/validation" _ "k8s.io/kube-aggregator/pkg/apis/apiregistration/validation"
_ "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" _ "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset"
_ "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" _ "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion"
_ "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1alpha1" _ "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1"
) )
func main() { func main() {
......
...@@ -17,6 +17,6 @@ go_library( ...@@ -17,6 +17,6 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
], ],
) )
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kube-aggregator/pkg/apis/apiregistration"
"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
) )
// Install registers the API group and adds types to a scheme // Install registers the API group and adds types to a scheme
...@@ -31,12 +31,12 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r ...@@ -31,12 +31,12 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
&announced.GroupMetaFactoryArgs{ &announced.GroupMetaFactoryArgs{
GroupName: apiregistration.GroupName, GroupName: apiregistration.GroupName,
RootScopedKinds: sets.NewString("APIService"), RootScopedKinds: sets.NewString("APIService"),
VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version},
ImportPrefix: "k8s.io/kube-aggregator/pkg/apis/apiregistration", ImportPrefix: "k8s.io/kube-aggregator/pkg/apis/apiregistration",
AddInternalObjectsToScheme: apiregistration.AddToScheme, AddInternalObjectsToScheme: apiregistration.AddToScheme,
}, },
announced.VersionToSchemeFunc{ announced.VersionToSchemeFunc{
v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme, v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme,
}, },
).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil { ).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil {
panic(err) panic(err)
......
...@@ -13,7 +13,6 @@ go_library( ...@@ -13,7 +13,6 @@ go_library(
"doc.go", "doc.go",
"generated.pb.go", "generated.pb.go",
"register.go", "register.go",
"types.generated.go",
"types.go", "types.go",
"zz_generated.conversion.go", "zz_generated.conversion.go",
"zz_generated.deepcopy.go", "zz_generated.deepcopy.go",
...@@ -21,12 +20,10 @@ go_library( ...@@ -21,12 +20,10 @@ go_library(
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//vendor/github.com/gogo/protobuf/proto:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library",
"//vendor/github.com/ugorji/go/codec:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library",
], ],
) )
...@@ -17,6 +17,19 @@ limitations under the License. ...@@ -17,6 +17,19 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration // +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration
// Package v1alpha1 is the v1alpha1 version of the API. // Package v1beta1 contains the API Registration API, which 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.
//
// +groupName=apiregistration.k8s.io // +groupName=apiregistration.k8s.io
package v1alpha1 // import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" package v1beta1 // import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
...@@ -19,7 +19,7 @@ limitations under the License. ...@@ -19,7 +19,7 @@ limitations under the License.
syntax = 'proto2'; syntax = 'proto2';
package k8s.io.kube_aggregator.pkg.apis.apiregistration.v1alpha1; package k8s.io.kube_aggregator.pkg.apis.apiregistration.v1beta1;
import "k8s.io/apimachinery/pkg/apis/meta/v1/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/generated.proto";
...@@ -28,7 +28,7 @@ import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; ...@@ -28,7 +28,7 @@ import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto"; import "k8s.io/apiserver/pkg/apis/example/v1/generated.proto";
// Package-wide variables from generator "generated". // Package-wide variables from generator "generated".
option go_package = "v1alpha1"; option go_package = "v1beta1";
// APIService represents a server for a particular GroupVersion. // APIService represents a server for a particular GroupVersion.
// Name must be "version.group". // Name must be "version.group".
......
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
const GroupName = "apiregistration.k8s.io" const GroupName = "apiregistration.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
// Resource takes an unqualified resource and returns back a Group qualified GroupResource // Resource takes an unqualified resource and returns back a Group qualified GroupResource
func Resource(resource string) schema.GroupResource { func Resource(resource string) schema.GroupResource {
......
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
...@@ -18,7 +18,7 @@ limitations under the License. ...@@ -18,7 +18,7 @@ limitations under the License.
// This file was autogenerated by deepcopy-gen. Do not edit it manually! // This file was autogenerated by deepcopy-gen. Do not edit it manually!
package v1alpha1 package v1beta1
import ( import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -35,16 +35,16 @@ func init() { ...@@ -35,16 +35,16 @@ func init() {
// to allow building arbitrary schemes. // to allow building arbitrary schemes.
func RegisterDeepCopies(scheme *runtime.Scheme) error { func RegisterDeepCopies(scheme *runtime.Scheme) error {
return scheme.AddGeneratedDeepCopyFuncs( return scheme.AddGeneratedDeepCopyFuncs(
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_APIService, InType: reflect.TypeOf(&APIService{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_APIService, InType: reflect.TypeOf(&APIService{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_APIServiceCondition, InType: reflect.TypeOf(&APIServiceCondition{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_APIServiceCondition, InType: reflect.TypeOf(&APIServiceCondition{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_APIServiceList, InType: reflect.TypeOf(&APIServiceList{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_APIServiceList, InType: reflect.TypeOf(&APIServiceList{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_APIServiceSpec, InType: reflect.TypeOf(&APIServiceSpec{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_APIServiceSpec, InType: reflect.TypeOf(&APIServiceSpec{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_APIServiceStatus, InType: reflect.TypeOf(&APIServiceStatus{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_APIServiceStatus, InType: reflect.TypeOf(&APIServiceStatus{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ServiceReference, InType: reflect.TypeOf(&ServiceReference{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ServiceReference, InType: reflect.TypeOf(&ServiceReference{})},
) )
} }
func DeepCopy_v1alpha1_APIService(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1beta1_APIService(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*APIService) in := in.(*APIService)
out := out.(*APIService) out := out.(*APIService)
...@@ -68,7 +68,7 @@ func DeepCopy_v1alpha1_APIService(in interface{}, out interface{}, c *conversion ...@@ -68,7 +68,7 @@ func DeepCopy_v1alpha1_APIService(in interface{}, out interface{}, c *conversion
} }
} }
func DeepCopy_v1alpha1_APIServiceCondition(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1beta1_APIServiceCondition(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*APIServiceCondition) in := in.(*APIServiceCondition)
out := out.(*APIServiceCondition) out := out.(*APIServiceCondition)
...@@ -78,7 +78,7 @@ func DeepCopy_v1alpha1_APIServiceCondition(in interface{}, out interface{}, c *c ...@@ -78,7 +78,7 @@ func DeepCopy_v1alpha1_APIServiceCondition(in interface{}, out interface{}, c *c
} }
} }
func DeepCopy_v1alpha1_APIServiceList(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1beta1_APIServiceList(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*APIServiceList) in := in.(*APIServiceList)
out := out.(*APIServiceList) out := out.(*APIServiceList)
...@@ -98,7 +98,7 @@ func DeepCopy_v1alpha1_APIServiceList(in interface{}, out interface{}, c *conver ...@@ -98,7 +98,7 @@ func DeepCopy_v1alpha1_APIServiceList(in interface{}, out interface{}, c *conver
} }
} }
func DeepCopy_v1alpha1_APIServiceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1beta1_APIServiceSpec(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*APIServiceSpec) in := in.(*APIServiceSpec)
out := out.(*APIServiceSpec) out := out.(*APIServiceSpec)
...@@ -117,7 +117,7 @@ func DeepCopy_v1alpha1_APIServiceSpec(in interface{}, out interface{}, c *conver ...@@ -117,7 +117,7 @@ func DeepCopy_v1alpha1_APIServiceSpec(in interface{}, out interface{}, c *conver
} }
} }
func DeepCopy_v1alpha1_APIServiceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1beta1_APIServiceStatus(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*APIServiceStatus) in := in.(*APIServiceStatus)
out := out.(*APIServiceStatus) out := out.(*APIServiceStatus)
...@@ -137,7 +137,7 @@ func DeepCopy_v1alpha1_APIServiceStatus(in interface{}, out interface{}, c *conv ...@@ -137,7 +137,7 @@ func DeepCopy_v1alpha1_APIServiceStatus(in interface{}, out interface{}, c *conv
} }
} }
func DeepCopy_v1alpha1_ServiceReference(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1beta1_ServiceReference(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*ServiceReference) in := in.(*ServiceReference)
out := out.(*ServiceReference) out := out.(*ServiceReference)
......
...@@ -75,7 +75,7 @@ go_library( ...@@ -75,7 +75,7 @@ go_library(
"//vendor/k8s.io/client-go/util/workqueue:go_default_library", "//vendor/k8s.io/client-go/util/workqueue:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/install:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/install:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/informers/internalversion:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/informers/internalversion:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion:go_default_library",
......
...@@ -36,7 +36,7 @@ import ( ...@@ -36,7 +36,7 @@ import (
"k8s.io/kube-aggregator/pkg/apis/apiregistration" "k8s.io/kube-aggregator/pkg/apis/apiregistration"
"k8s.io/kube-aggregator/pkg/apis/apiregistration/install" "k8s.io/kube-aggregator/pkg/apis/apiregistration/install"
"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
"k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset"
informers "k8s.io/kube-aggregator/pkg/client/informers/internalversion" informers "k8s.io/kube-aggregator/pkg/client/informers/internalversion"
listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion"
...@@ -158,12 +158,12 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg ...@@ -158,12 +158,12 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
} }
apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(apiregistration.GroupName, registry, Scheme, metav1.ParameterCodec, Codecs) apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(apiregistration.GroupName, registry, Scheme, metav1.ParameterCodec, Codecs)
apiGroupInfo.GroupMeta.GroupVersion = v1alpha1.SchemeGroupVersion apiGroupInfo.GroupMeta.GroupVersion = v1beta1.SchemeGroupVersion
v1alpha1storage := map[string]rest.Storage{} v1beta1storage := map[string]rest.Storage{}
apiServiceREST := apiservicestorage.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter) apiServiceREST := apiservicestorage.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter)
v1alpha1storage["apiservices"] = apiServiceREST v1beta1storage["apiservices"] = apiServiceREST
v1alpha1storage["apiservices/status"] = apiservicestorage.NewStatusREST(Scheme, apiServiceREST) v1beta1storage["apiservices/status"] = apiservicestorage.NewStatusREST(Scheme, apiServiceREST)
apiGroupInfo.VersionedResourcesStorageMap["v1alpha1"] = v1alpha1storage apiGroupInfo.VersionedResourcesStorageMap["v1beta1"] = v1beta1storage
if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil { if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {
return nil, err return nil, err
......
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
apiregistrationapi "k8s.io/kube-aggregator/pkg/apis/apiregistration" apiregistrationapi "k8s.io/kube-aggregator/pkg/apis/apiregistration"
apiregistrationv1alpha1api "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" apiregistrationv1beta1api "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion" listers "k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion"
) )
...@@ -42,13 +42,13 @@ var discoveryGroup = metav1.APIGroup{ ...@@ -42,13 +42,13 @@ var discoveryGroup = metav1.APIGroup{
Name: apiregistrationapi.GroupName, Name: apiregistrationapi.GroupName,
Versions: []metav1.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{ {
GroupVersion: apiregistrationv1alpha1api.SchemeGroupVersion.String(), GroupVersion: apiregistrationv1beta1api.SchemeGroupVersion.String(),
Version: apiregistrationv1alpha1api.SchemeGroupVersion.Version, Version: apiregistrationv1beta1api.SchemeGroupVersion.Version,
}, },
}, },
PreferredVersion: metav1.GroupVersionForDiscovery{ PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: apiregistrationv1alpha1api.SchemeGroupVersion.String(), GroupVersion: apiregistrationv1beta1api.SchemeGroupVersion.String(),
Version: apiregistrationv1alpha1api.SchemeGroupVersion.Version, Version: apiregistrationv1beta1api.SchemeGroupVersion.Version,
}, },
} }
......
...@@ -19,6 +19,6 @@ go_library( ...@@ -19,6 +19,6 @@ go_library(
"//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/discovery:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1:go_default_library",
], ],
) )
...@@ -21,38 +21,38 @@ import ( ...@@ -21,38 +21,38 @@ import (
discovery "k8s.io/client-go/discovery" discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol" flowcontrol "k8s.io/client-go/util/flowcontrol"
apiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1"
) )
type Interface interface { type Interface interface {
Discovery() discovery.DiscoveryInterface Discovery() discovery.DiscoveryInterface
ApiregistrationV1alpha1() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface ApiregistrationV1beta1() apiregistrationv1beta1.ApiregistrationV1beta1Interface
// Deprecated: please explicitly pick a version if possible. // Deprecated: please explicitly pick a version if possible.
Apiregistration() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface Apiregistration() apiregistrationv1beta1.ApiregistrationV1beta1Interface
} }
// Clientset contains the clients for groups. Each group has exactly one // Clientset contains the clients for groups. Each group has exactly one
// version included in a Clientset. // version included in a Clientset.
type Clientset struct { type Clientset struct {
*discovery.DiscoveryClient *discovery.DiscoveryClient
*apiregistrationv1alpha1.ApiregistrationV1alpha1Client *apiregistrationv1beta1.ApiregistrationV1beta1Client
} }
// ApiregistrationV1alpha1 retrieves the ApiregistrationV1alpha1Client // ApiregistrationV1beta1 retrieves the ApiregistrationV1beta1Client
func (c *Clientset) ApiregistrationV1alpha1() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { func (c *Clientset) ApiregistrationV1beta1() apiregistrationv1beta1.ApiregistrationV1beta1Interface {
if c == nil { if c == nil {
return nil return nil
} }
return c.ApiregistrationV1alpha1Client return c.ApiregistrationV1beta1Client
} }
// Deprecated: Apiregistration retrieves the default version of ApiregistrationClient. // Deprecated: Apiregistration retrieves the default version of ApiregistrationClient.
// Please explicitly pick a version. // Please explicitly pick a version.
func (c *Clientset) Apiregistration() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { func (c *Clientset) Apiregistration() apiregistrationv1beta1.ApiregistrationV1beta1Interface {
if c == nil { if c == nil {
return nil return nil
} }
return c.ApiregistrationV1alpha1Client return c.ApiregistrationV1beta1Client
} }
// Discovery retrieves the DiscoveryClient // Discovery retrieves the DiscoveryClient
...@@ -71,7 +71,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { ...@@ -71,7 +71,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
} }
var cs Clientset var cs Clientset
var err error var err error
cs.ApiregistrationV1alpha1Client, err = apiregistrationv1alpha1.NewForConfig(&configShallowCopy) cs.ApiregistrationV1beta1Client, err = apiregistrationv1beta1.NewForConfig(&configShallowCopy)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -88,7 +88,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { ...@@ -88,7 +88,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
// panics if there is an error in the config. // panics if there is an error in the config.
func NewForConfigOrDie(c *rest.Config) *Clientset { func NewForConfigOrDie(c *rest.Config) *Clientset {
var cs Clientset var cs Clientset
cs.ApiregistrationV1alpha1Client = apiregistrationv1alpha1.NewForConfigOrDie(c) cs.ApiregistrationV1beta1Client = apiregistrationv1beta1.NewForConfigOrDie(c)
cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
return &cs return &cs
...@@ -97,7 +97,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { ...@@ -97,7 +97,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
// New creates a new Clientset for the given RESTClient. // New creates a new Clientset for the given RESTClient.
func New(c rest.Interface) *Clientset { func New(c rest.Interface) *Clientset {
var cs Clientset var cs Clientset
cs.ApiregistrationV1alpha1Client = apiregistrationv1alpha1.New(c) cs.ApiregistrationV1beta1Client = apiregistrationv1beta1.New(c)
cs.DiscoveryClient = discovery.NewDiscoveryClient(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
return &cs return &cs
......
...@@ -24,9 +24,9 @@ go_library( ...@@ -24,9 +24,9 @@ go_library(
"//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/discovery:go_default_library",
"//vendor/k8s.io/client-go/discovery/fake:go_default_library", "//vendor/k8s.io/client-go/discovery/fake:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/fake:go_default_library",
], ],
) )
...@@ -23,8 +23,8 @@ import ( ...@@ -23,8 +23,8 @@ import (
fakediscovery "k8s.io/client-go/discovery/fake" fakediscovery "k8s.io/client-go/discovery/fake"
"k8s.io/client-go/testing" "k8s.io/client-go/testing"
clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
apiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1"
fakeapiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" fakeapiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/fake"
) )
// NewSimpleClientset returns a clientset that will respond with the provided objects. // NewSimpleClientset returns a clientset that will respond with the provided objects.
...@@ -60,12 +60,12 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { ...@@ -60,12 +60,12 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
var _ clientset.Interface = &Clientset{} var _ clientset.Interface = &Clientset{}
// ApiregistrationV1alpha1 retrieves the ApiregistrationV1alpha1Client // ApiregistrationV1beta1 retrieves the ApiregistrationV1beta1Client
func (c *Clientset) ApiregistrationV1alpha1() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { func (c *Clientset) ApiregistrationV1beta1() apiregistrationv1beta1.ApiregistrationV1beta1Interface {
return &fakeapiregistrationv1alpha1.FakeApiregistrationV1alpha1{Fake: &c.Fake} return &fakeapiregistrationv1beta1.FakeApiregistrationV1beta1{Fake: &c.Fake}
} }
// Apiregistration retrieves the ApiregistrationV1alpha1Client // Apiregistration retrieves the ApiregistrationV1beta1Client
func (c *Clientset) Apiregistration() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { func (c *Clientset) Apiregistration() apiregistrationv1beta1.ApiregistrationV1beta1Interface {
return &fakeapiregistrationv1alpha1.FakeApiregistrationV1alpha1{Fake: &c.Fake} return &fakeapiregistrationv1beta1.FakeApiregistrationV1beta1{Fake: &c.Fake}
} }
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer" serializer "k8s.io/apimachinery/pkg/runtime/serializer"
apiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
) )
var scheme = runtime.NewScheme() var scheme = runtime.NewScheme()
...@@ -48,6 +48,6 @@ func init() { ...@@ -48,6 +48,6 @@ func init() {
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly. // correctly.
func AddToScheme(scheme *runtime.Scheme) { func AddToScheme(scheme *runtime.Scheme) {
apiregistrationv1alpha1.AddToScheme(scheme) apiregistrationv1beta1.AddToScheme(scheme)
} }
...@@ -19,6 +19,6 @@ go_library( ...@@ -19,6 +19,6 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
], ],
) )
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer" serializer "k8s.io/apimachinery/pkg/runtime/serializer"
apiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
) )
var Scheme = runtime.NewScheme() var Scheme = runtime.NewScheme()
...@@ -48,6 +48,6 @@ func init() { ...@@ -48,6 +48,6 @@ func init() {
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly. // correctly.
func AddToScheme(scheme *runtime.Scheme) { func AddToScheme(scheme *runtime.Scheme) {
apiregistrationv1alpha1.AddToScheme(scheme) apiregistrationv1beta1.AddToScheme(scheme)
} }
...@@ -22,7 +22,7 @@ go_library( ...@@ -22,7 +22,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme:go_default_library",
], ],
) )
...@@ -14,31 +14,31 @@ See the License for the specific language governing permissions and ...@@ -14,31 +14,31 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
serializer "k8s.io/apimachinery/pkg/runtime/serializer" serializer "k8s.io/apimachinery/pkg/runtime/serializer"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" v1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
) )
type ApiregistrationV1alpha1Interface interface { type ApiregistrationV1beta1Interface interface {
RESTClient() rest.Interface RESTClient() rest.Interface
APIServicesGetter APIServicesGetter
} }
// ApiregistrationV1alpha1Client is used to interact with features provided by the apiregistration.k8s.io group. // ApiregistrationV1beta1Client is used to interact with features provided by the apiregistration.k8s.io group.
type ApiregistrationV1alpha1Client struct { type ApiregistrationV1beta1Client struct {
restClient rest.Interface restClient rest.Interface
} }
func (c *ApiregistrationV1alpha1Client) APIServices() APIServiceInterface { func (c *ApiregistrationV1beta1Client) APIServices() APIServiceInterface {
return newAPIServices(c) return newAPIServices(c)
} }
// NewForConfig creates a new ApiregistrationV1alpha1Client for the given config. // NewForConfig creates a new ApiregistrationV1beta1Client for the given config.
func NewForConfig(c *rest.Config) (*ApiregistrationV1alpha1Client, error) { func NewForConfig(c *rest.Config) (*ApiregistrationV1beta1Client, error) {
config := *c config := *c
if err := setConfigDefaults(&config); err != nil { if err := setConfigDefaults(&config); err != nil {
return nil, err return nil, err
...@@ -47,12 +47,12 @@ func NewForConfig(c *rest.Config) (*ApiregistrationV1alpha1Client, error) { ...@@ -47,12 +47,12 @@ func NewForConfig(c *rest.Config) (*ApiregistrationV1alpha1Client, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &ApiregistrationV1alpha1Client{client}, nil return &ApiregistrationV1beta1Client{client}, nil
} }
// NewForConfigOrDie creates a new ApiregistrationV1alpha1Client for the given config and // NewForConfigOrDie creates a new ApiregistrationV1beta1Client for the given config and
// panics if there is an error in the config. // panics if there is an error in the config.
func NewForConfigOrDie(c *rest.Config) *ApiregistrationV1alpha1Client { func NewForConfigOrDie(c *rest.Config) *ApiregistrationV1beta1Client {
client, err := NewForConfig(c) client, err := NewForConfig(c)
if err != nil { if err != nil {
panic(err) panic(err)
...@@ -60,13 +60,13 @@ func NewForConfigOrDie(c *rest.Config) *ApiregistrationV1alpha1Client { ...@@ -60,13 +60,13 @@ func NewForConfigOrDie(c *rest.Config) *ApiregistrationV1alpha1Client {
return client return client
} }
// New creates a new ApiregistrationV1alpha1Client for the given RESTClient. // New creates a new ApiregistrationV1beta1Client for the given RESTClient.
func New(c rest.Interface) *ApiregistrationV1alpha1Client { func New(c rest.Interface) *ApiregistrationV1beta1Client {
return &ApiregistrationV1alpha1Client{c} return &ApiregistrationV1beta1Client{c}
} }
func setConfigDefaults(config *rest.Config) error { func setConfigDefaults(config *rest.Config) error {
gv := v1alpha1.SchemeGroupVersion gv := v1beta1.SchemeGroupVersion
config.GroupVersion = &gv config.GroupVersion = &gv
config.APIPath = "/apis" config.APIPath = "/apis"
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
...@@ -80,7 +80,7 @@ func setConfigDefaults(config *rest.Config) error { ...@@ -80,7 +80,7 @@ func setConfigDefaults(config *rest.Config) error {
// RESTClient returns a RESTClient that is used to communicate // RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation. // with API server by this client implementation.
func (c *ApiregistrationV1alpha1Client) RESTClient() rest.Interface { func (c *ApiregistrationV1beta1Client) RESTClient() rest.Interface {
if c == nil { if c == nil {
return nil return nil
} }
......
...@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and ...@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package v1alpha1 package v1beta1
import ( import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" v1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
scheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" scheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
) )
...@@ -33,15 +33,15 @@ type APIServicesGetter interface { ...@@ -33,15 +33,15 @@ type APIServicesGetter interface {
// APIServiceInterface has methods to work with APIService resources. // APIServiceInterface has methods to work with APIService resources.
type APIServiceInterface interface { type APIServiceInterface interface {
Create(*v1alpha1.APIService) (*v1alpha1.APIService, error) Create(*v1beta1.APIService) (*v1beta1.APIService, error)
Update(*v1alpha1.APIService) (*v1alpha1.APIService, error) Update(*v1beta1.APIService) (*v1beta1.APIService, error)
UpdateStatus(*v1alpha1.APIService) (*v1alpha1.APIService, error) UpdateStatus(*v1beta1.APIService) (*v1beta1.APIService, error)
Delete(name string, options *v1.DeleteOptions) error Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options v1.GetOptions) (*v1alpha1.APIService, error) Get(name string, options v1.GetOptions) (*v1beta1.APIService, error)
List(opts v1.ListOptions) (*v1alpha1.APIServiceList, error) List(opts v1.ListOptions) (*v1beta1.APIServiceList, error)
Watch(opts v1.ListOptions) (watch.Interface, error) Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.APIService, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.APIService, err error)
APIServiceExpansion APIServiceExpansion
} }
...@@ -51,15 +51,15 @@ type aPIServices struct { ...@@ -51,15 +51,15 @@ type aPIServices struct {
} }
// newAPIServices returns a APIServices // newAPIServices returns a APIServices
func newAPIServices(c *ApiregistrationV1alpha1Client) *aPIServices { func newAPIServices(c *ApiregistrationV1beta1Client) *aPIServices {
return &aPIServices{ return &aPIServices{
client: c.RESTClient(), client: c.RESTClient(),
} }
} }
// Create takes the representation of a aPIService and creates it. Returns the server's representation of the aPIService, and an error, if there is any. // Create takes the representation of a aPIService and creates it. Returns the server's representation of the aPIService, and an error, if there is any.
func (c *aPIServices) Create(aPIService *v1alpha1.APIService) (result *v1alpha1.APIService, err error) { func (c *aPIServices) Create(aPIService *v1beta1.APIService) (result *v1beta1.APIService, err error) {
result = &v1alpha1.APIService{} result = &v1beta1.APIService{}
err = c.client.Post(). err = c.client.Post().
Resource("apiservices"). Resource("apiservices").
Body(aPIService). Body(aPIService).
...@@ -69,8 +69,8 @@ func (c *aPIServices) Create(aPIService *v1alpha1.APIService) (result *v1alpha1. ...@@ -69,8 +69,8 @@ func (c *aPIServices) Create(aPIService *v1alpha1.APIService) (result *v1alpha1.
} }
// Update takes the representation of a aPIService and updates it. Returns the server's representation of the aPIService, and an error, if there is any. // Update takes the representation of a aPIService and updates it. Returns the server's representation of the aPIService, and an error, if there is any.
func (c *aPIServices) Update(aPIService *v1alpha1.APIService) (result *v1alpha1.APIService, err error) { func (c *aPIServices) Update(aPIService *v1beta1.APIService) (result *v1beta1.APIService, err error) {
result = &v1alpha1.APIService{} result = &v1beta1.APIService{}
err = c.client.Put(). err = c.client.Put().
Resource("apiservices"). Resource("apiservices").
Name(aPIService.Name). Name(aPIService.Name).
...@@ -83,8 +83,8 @@ func (c *aPIServices) Update(aPIService *v1alpha1.APIService) (result *v1alpha1. ...@@ -83,8 +83,8 @@ func (c *aPIServices) Update(aPIService *v1alpha1.APIService) (result *v1alpha1.
// UpdateStatus was generated because the type contains a Status member. // UpdateStatus was generated because the type contains a Status member.
// Add a +genclientstatus=false comment above the type to avoid generating UpdateStatus(). // Add a +genclientstatus=false comment above the type to avoid generating UpdateStatus().
func (c *aPIServices) UpdateStatus(aPIService *v1alpha1.APIService) (result *v1alpha1.APIService, err error) { func (c *aPIServices) UpdateStatus(aPIService *v1beta1.APIService) (result *v1beta1.APIService, err error) {
result = &v1alpha1.APIService{} result = &v1beta1.APIService{}
err = c.client.Put(). err = c.client.Put().
Resource("apiservices"). Resource("apiservices").
Name(aPIService.Name). Name(aPIService.Name).
...@@ -116,8 +116,8 @@ func (c *aPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1 ...@@ -116,8 +116,8 @@ func (c *aPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1
} }
// Get takes name of the aPIService, and returns the corresponding aPIService object, and an error if there is any. // Get takes name of the aPIService, and returns the corresponding aPIService object, and an error if there is any.
func (c *aPIServices) Get(name string, options v1.GetOptions) (result *v1alpha1.APIService, err error) { func (c *aPIServices) Get(name string, options v1.GetOptions) (result *v1beta1.APIService, err error) {
result = &v1alpha1.APIService{} result = &v1beta1.APIService{}
err = c.client.Get(). err = c.client.Get().
Resource("apiservices"). Resource("apiservices").
Name(name). Name(name).
...@@ -128,8 +128,8 @@ func (c *aPIServices) Get(name string, options v1.GetOptions) (result *v1alpha1. ...@@ -128,8 +128,8 @@ func (c *aPIServices) Get(name string, options v1.GetOptions) (result *v1alpha1.
} }
// List takes label and field selectors, and returns the list of APIServices that match those selectors. // List takes label and field selectors, and returns the list of APIServices that match those selectors.
func (c *aPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIServiceList, err error) { func (c *aPIServices) List(opts v1.ListOptions) (result *v1beta1.APIServiceList, err error) {
result = &v1alpha1.APIServiceList{} result = &v1beta1.APIServiceList{}
err = c.client.Get(). err = c.client.Get().
Resource("apiservices"). Resource("apiservices").
VersionedParams(&opts, scheme.ParameterCodec). VersionedParams(&opts, scheme.ParameterCodec).
...@@ -148,8 +148,8 @@ func (c *aPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) { ...@@ -148,8 +148,8 @@ func (c *aPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) {
} }
// Patch applies the patch and returns the patched aPIService. // Patch applies the patch and returns the patched aPIService.
func (c *aPIServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.APIService, err error) { func (c *aPIServices) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.APIService, err error) {
result = &v1alpha1.APIService{} result = &v1beta1.APIService{}
err = c.client.Patch(pt). err = c.client.Patch(pt).
Resource("apiservices"). Resource("apiservices").
SubResource(subresources...). SubResource(subresources...).
......
...@@ -17,4 +17,4 @@ limitations under the License. ...@@ -17,4 +17,4 @@ limitations under the License.
// This package is generated by client-gen with custom arguments. // This package is generated by client-gen with custom arguments.
// This package has the automatically generated typed clients. // This package has the automatically generated typed clients.
package v1alpha1 package v1beta1
...@@ -23,7 +23,7 @@ go_library( ...@@ -23,7 +23,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
"//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1:go_default_library", "//vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1:go_default_library",
], ],
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment