github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-21 10:30:24 +00:00
Code Issues Projects Releases Wiki Activity

published by bot

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

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is 81d788dd6e0748e5d53a62c16d933c5f7a0718af
This commit is contained in:
Kubernetes Publisher 2016-12-04 11:39:55 +00:00
parent 41a99d711a
commit 124670e99d
230 changed files with 26296 additions and 27189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -183,7 +183,7 @@
}, },
{ {
"ImportPath": "github.com/spf13/pflag", "ImportPath": "github.com/spf13/pflag",
"Rev": "c7e63cf4530bcd3ba943729cee0efeff2ebea63f" "Rev": "5ccb023bc27df288a957c5e994cd44fd19619465"
}, },
{ {
"ImportPath": "github.com/stretchr/testify/assert", "ImportPath": "github.com/stretchr/testify/assert",

38
discovery/discovery_client.go
View File

@ -27,8 +27,8 @@ import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/errors"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/runtime/serializer" "k8s.io/client-go/pkg/runtime/serializer"
@ -59,15 +59,15 @@ type CachedDiscoveryInterface interface {
type ServerGroupsInterface interface { type ServerGroupsInterface interface {
// ServerGroups returns the supported groups, with information like supported versions and the // ServerGroups returns the supported groups, with information like supported versions and the
// preferred version. // preferred version.
ServerGroups() (*unversioned.APIGroupList, error) ServerGroups() (*metav1.APIGroupList, error)
} }
// ServerResourcesInterface has methods for obtaining supported resources on the API server // ServerResourcesInterface has methods for obtaining supported resources on the API server
type ServerResourcesInterface interface { type ServerResourcesInterface interface {
// ServerResourcesForGroupVersion returns the supported resources for a group and version. // ServerResourcesForGroupVersion returns the supported resources for a group and version.
ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error)
// ServerResources returns the supported resources for all groups and versions. // ServerResources returns the supported resources for all groups and versions.
ServerResources() (map[string]*unversioned.APIResourceList, error) ServerResources() (map[string]*metav1.APIResourceList, error)
// ServerPreferredResources returns the supported resources with the version preferred by the // ServerPreferredResources returns the supported resources with the version preferred by the
// server. // server.
ServerPreferredResources() ([]schema.GroupVersionResource, error) ServerPreferredResources() ([]schema.GroupVersionResource, error)
@ -96,12 +96,12 @@ type DiscoveryClient struct {
LegacyPrefix string LegacyPrefix string
} }
// Convert unversioned.APIVersions to unversioned.APIGroup. APIVersions is used by legacy v1, so // Convert metav1.APIVersions to metav1.APIGroup. APIVersions is used by legacy v1, so
// group would be "". // group would be "".
func apiVersionsToAPIGroup(apiVersions *unversioned.APIVersions) (apiGroup unversioned.APIGroup) { func apiVersionsToAPIGroup(apiVersions *metav1.APIVersions) (apiGroup metav1.APIGroup) {
groupVersions := []unversioned.GroupVersionForDiscovery{} groupVersions := []metav1.GroupVersionForDiscovery{}
for _, version := range apiVersions.Versions { for _, version := range apiVersions.Versions {
groupVersion := unversioned.GroupVersionForDiscovery{ groupVersion := metav1.GroupVersionForDiscovery{
GroupVersion: version, GroupVersion: version,
Version: version, Version: version,
} }
@ -115,11 +115,11 @@ func apiVersionsToAPIGroup(apiVersions *unversioned.APIVersions) (apiGroup unver
// ServerGroups returns the supported groups, with information like supported versions and the // ServerGroups returns the supported groups, with information like supported versions and the
// preferred version. // preferred version.
func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList, err error) { func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err error) {
// Get the groupVersions exposed at /api // Get the groupVersions exposed at /api
v := &unversioned.APIVersions{} v := &metav1.APIVersions{}
err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do().Into(v) err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do().Into(v)
apiGroup := unversioned.APIGroup{} apiGroup := metav1.APIGroup{}
if err == nil { if err == nil {
apiGroup = apiVersionsToAPIGroup(v) apiGroup = apiVersionsToAPIGroup(v)
} }
@ -128,14 +128,14 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList
} }
// Get the groupVersions exposed at /apis // Get the groupVersions exposed at /apis
apiGroupList = &unversioned.APIGroupList{} apiGroupList = &metav1.APIGroupList{}
err = d.restClient.Get().AbsPath("/apis").Do().Into(apiGroupList) err = d.restClient.Get().AbsPath("/apis").Do().Into(apiGroupList)
if err != nil && !errors.IsNotFound(err) && !errors.IsForbidden(err) { if err != nil && !errors.IsNotFound(err) && !errors.IsForbidden(err) {
return nil, err return nil, err
} }
// to be compatible with a v1.0 server, if it's a 403 or 404, ignore and return whatever we got from /api // to be compatible with a v1.0 server, if it's a 403 or 404, ignore and return whatever we got from /api
if err != nil && (errors.IsNotFound(err) || errors.IsForbidden(err)) { if err != nil && (errors.IsNotFound(err) || errors.IsForbidden(err)) {
apiGroupList = &unversioned.APIGroupList{} apiGroupList = &metav1.APIGroupList{}
} }
// append the group retrieved from /api to the list // append the group retrieved from /api to the list
@ -144,7 +144,7 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList
} }
// ServerResourcesForGroupVersion returns the supported resources for a group and version. // ServerResourcesForGroupVersion returns the supported resources for a group and version.
func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (resources *unversioned.APIResourceList, err error) { func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (resources *metav1.APIResourceList, err error) {
url := url.URL{} url := url.URL{}
if len(groupVersion) == 0 { if len(groupVersion) == 0 {
return nil, fmt.Errorf("groupVersion shouldn't be empty") return nil, fmt.Errorf("groupVersion shouldn't be empty")
@ -154,7 +154,7 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r
} else { } else {
url.Path = "/apis/" + groupVersion url.Path = "/apis/" + groupVersion
} }
resources = &unversioned.APIResourceList{} resources = &metav1.APIResourceList{}
err = d.restClient.Get().AbsPath(url.String()).Do().Into(resources) err = d.restClient.Get().AbsPath(url.String()).Do().Into(resources)
if err != nil { if err != nil {
// ignore 403 or 404 error to be compatible with an v1.0 server. // ignore 403 or 404 error to be compatible with an v1.0 server.
@ -167,13 +167,13 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r
} }
// ServerResources returns the supported resources for all groups and versions. // ServerResources returns the supported resources for all groups and versions.
func (d *DiscoveryClient) ServerResources() (map[string]*unversioned.APIResourceList, error) { func (d *DiscoveryClient) ServerResources() (map[string]*metav1.APIResourceList, error) {
apiGroups, err := d.ServerGroups() apiGroups, err := d.ServerGroups()
if err != nil { if err != nil {
return nil, err return nil, err
} }
groupVersions := unversioned.ExtractGroupVersions(apiGroups) groupVersions := metav1.ExtractGroupVersions(apiGroups)
result := map[string]*unversioned.APIResourceList{} result := map[string]*metav1.APIResourceList{}
for _, groupVersion := range groupVersions { for _, groupVersion := range groupVersions {
resources, err := d.ServerResourcesForGroupVersion(groupVersion) resources, err := d.ServerResourcesForGroupVersion(groupVersion)
if err != nil { if err != nil {
@ -305,7 +305,7 @@ func (d *DiscoveryClient) SwaggerSchema(version schema.GroupVersion) (*swagger.A
if err != nil { if err != nil {
return nil, err return nil, err
} }
groupVersions := unversioned.ExtractGroupVersions(groupList) groupVersions := metav1.ExtractGroupVersions(groupList)
// This check also takes care the case that kubectl is newer than the running endpoint // This check also takes care the case that kubectl is newer than the running endpoint
if stringDoesntExistIn(version.String(), groupVersions) { if stringDoesntExistIn(version.String(), groupVersions) {
return nil, fmt.Errorf("API version: %v is not supported by the server. Use one of: %v", version, groupVersions) return nil, fmt.Errorf("API version: %v is not supported by the server. Use one of: %v", version, groupVersions)

104
discovery/discovery_client_test.go
View File

@ -25,8 +25,8 @@ import (
"github.com/emicklei/go-restful/swagger" "github.com/emicklei/go-restful/swagger"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/version" "k8s.io/client-go/pkg/version"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
@ -65,7 +65,7 @@ func TestGetServerGroupsWithV1Server(t *testing.T) {
var obj interface{} var obj interface{}
switch req.URL.Path { switch req.URL.Path {
case "/api": case "/api":
obj = &unversioned.APIVersions{ obj = &metav1.APIVersions{
Versions: []string{ Versions: []string{
"v1", "v1",
}, },
@ -90,7 +90,7 @@ func TestGetServerGroupsWithV1Server(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
groupVersions := unversioned.ExtractGroupVersions(apiGroupList) groupVersions := metav1.ExtractGroupVersions(apiGroupList)
if !reflect.DeepEqual(groupVersions, []string{"v1"}) { if !reflect.DeepEqual(groupVersions, []string{"v1"}) {
t.Errorf("expected: %q, got: %q", []string{"v1"}, groupVersions) t.Errorf("expected: %q, got: %q", []string{"v1"}, groupVersions)
} }
@ -108,7 +108,7 @@ func TestGetServerGroupsWithBrokenServer(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
groupVersions := unversioned.ExtractGroupVersions(apiGroupList) groupVersions := metav1.ExtractGroupVersions(apiGroupList)
if len(groupVersions) != 0 { if len(groupVersions) != 0 {
t.Errorf("expected empty list, got: %q", groupVersions) t.Errorf("expected empty list, got: %q", groupVersions)
} }
@ -120,7 +120,7 @@ func TestGetServerResourcesWithV1Server(t *testing.T) {
var obj interface{} var obj interface{}
switch req.URL.Path { switch req.URL.Path {
case "/api": case "/api":
obj = &unversioned.APIVersions{ obj = &metav1.APIVersions{
Versions: []string{ Versions: []string{
"v1", "v1",
}, },
@ -152,24 +152,24 @@ func TestGetServerResourcesWithV1Server(t *testing.T) {
} }
func TestGetServerResources(t *testing.T) { func TestGetServerResources(t *testing.T) {
stable := unversioned.APIResourceList{ stable := metav1.APIResourceList{
GroupVersion: "v1", GroupVersion: "v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "pods", Namespaced: true, Kind: "Pod"},
{Name: "services", Namespaced: true, Kind: "Service"}, {Name: "services", Namespaced: true, Kind: "Service"},
{Name: "namespaces", Namespaced: false, Kind: "Namespace"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"},
}, },
} }
beta := unversioned.APIResourceList{ beta := metav1.APIResourceList{
GroupVersion: "extensions/v1", GroupVersion: "extensions/v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "deployments", Namespaced: true, Kind: "Deployment"}, {Name: "deployments", Namespaced: true, Kind: "Deployment"},
{Name: "ingresses", Namespaced: true, Kind: "Ingress"}, {Name: "ingresses", Namespaced: true, Kind: "Ingress"},
{Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "jobs", Namespaced: true, Kind: "Job"},
}, },
} }
tests := []struct { tests := []struct {
resourcesList *unversioned.APIResourceList resourcesList *metav1.APIResourceList
path string path string
request string request string
expectErr bool expectErr bool
@ -201,16 +201,16 @@ func TestGetServerResources(t *testing.T) {
case "/apis/extensions/v1beta1": case "/apis/extensions/v1beta1":
list = &beta list = &beta
case "/api": case "/api":
list = &unversioned.APIVersions{ list = &metav1.APIVersions{
Versions: []string{ Versions: []string{
"v1", "v1",
}, },
} }
case "/apis": case "/apis":
list = &unversioned.APIGroupList{ list = &metav1.APIGroupList{
Groups: []unversioned.APIGroup{ Groups: []metav1.APIGroup{
{ {
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "extensions/v1beta1"}, {GroupVersion: "extensions/v1beta1"},
}, },
}, },
@ -267,7 +267,7 @@ func swaggerSchemaFakeServer() (*httptest.Server, error) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
var resp interface{} var resp interface{}
if request == 1 { if request == 1 {
resp = unversioned.APIVersions{Versions: []string{"v1", "v2", "v3"}} resp = metav1.APIVersions{Versions: []string{"v1", "v2", "v3"}}
request++ request++
} else { } else {
resp = swagger.ApiDeclaration{} resp = swagger.ApiDeclaration{}
@ -323,16 +323,16 @@ func TestGetSwaggerSchemaFail(t *testing.T) {
} }
func TestServerPreferredResources(t *testing.T) { func TestServerPreferredResources(t *testing.T) {
stable := unversioned.APIResourceList{ stable := metav1.APIResourceList{
GroupVersion: "v1", GroupVersion: "v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "pods", Namespaced: true, Kind: "Pod"},
{Name: "services", Namespaced: true, Kind: "Service"}, {Name: "services", Namespaced: true, Kind: "Service"},
{Name: "namespaces", Namespaced: false, Kind: "Namespace"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"},
}, },
} }
tests := []struct { tests := []struct {
resourcesList *unversioned.APIResourceList resourcesList *metav1.APIResourceList
response func(w http.ResponseWriter, req *http.Request) response func(w http.ResponseWriter, req *http.Request)
expectErr func(err error) bool expectErr func(err error) bool
}{ }{
@ -348,16 +348,16 @@ func TestServerPreferredResources(t *testing.T) {
case "/api/v1": case "/api/v1":
list = &stable list = &stable
case "/api": case "/api":
list = &unversioned.APIVersions{ list = &metav1.APIVersions{
Versions: []string{ Versions: []string{
"v1", "v1",
}, },
} }
case "/apis": case "/apis":
list = &unversioned.APIGroupList{ list = &metav1.APIGroupList{
Groups: []unversioned.APIGroup{ Groups: []metav1.APIGroup{
{ {
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "extensions/v1beta1"}, {GroupVersion: "extensions/v1beta1"},
}, },
}, },
@ -390,16 +390,16 @@ func TestServerPreferredResources(t *testing.T) {
case "/api/v1": case "/api/v1":
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
case "/api": case "/api":
list = &unversioned.APIVersions{ list = &metav1.APIVersions{
Versions: []string{ Versions: []string{
"v1", "v1",
}, },
} }
case "/apis": case "/apis":
list = &unversioned.APIGroupList{ list = &metav1.APIGroupList{
Groups: []unversioned.APIGroup{ Groups: []metav1.APIGroup{
{ {
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "extensions/v1beta1"}, {GroupVersion: "extensions/v1beta1"},
}, },
}, },
@ -446,15 +446,15 @@ func TestServerPreferredResources(t *testing.T) {
} }
func TestServerPreferredResourcesRetries(t *testing.T) { func TestServerPreferredResourcesRetries(t *testing.T) {
stable := unversioned.APIResourceList{ stable := metav1.APIResourceList{
GroupVersion: "v1", GroupVersion: "v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "pods", Namespaced: true, Kind: "Pod"},
}, },
} }
beta := unversioned.APIResourceList{ beta := metav1.APIResourceList{
GroupVersion: "extensions/v1", GroupVersion: "extensions/v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "deployments", Namespaced: true, Kind: "Deployment"}, {Name: "deployments", Namespaced: true, Kind: "Deployment"},
}, },
} }
@ -474,20 +474,20 @@ func TestServerPreferredResourcesRetries(t *testing.T) {
case "/api/v1": case "/api/v1":
list = &stable list = &stable
case "/api": case "/api":
list = &unversioned.APIVersions{ list = &metav1.APIVersions{
Versions: []string{ Versions: []string{
"v1", "v1",
}, },
} }
case "/apis": case "/apis":
list = &unversioned.APIGroupList{ list = &metav1.APIGroupList{
Groups: []unversioned.APIGroup{ Groups: []metav1.APIGroup{
{ {
Name: "extensions", Name: "extensions",
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "extensions/v1beta1"}, {GroupVersion: "extensions/v1beta1"},
}, },
PreferredVersion: unversioned.GroupVersionForDiscovery{ PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "extensions/v1beta1", GroupVersion: "extensions/v1beta1",
Version: "v1beta1", Version: "v1beta1",
}, },
@ -545,30 +545,30 @@ func TestServerPreferredResourcesRetries(t *testing.T) {
} }
func TestServerPreferredNamespacedResources(t *testing.T) { func TestServerPreferredNamespacedResources(t *testing.T) {
stable := unversioned.APIResourceList{ stable := metav1.APIResourceList{
GroupVersion: "v1", GroupVersion: "v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "pods", Namespaced: true, Kind: "Pod"},
{Name: "services", Namespaced: true, Kind: "Service"}, {Name: "services", Namespaced: true, Kind: "Service"},
{Name: "namespaces", Namespaced: false, Kind: "Namespace"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"},
}, },
} }
batchv1 := unversioned.APIResourceList{ batchv1 := metav1.APIResourceList{
GroupVersion: "batch/v1", GroupVersion: "batch/v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "jobs", Namespaced: true, Kind: "Job"},
}, },
} }
batchv2alpha1 := unversioned.APIResourceList{ batchv2alpha1 := metav1.APIResourceList{
GroupVersion: "batch/v2alpha1", GroupVersion: "batch/v2alpha1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "jobs", Namespaced: true, Kind: "Job"},
{Name: "cronjobs", Namespaced: true, Kind: "CronJob"}, {Name: "cronjobs", Namespaced: true, Kind: "CronJob"},
}, },
} }
batchv3alpha1 := unversioned.APIResourceList{ batchv3alpha1 := metav1.APIResourceList{
GroupVersion: "batch/v3alpha1", GroupVersion: "batch/v3alpha1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "jobs", Namespaced: true, Kind: "Job"},
{Name: "cronjobs", Namespaced: true, Kind: "CronJob"}, {Name: "cronjobs", Namespaced: true, Kind: "CronJob"},
}, },
@ -584,7 +584,7 @@ func TestServerPreferredNamespacedResources(t *testing.T) {
case "/api/v1": case "/api/v1":
list = &stable list = &stable
case "/api": case "/api":
list = &unversioned.APIVersions{ list = &metav1.APIVersions{
Versions: []string{ Versions: []string{
"v1", "v1",
}, },
@ -613,16 +613,16 @@ func TestServerPreferredNamespacedResources(t *testing.T) {
var list interface{} var list interface{}
switch req.URL.Path { switch req.URL.Path {
case "/apis": case "/apis":
list = &unversioned.APIGroupList{ list = &metav1.APIGroupList{
Groups: []unversioned.APIGroup{ Groups: []metav1.APIGroup{
{ {
Name: "batch", Name: "batch",
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "batch/v1", Version: "v1"}, {GroupVersion: "batch/v1", Version: "v1"},
{GroupVersion: "batch/v2alpha1", Version: "v2alpha1"}, {GroupVersion: "batch/v2alpha1", Version: "v2alpha1"},
{GroupVersion: "batch/v3alpha1", Version: "v3alpha1"}, {GroupVersion: "batch/v3alpha1", Version: "v3alpha1"},
}, },
PreferredVersion: unversioned.GroupVersionForDiscovery{GroupVersion: "batch/v1", Version: "v1"}, PreferredVersion: metav1.GroupVersionForDiscovery{GroupVersion: "batch/v1", Version: "v1"},
}, },
}, },
} }
@ -656,16 +656,16 @@ func TestServerPreferredNamespacedResources(t *testing.T) {
var list interface{} var list interface{}
switch req.URL.Path { switch req.URL.Path {
case "/apis": case "/apis":
list = &unversioned.APIGroupList{ list = &metav1.APIGroupList{
Groups: []unversioned.APIGroup{ Groups: []metav1.APIGroup{
{ {
Name: "batch", Name: "batch",
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "batch/v1", Version: "v1"}, {GroupVersion: "batch/v1", Version: "v1"},
{GroupVersion: "batch/v2alpha1", Version: "v2alpha1"}, {GroupVersion: "batch/v2alpha1", Version: "v2alpha1"},
{GroupVersion: "batch/v3alpha1", Version: "v3alpha1"}, {GroupVersion: "batch/v3alpha1", Version: "v3alpha1"},
}, },
PreferredVersion: unversioned.GroupVersionForDiscovery{GroupVersion: "batch/v2alpha", Version: "v2alpha1"}, PreferredVersion: metav1.GroupVersionForDiscovery{GroupVersion: "batch/v2alpha", Version: "v2alpha1"},
}, },
}, },
} }

8
discovery/fake/discovery.go
View File

@ -18,8 +18,8 @@ package fake
import ( import (
"github.com/emicklei/go-restful/swagger" "github.com/emicklei/go-restful/swagger"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/version" "k8s.io/client-go/pkg/version"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
@ -30,7 +30,7 @@ type FakeDiscovery struct {
*testing.Fake *testing.Fake
} }
func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
action := testing.ActionImpl{ action := testing.ActionImpl{
Verb: "get", Verb: "get",
Resource: schema.GroupVersionResource{Resource: "resource"}, Resource: schema.GroupVersionResource{Resource: "resource"},
@ -39,7 +39,7 @@ func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*un
return c.Resources[groupVersion], nil return c.Resources[groupVersion], nil
} }
func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceList, error) { func (c *FakeDiscovery) ServerResources() (map[string]*metav1.APIResourceList, error) {
action := testing.ActionImpl{ action := testing.ActionImpl{
Verb: "get", Verb: "get",
Resource: schema.GroupVersionResource{Resource: "resource"}, Resource: schema.GroupVersionResource{Resource: "resource"},
@ -56,7 +56,7 @@ func (c *FakeDiscovery) ServerPreferredNamespacedResources() ([]schema.GroupVers
return nil, nil return nil, nil
} }
func (c *FakeDiscovery) ServerGroups() (*unversioned.APIGroupList, error) { func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) {
return nil, nil return nil, nil
} }

4
discovery/helper.go
View File

@ -19,7 +19,7 @@ package discovery
import ( import (
"fmt" "fmt"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/util/sets" "k8s.io/client-go/pkg/util/sets"
"k8s.io/client-go/pkg/version" "k8s.io/client-go/pkg/version"
@ -61,7 +61,7 @@ func NegotiateVersion(client DiscoveryInterface, requiredGV *schema.GroupVersion
// not a negotiation specific error. // not a negotiation specific error.
return nil, err return nil, err
} }
versions := unversioned.ExtractGroupVersions(groups) versions := metav1.ExtractGroupVersions(groups)
serverVersions := sets.String{} serverVersions := sets.String{}
for _, v := range versions { for _, v := range versions {
serverVersions.Insert(v) serverVersions.Insert(v)

2
discovery/helper_blackbox_test.go
View File

@ -29,8 +29,8 @@ import (
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/testapi" "k8s.io/client-go/pkg/api/testapi"
uapi "k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/apimachinery/registered" "k8s.io/client-go/pkg/apimachinery/registered"
uapi "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"

8
discovery/restmapper.go
View File

@ -22,7 +22,7 @@ import (
"k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/errors"
"k8s.io/client-go/pkg/api/meta" "k8s.io/client-go/pkg/api/meta"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"github.com/golang/glog" "github.com/golang/glog"
@ -31,10 +31,10 @@ import (
// APIGroupResources is an API group with a mapping of versions to // APIGroupResources is an API group with a mapping of versions to
// resources. // resources.
type APIGroupResources struct { type APIGroupResources struct {
Group unversioned.APIGroup Group metav1.APIGroup
// A mapping of version string to a slice of APIResources for // A mapping of version string to a slice of APIResources for
// that version. // that version.
VersionedResources map[string][]unversioned.APIResource VersionedResources map[string][]metav1.APIResource
} }
// NewRESTMapper returns a PriorityRESTMapper based on the discovered // NewRESTMapper returns a PriorityRESTMapper based on the discovered
@ -121,7 +121,7 @@ func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) {
for _, group := range apiGroups.Groups { for _, group := range apiGroups.Groups {
groupResources := &APIGroupResources{ groupResources := &APIGroupResources{
Group: group, Group: group,
VersionedResources: make(map[string][]unversioned.APIResource), VersionedResources: make(map[string][]metav1.APIResource),
} }
for _, version := range group.Versions { for _, version := range group.Versions {
resources, err := cl.ServerResourcesForGroupVersion(version.GroupVersion) resources, err := cl.ServerResourcesForGroupVersion(version.GroupVersion)

42
discovery/restmapper_test.go
View File

@ -21,8 +21,8 @@ import (
"testing" "testing"
"k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/errors"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/apimachinery/registered" "k8s.io/client-go/pkg/apimachinery/registered"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/version" "k8s.io/client-go/pkg/version"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
@ -35,14 +35,14 @@ import (
func TestRESTMapper(t *testing.T) { func TestRESTMapper(t *testing.T) {
resources := []*APIGroupResources{ resources := []*APIGroupResources{
{ {
Group: unversioned.APIGroup{ Group: metav1.APIGroup{
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{Version: "v1"}, {Version: "v1"},
{Version: "v2"}, {Version: "v2"},
}, },
PreferredVersion: unversioned.GroupVersionForDiscovery{Version: "v1"}, PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1"},
}, },
VersionedResources: map[string][]unversioned.APIResource{ VersionedResources: map[string][]metav1.APIResource{
"v1": { "v1": {
{Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "pods", Namespaced: true, Kind: "Pod"},
}, },
@ -52,14 +52,14 @@ func TestRESTMapper(t *testing.T) {
}, },
}, },
{ {
Group: unversioned.APIGroup{ Group: metav1.APIGroup{
Name: "extensions", Name: "extensions",
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{Version: "v1beta"}, {Version: "v1beta"},
}, },
PreferredVersion: unversioned.GroupVersionForDiscovery{Version: "v1beta"}, PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1beta"},
}, },
VersionedResources: map[string][]unversioned.APIResource{ VersionedResources: map[string][]metav1.APIResource{
"v1beta": { "v1beta": {
{Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "jobs", Namespaced: true, Kind: "Job"},
}, },
@ -250,19 +250,19 @@ func (c *fakeCachedDiscoveryInterface) RESTClient() rest.Interface {
return &fake.RESTClient{} return &fake.RESTClient{}
} }
func (c *fakeCachedDiscoveryInterface) ServerGroups() (*unversioned.APIGroupList, error) { func (c *fakeCachedDiscoveryInterface) ServerGroups() (*metav1.APIGroupList, error) {
if c.enabledA { if c.enabledA {
return &unversioned.APIGroupList{ return &metav1.APIGroupList{
Groups: []unversioned.APIGroup{ Groups: []metav1.APIGroup{
{ {
Name: "a", Name: "a",
Versions: []unversioned.GroupVersionForDiscovery{ Versions: []metav1.GroupVersionForDiscovery{
{ {
GroupVersion: "a/v1", GroupVersion: "a/v1",
Version: "v1", Version: "v1",
}, },
}, },
PreferredVersion: unversioned.GroupVersionForDiscovery{ PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "a/v1", GroupVersion: "a/v1",
Version: "v1", Version: "v1",
}, },
@ -270,14 +270,14 @@ func (c *fakeCachedDiscoveryInterface) ServerGroups() (*unversioned.APIGroupList
}, },
}, nil }, nil
} }
return &unversioned.APIGroupList{}, nil return &metav1.APIGroupList{}, nil
} }
func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
if c.enabledA && groupVersion == "a/v1" { if c.enabledA && groupVersion == "a/v1" {
return &unversioned.APIResourceList{ return &metav1.APIResourceList{
GroupVersion: "a/v1", GroupVersion: "a/v1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{ {
Name: "foo", Name: "foo",
Kind: "Foo", Kind: "Foo",
@ -290,14 +290,14 @@ func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersi
return nil, errors.NewNotFound(schema.GroupResource{}, "") return nil, errors.NewNotFound(schema.GroupResource{}, "")
} }
func (c *fakeCachedDiscoveryInterface) ServerResources() (map[string]*unversioned.APIResourceList, error) { func (c *fakeCachedDiscoveryInterface) ServerResources() (map[string]*metav1.APIResourceList, error) {
if c.enabledA { if c.enabledA {
av1, _ := c.ServerResourcesForGroupVersion("a/v1") av1, _ := c.ServerResourcesForGroupVersion("a/v1")
return map[string]*unversioned.APIResourceList{ return map[string]*metav1.APIResourceList{
"a/v1": av1, "a/v1": av1,
}, nil }, nil
} }
return map[string]*unversioned.APIResourceList{}, nil return map[string]*metav1.APIResourceList{}, nil
} }
func (c *fakeCachedDiscoveryInterface) ServerPreferredResources() ([]schema.GroupVersionResource, error) { func (c *fakeCachedDiscoveryInterface) ServerPreferredResources() ([]schema.GroupVersionResource, error) {

10
dynamic/client.go
View File

@ -27,8 +27,8 @@ import (
"strings" "strings"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/conversion/queryparams" "k8s.io/client-go/pkg/conversion/queryparams"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
@ -83,7 +83,7 @@ func (c *Client) GetRateLimiter() flowcontrol.RateLimiter {
// Resource returns an API interface to the specified resource for this client's // Resource returns an API interface to the specified resource for this client's
// group and version. If resource is not a namespaced resource, then namespace // group and version. If resource is not a namespaced resource, then namespace
// is ignored. The ResourceClient inherits the parameter codec of c. // is ignored. The ResourceClient inherits the parameter codec of c.
func (c *Client) Resource(resource *unversioned.APIResource, namespace string) *ResourceClient { func (c *Client) Resource(resource *metav1.APIResource, namespace string) *ResourceClient {
return &ResourceClient{ return &ResourceClient{
cl: c.cl, cl: c.cl,
resource: resource, resource: resource,
@ -104,7 +104,7 @@ func (c *Client) ParameterCodec(parameterCodec runtime.ParameterCodec) *Client {
// dynamic client. // dynamic client.
type ResourceClient struct { type ResourceClient struct {
cl *rest.RESTClient cl *rest.RESTClient
resource *unversioned.APIResource resource *metav1.APIResource
ns string ns string
parameterCodec runtime.ParameterCodec parameterCodec runtime.ParameterCodec
} }
@ -225,8 +225,8 @@ func (dynamicCodec) Decode(data []byte, gvk *schema.GroupVersionKind, obj runtim
return nil, nil, err return nil, nil, err
} }
if _, ok := obj.(*unversioned.Status); !ok && strings.ToLower(gvk.Kind) == "status" { if _, ok := obj.(*metav1.Status); !ok && strings.ToLower(gvk.Kind) == "status" {
obj = &unversioned.Status{} obj = &metav1.Status{}
err := json.Unmarshal(data, obj) err := json.Unmarshal(data, obj)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err

30
dynamic/client_test.go
View File

@ -26,8 +26,8 @@ import (
"testing" "testing"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/runtime/serializer/streaming" "k8s.io/client-go/pkg/runtime/serializer/streaming"
@ -117,7 +117,7 @@ func TestList(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" { if r.Method != "GET" {
t.Errorf("List(%q) got HTTP method %s. wanted GET", tc.name, r.Method) t.Errorf("List(%q) got HTTP method %s. wanted GET", tc.name, r.Method)
@ -172,7 +172,7 @@ func TestGet(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" { if r.Method != "GET" {
t.Errorf("Get(%q) got HTTP method %s. wanted GET", tc.name, r.Method) t.Errorf("Get(%q) got HTTP method %s. wanted GET", tc.name, r.Method)
@ -204,9 +204,9 @@ func TestGet(t *testing.T) {
} }
func TestDelete(t *testing.T) { func TestDelete(t *testing.T) {
statusOK := &unversioned.Status{ statusOK := &metav1.Status{
TypeMeta: unversioned.TypeMeta{Kind: "Status"}, TypeMeta: metav1.TypeMeta{Kind: "Status"},
Status: unversioned.StatusSuccess, Status: metav1.StatusSuccess,
} }
tcs := []struct { tcs := []struct {
namespace string namespace string
@ -225,7 +225,7 @@ func TestDelete(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "DELETE" { if r.Method != "DELETE" {
t.Errorf("Delete(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method) t.Errorf("Delete(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method)
@ -253,9 +253,9 @@ func TestDelete(t *testing.T) {
} }
func TestDeleteCollection(t *testing.T) { func TestDeleteCollection(t *testing.T) {
statusOK := &unversioned.Status{ statusOK := &metav1.Status{
TypeMeta: unversioned.TypeMeta{Kind: "Status"}, TypeMeta: metav1.TypeMeta{Kind: "Status"},
Status: unversioned.StatusSuccess, Status: metav1.StatusSuccess,
} }
tcs := []struct { tcs := []struct {
namespace string namespace string
@ -274,7 +274,7 @@ func TestDeleteCollection(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "DELETE" { if r.Method != "DELETE" {
t.Errorf("DeleteCollection(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method) t.Errorf("DeleteCollection(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method)
@ -322,7 +322,7 @@ func TestCreate(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "POST" { if r.Method != "POST" {
t.Errorf("Create(%q) got HTTP method %s. wanted POST", tc.name, r.Method) t.Errorf("Create(%q) got HTTP method %s. wanted POST", tc.name, r.Method)
@ -381,7 +381,7 @@ func TestUpdate(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "PUT" { if r.Method != "PUT" {
t.Errorf("Update(%q) got HTTP method %s. wanted PUT", tc.name, r.Method) t.Errorf("Update(%q) got HTTP method %s. wanted PUT", tc.name, r.Method)
@ -448,7 +448,7 @@ func TestWatch(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" { if r.Method != "GET" {
t.Errorf("Watch(%q) got HTTP method %s. wanted GET", tc.name, r.Method) t.Errorf("Watch(%q) got HTTP method %s. wanted GET", tc.name, r.Method)
@ -508,7 +508,7 @@ func TestPatch(t *testing.T) {
} }
for _, tc := range tcs { for _, tc := range tcs {
gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
if r.Method != "PATCH" { if r.Method != "PATCH" {
t.Errorf("Patch(%q) got HTTP method %s. wanted PATCH", tc.name, r.Method) t.Errorf("Patch(%q) got HTTP method %s. wanted PATCH", tc.name, r.Method)

6
dynamic/dynamic_util.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"k8s.io/client-go/pkg/api/meta" "k8s.io/client-go/pkg/api/meta"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
) )
@ -35,7 +35,7 @@ func VersionInterfaces(schema.GroupVersion) (*meta.VersionInterfaces, error) {
} }
// NewDiscoveryRESTMapper returns a RESTMapper based on discovery information. // NewDiscoveryRESTMapper returns a RESTMapper based on discovery information.
func NewDiscoveryRESTMapper(resources []*unversioned.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) { func NewDiscoveryRESTMapper(resources []*metav1.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) {
rm := meta.NewDefaultRESTMapper(nil, versionFunc) rm := meta.NewDefaultRESTMapper(nil, versionFunc)
for _, resourceList := range resources { for _, resourceList := range resources {
gv, err := schema.ParseGroupVersion(resourceList.GroupVersion) gv, err := schema.ParseGroupVersion(resourceList.GroupVersion)
@ -62,7 +62,7 @@ type ObjectTyper struct {
} }
// NewObjectTyper constructs an ObjectTyper from discovery information. // NewObjectTyper constructs an ObjectTyper from discovery information.
func NewObjectTyper(resources []*unversioned.APIResourceList) (runtime.ObjectTyper, error) { func NewObjectTyper(resources []*metav1.APIResourceList) (runtime.ObjectTyper, error) {
ot := &ObjectTyper{registered: make(map[schema.GroupVersionKind]bool)} ot := &ObjectTyper{registered: make(map[schema.GroupVersionKind]bool)}
for _, resourceList := range resources { for _, resourceList := range resources {
gv, err := schema.ParseGroupVersion(resourceList.GroupVersion) gv, err := schema.ParseGroupVersion(resourceList.GroupVersion)

6
dynamic/dynamic_util_test.go
View File

@ -19,15 +19,15 @@ package dynamic
import ( import (
"testing" "testing"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
) )
func TestDiscoveryRESTMapper(t *testing.T) { func TestDiscoveryRESTMapper(t *testing.T) {
resources := []*unversioned.APIResourceList{ resources := []*metav1.APIResourceList{
{ {
GroupVersion: "test/beta1", GroupVersion: "test/beta1",
APIResources: []unversioned.APIResource{ APIResources: []metav1.APIResource{
{ {
Name: "test_kinds", Name: "test_kinds",
Namespaced: true, Namespaced: true,

52
pkg/api/OWNERS
View File

@ -1,6 +1,46 @@
assignees: approvers:
- bgrant0607 - bgrant0607
- erictune - erictune
- lavalamp - lavalamp
- smarterclayton - smarterclayton
- thockin - thockin
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- bgrant0607
- deads2k
- yujuhong
- brendandburns
- derekwaynecarr
- caesarxuchao
- vishh
- mikedanese
- liggitt
- nikhiljindal
- bprashanth
- gmarek
- erictune
- davidopp
- pmorie
- sttts
- kargakis
- dchen1107
- saad-ali
- zmerlynn
- luxas
- janetkuo
- justinsb
- pwittrock
- roberthbailey
- ncdc
- timstclair
- yifan-gu
- eparis
- mwielgus
- timothysc
- soltysh
- piosz
- jsafrane
- jbeda

20
pkg/api/conversion.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"k8s.io/client-go/pkg/api/resource" "k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/conversion"
"k8s.io/client-go/pkg/fields" "k8s.io/client-go/pkg/fields"
"k8s.io/client-go/pkg/labels" "k8s.io/client-go/pkg/labels"
@ -32,7 +32,7 @@ import (
func addConversionFuncs(scheme *runtime.Scheme) error { func addConversionFuncs(scheme *runtime.Scheme) error {
return scheme.AddConversionFuncs( return scheme.AddConversionFuncs(
Convert_unversioned_TypeMeta_To_unversioned_TypeMeta, Convert_v1_TypeMeta_To_v1_TypeMeta,
Convert_unversioned_ListMeta_To_unversioned_ListMeta, Convert_unversioned_ListMeta_To_unversioned_ListMeta,
@ -154,7 +154,7 @@ func Convert_bool_To_Pointer_bool(in *bool, out **bool, s conversion.Scope) erro
} }
// +k8s:conversion-fn=drop // +k8s:conversion-fn=drop
func Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(in, out *unversioned.TypeMeta, s conversion.Scope) error { func Convert_v1_TypeMeta_To_v1_TypeMeta(in, out *metav1.TypeMeta, s conversion.Scope) error {
// These values are explicitly not copied // These values are explicitly not copied
//out.APIVersion = in.APIVersion //out.APIVersion = in.APIVersion
//out.Kind = in.Kind //out.Kind = in.Kind
@ -162,7 +162,7 @@ func Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(in, out *unversioned.T
} }
// +k8s:conversion-fn=copy-only // +k8s:conversion-fn=copy-only
func Convert_unversioned_ListMeta_To_unversioned_ListMeta(in, out *unversioned.ListMeta, s conversion.Scope) error { func Convert_unversioned_ListMeta_To_unversioned_ListMeta(in, out *metav1.ListMeta, s conversion.Scope) error {
*out = *in *out = *in
return nil return nil
} }
@ -174,14 +174,14 @@ func Convert_intstr_IntOrString_To_intstr_IntOrString(in, out *intstr.IntOrStrin
} }
// +k8s:conversion-fn=copy-only // +k8s:conversion-fn=copy-only
func Convert_unversioned_Time_To_unversioned_Time(in *unversioned.Time, out *unversioned.Time, s conversion.Scope) error { func Convert_unversioned_Time_To_unversioned_Time(in *metav1.Time, out *metav1.Time, s conversion.Scope) error {
// Cannot deep copy these, because time.Time has unexported fields. // Cannot deep copy these, because time.Time has unexported fields.
*out = *in *out = *in
return nil return nil
} }
// Convert_Slice_string_To_unversioned_Time allows converting a URL query parameter value // Convert_Slice_string_To_unversioned_Time allows converting a URL query parameter value
func Convert_Slice_string_To_unversioned_Time(input *[]string, out *unversioned.Time, s conversion.Scope) error { func Convert_Slice_string_To_unversioned_Time(input *[]string, out *metav1.Time, s conversion.Scope) error {
str := "" str := ""
if len(*input) > 0 { if len(*input) > 0 {
str = (*input)[0] str = (*input)[0]
@ -229,20 +229,20 @@ func Convert_resource_Quantity_To_resource_Quantity(in *resource.Quantity, out *
return nil return nil
} }
func Convert_map_to_unversioned_LabelSelector(in *map[string]string, out *unversioned.LabelSelector, s conversion.Scope) error { func Convert_map_to_unversioned_LabelSelector(in *map[string]string, out *metav1.LabelSelector, s conversion.Scope) error {
if in == nil { if in == nil {
return nil return nil
} }
out = new(unversioned.LabelSelector) out = new(metav1.LabelSelector)
for labelKey, labelValue := range *in { for labelKey, labelValue := range *in {
utillabels.AddLabelToSelector(out, labelKey, labelValue) utillabels.AddLabelToSelector(out, labelKey, labelValue)
} }
return nil return nil
} }
func Convert_unversioned_LabelSelector_to_map(in *unversioned.LabelSelector, out *map[string]string, s conversion.Scope) error { func Convert_unversioned_LabelSelector_to_map(in *metav1.LabelSelector, out *map[string]string, s conversion.Scope) error {
var err error var err error
*out, err = unversioned.LabelSelectorAsMap(in) *out, err = metav1.LabelSelectorAsMap(in)
if err != nil { if err != nil {
err = field.Invalid(field.NewPath("labelSelector"), *in, fmt.Sprintf("cannot convert to old selector: %v", err)) err = field.Invalid(field.NewPath("labelSelector"), *in, fmt.Sprintf("cannot convert to old selector: %v", err))
} }

28
pkg/api/errors/OWNERS Executable file
View File

@ -0,0 +1,28 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- bgrant0607
- deads2k
- brendandburns
- derekwaynecarr
- caesarxuchao
- mikedanese
- liggitt
- nikhiljindal
- gmarek
- erictune
- saad-ali
- janetkuo
- timstclair
- eparis
- timothysc
- dims
- spxtr
- hongchaodeng
- krousey
- satnam6502
- cjcullen
- david-mcmahon
- goltermann

180
pkg/api/errors/errors.go
View File

@ -22,7 +22,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/util/validation/field" "k8s.io/client-go/pkg/util/validation/field"
@ -41,13 +41,13 @@ const (
// StatusError is an error intended for consumption by a REST API server; it can also be // StatusError is an error intended for consumption by a REST API server; it can also be
// reconstructed by clients from a REST response. Public to allow easy type switches. // reconstructed by clients from a REST response. Public to allow easy type switches.
type StatusError struct { type StatusError struct {
ErrStatus unversioned.Status ErrStatus metav1.Status
} }
// APIStatus is exposed by errors that can be converted to an api.Status object // APIStatus is exposed by errors that can be converted to an api.Status object
// for finer grained details. // for finer grained details.
type APIStatus interface { type APIStatus interface {
Status() unversioned.Status Status() metav1.Status
} }
var _ error = &StatusError{} var _ error = &StatusError{}
@ -59,7 +59,7 @@ func (e *StatusError) Error() string {
// Status allows access to e's status without having to know the detailed workings // Status allows access to e's status without having to know the detailed workings
// of StatusError. Used by pkg/apiserver. // of StatusError. Used by pkg/apiserver.
func (e *StatusError) Status() unversioned.Status { func (e *StatusError) Status() metav1.Status {
return e.ErrStatus return e.ErrStatus
} }
@ -81,11 +81,11 @@ func (u *UnexpectedObjectError) Error() string {
return fmt.Sprintf("unexpected object: %v", u.Object) return fmt.Sprintf("unexpected object: %v", u.Object)
} }
// FromObject generates an StatusError from an unversioned.Status, if that is the type of obj; otherwise, // FromObject generates an StatusError from an metav1.Status, if that is the type of obj; otherwise,
// returns an UnexpecteObjectError. // returns an UnexpecteObjectError.
func FromObject(obj runtime.Object) error { func FromObject(obj runtime.Object) error {
switch t := obj.(type) { switch t := obj.(type) {
case *unversioned.Status: case *metav1.Status:
return &StatusError{*t} return &StatusError{*t}
} }
return &UnexpectedObjectError{obj} return &UnexpectedObjectError{obj}
@ -93,11 +93,11 @@ func FromObject(obj runtime.Object) error {
// NewNotFound returns a new error which indicates that the resource of the kind and the name was not found. // NewNotFound returns a new error which indicates that the resource of the kind and the name was not found.
func NewNotFound(qualifiedResource schema.GroupResource, name string) *StatusError { func NewNotFound(qualifiedResource schema.GroupResource, name string) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusNotFound, Code: http.StatusNotFound,
Reason: unversioned.StatusReasonNotFound, Reason: metav1.StatusReasonNotFound,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedResource.Group, Group: qualifiedResource.Group,
Kind: qualifiedResource.Resource, Kind: qualifiedResource.Resource,
Name: name, Name: name,
@ -108,11 +108,11 @@ func NewNotFound(qualifiedResource schema.GroupResource, name string) *StatusErr
// NewAlreadyExists returns an error indicating the item requested exists by that identifier. // NewAlreadyExists returns an error indicating the item requested exists by that identifier.
func NewAlreadyExists(qualifiedResource schema.GroupResource, name string) *StatusError { func NewAlreadyExists(qualifiedResource schema.GroupResource, name string) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusConflict, Code: http.StatusConflict,
Reason: unversioned.StatusReasonAlreadyExists, Reason: metav1.StatusReasonAlreadyExists,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedResource.Group, Group: qualifiedResource.Group,
Kind: qualifiedResource.Resource, Kind: qualifiedResource.Resource,
Name: name, Name: name,
@ -128,21 +128,21 @@ func NewUnauthorized(reason string) *StatusError {
if len(message) == 0 { if len(message) == 0 {
message = "not authorized" message = "not authorized"
} }
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusUnauthorized, Code: http.StatusUnauthorized,
Reason: unversioned.StatusReasonUnauthorized, Reason: metav1.StatusReasonUnauthorized,
Message: message, Message: message,
}} }}
} }
// NewForbidden returns an error indicating the requested action was forbidden // NewForbidden returns an error indicating the requested action was forbidden
func NewForbidden(qualifiedResource schema.GroupResource, name string, err error) *StatusError { func NewForbidden(qualifiedResource schema.GroupResource, name string, err error) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusForbidden, Code: http.StatusForbidden,
Reason: unversioned.StatusReasonForbidden, Reason: metav1.StatusReasonForbidden,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedResource.Group, Group: qualifiedResource.Group,
Kind: qualifiedResource.Resource, Kind: qualifiedResource.Resource,
Name: name, Name: name,
@ -153,11 +153,11 @@ func NewForbidden(qualifiedResource schema.GroupResource, name string, err error
// NewConflict returns an error indicating the item can't be updated as provided. // NewConflict returns an error indicating the item can't be updated as provided.
func NewConflict(qualifiedResource schema.GroupResource, name string, err error) *StatusError { func NewConflict(qualifiedResource schema.GroupResource, name string, err error) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusConflict, Code: http.StatusConflict,
Reason: unversioned.StatusReasonConflict, Reason: metav1.StatusReasonConflict,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedResource.Group, Group: qualifiedResource.Group,
Kind: qualifiedResource.Resource, Kind: qualifiedResource.Resource,
Name: name, Name: name,
@ -168,30 +168,30 @@ func NewConflict(qualifiedResource schema.GroupResource, name string, err error)
// NewGone returns an error indicating the item no longer available at the server and no forwarding address is known. // NewGone returns an error indicating the item no longer available at the server and no forwarding address is known.
func NewGone(message string) *StatusError { func NewGone(message string) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusGone, Code: http.StatusGone,
Reason: unversioned.StatusReasonGone, Reason: metav1.StatusReasonGone,
Message: message, Message: message,
}} }}
} }
// NewInvalid returns an error indicating the item is invalid and cannot be processed. // NewInvalid returns an error indicating the item is invalid and cannot be processed.
func NewInvalid(qualifiedKind schema.GroupKind, name string, errs field.ErrorList) *StatusError { func NewInvalid(qualifiedKind schema.GroupKind, name string, errs field.ErrorList) *StatusError {
causes := make([]unversioned.StatusCause, 0, len(errs)) causes := make([]metav1.StatusCause, 0, len(errs))
for i := range errs { for i := range errs {
err := errs[i] err := errs[i]
causes = append(causes, unversioned.StatusCause{ causes = append(causes, metav1.StatusCause{
Type: unversioned.CauseType(err.Type), Type: metav1.CauseType(err.Type),
Message: err.ErrorBody(), Message: err.ErrorBody(),
Field: err.Field, Field: err.Field,
}) })
} }
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: StatusUnprocessableEntity, // RFC 4918: StatusUnprocessableEntity Code: StatusUnprocessableEntity, // RFC 4918: StatusUnprocessableEntity
Reason: unversioned.StatusReasonInvalid, Reason: metav1.StatusReasonInvalid,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedKind.Group, Group: qualifiedKind.Group,
Kind: qualifiedKind.Kind, Kind: qualifiedKind.Kind,
Name: name, Name: name,
@ -203,31 +203,31 @@ func NewInvalid(qualifiedKind schema.GroupKind, name string, errs field.ErrorLis
// NewBadRequest creates an error that indicates that the request is invalid and can not be processed. // NewBadRequest creates an error that indicates that the request is invalid and can not be processed.
func NewBadRequest(reason string) *StatusError { func NewBadRequest(reason string) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
Reason: unversioned.StatusReasonBadRequest, Reason: metav1.StatusReasonBadRequest,
Message: reason, Message: reason,
}} }}
} }
// NewServiceUnavailable creates an error that indicates that the requested service is unavailable. // NewServiceUnavailable creates an error that indicates that the requested service is unavailable.
func NewServiceUnavailable(reason string) *StatusError { func NewServiceUnavailable(reason string) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusServiceUnavailable, Code: http.StatusServiceUnavailable,
Reason: unversioned.StatusReasonServiceUnavailable, Reason: metav1.StatusReasonServiceUnavailable,
Message: reason, Message: reason,
}} }}
} }
// NewMethodNotSupported returns an error indicating the requested action is not supported on this kind. // NewMethodNotSupported returns an error indicating the requested action is not supported on this kind.
func NewMethodNotSupported(qualifiedResource schema.GroupResource, action string) *StatusError { func NewMethodNotSupported(qualifiedResource schema.GroupResource, action string) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusMethodNotAllowed, Code: http.StatusMethodNotAllowed,
Reason: unversioned.StatusReasonMethodNotAllowed, Reason: metav1.StatusReasonMethodNotAllowed,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedResource.Group, Group: qualifiedResource.Group,
Kind: qualifiedResource.Resource, Kind: qualifiedResource.Resource,
}, },
@ -238,11 +238,11 @@ func NewMethodNotSupported(qualifiedResource schema.GroupResource, action string
// NewServerTimeout returns an error indicating the requested action could not be completed due to a // NewServerTimeout returns an error indicating the requested action could not be completed due to a
// transient error, and the client should try again. // transient error, and the client should try again.
func NewServerTimeout(qualifiedResource schema.GroupResource, operation string, retryAfterSeconds int) *StatusError { func NewServerTimeout(qualifiedResource schema.GroupResource, operation string, retryAfterSeconds int) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,
Reason: unversioned.StatusReasonServerTimeout, Reason: metav1.StatusReasonServerTimeout,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedResource.Group, Group: qualifiedResource.Group,
Kind: qualifiedResource.Resource, Kind: qualifiedResource.Resource,
Name: operation, Name: operation,
@ -260,12 +260,12 @@ func NewServerTimeoutForKind(qualifiedKind schema.GroupKind, operation string, r
// NewInternalError returns an error indicating the item is invalid and cannot be processed. // NewInternalError returns an error indicating the item is invalid and cannot be processed.
func NewInternalError(err error) *StatusError { func NewInternalError(err error) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,
Reason: unversioned.StatusReasonInternalError, Reason: metav1.StatusReasonInternalError,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Causes: []unversioned.StatusCause{{Message: err.Error()}}, Causes: []metav1.StatusCause{{Message: err.Error()}},
}, },
Message: fmt.Sprintf("Internal error occurred: %v", err), Message: fmt.Sprintf("Internal error occurred: %v", err),
}} }}
@ -274,12 +274,12 @@ func NewInternalError(err error) *StatusError {
// NewTimeoutError returns an error indicating that a timeout occurred before the request // NewTimeoutError returns an error indicating that a timeout occurred before the request
// could be completed. Clients may retry, but the operation may still complete. // could be completed. Clients may retry, but the operation may still complete.
func NewTimeoutError(message string, retryAfterSeconds int) *StatusError { func NewTimeoutError(message string, retryAfterSeconds int) *StatusError {
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: StatusServerTimeout, Code: StatusServerTimeout,
Reason: unversioned.StatusReasonTimeout, Reason: metav1.StatusReasonTimeout,
Message: fmt.Sprintf("Timeout: %s", message), Message: fmt.Sprintf("Timeout: %s", message),
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
RetryAfterSeconds: int32(retryAfterSeconds), RetryAfterSeconds: int32(retryAfterSeconds),
}, },
}} }}
@ -287,43 +287,43 @@ func NewTimeoutError(message string, retryAfterSeconds int) *StatusError {
// NewGenericServerResponse returns a new error for server responses that are not in a recognizable form. // NewGenericServerResponse returns a new error for server responses that are not in a recognizable form.
func NewGenericServerResponse(code int, verb string, qualifiedResource schema.GroupResource, name, serverMessage string, retryAfterSeconds int, isUnexpectedResponse bool) *StatusError { func NewGenericServerResponse(code int, verb string, qualifiedResource schema.GroupResource, name, serverMessage string, retryAfterSeconds int, isUnexpectedResponse bool) *StatusError {
reason := unversioned.StatusReasonUnknown reason := metav1.StatusReasonUnknown
message := fmt.Sprintf("the server responded with the status code %d but did not return more information", code) message := fmt.Sprintf("the server responded with the status code %d but did not return more information", code)
switch code { switch code {
case http.StatusConflict: case http.StatusConflict:
if verb == "POST" { if verb == "POST" {
reason = unversioned.StatusReasonAlreadyExists reason = metav1.StatusReasonAlreadyExists
} else { } else {
reason = unversioned.StatusReasonConflict reason = metav1.StatusReasonConflict
} }
message = "the server reported a conflict" message = "the server reported a conflict"
case http.StatusNotFound: case http.StatusNotFound:
reason = unversioned.StatusReasonNotFound reason = metav1.StatusReasonNotFound
message = "the server could not find the requested resource" message = "the server could not find the requested resource"
case http.StatusBadRequest: case http.StatusBadRequest:
reason = unversioned.StatusReasonBadRequest reason = metav1.StatusReasonBadRequest
message = "the server rejected our request for an unknown reason" message = "the server rejected our request for an unknown reason"
case http.StatusUnauthorized: case http.StatusUnauthorized:
reason = unversioned.StatusReasonUnauthorized reason = metav1.StatusReasonUnauthorized
message = "the server has asked for the client to provide credentials" message = "the server has asked for the client to provide credentials"
case http.StatusForbidden: case http.StatusForbidden:
reason = unversioned.StatusReasonForbidden reason = metav1.StatusReasonForbidden
message = "the server does not allow access to the requested resource" message = "the server does not allow access to the requested resource"
case http.StatusMethodNotAllowed: case http.StatusMethodNotAllowed:
reason = unversioned.StatusReasonMethodNotAllowed reason = metav1.StatusReasonMethodNotAllowed
message = "the server does not allow this method on the requested resource" message = "the server does not allow this method on the requested resource"
case StatusUnprocessableEntity: case StatusUnprocessableEntity:
reason = unversioned.StatusReasonInvalid reason = metav1.StatusReasonInvalid
message = "the server rejected our request due to an error in our request" message = "the server rejected our request due to an error in our request"
case StatusServerTimeout: case StatusServerTimeout:
reason = unversioned.StatusReasonServerTimeout reason = metav1.StatusReasonServerTimeout
message = "the server cannot complete the requested operation at this time, try again later" message = "the server cannot complete the requested operation at this time, try again later"
case StatusTooManyRequests: case StatusTooManyRequests:
reason = unversioned.StatusReasonTimeout reason = metav1.StatusReasonTimeout
message = "the server has received too many requests and has asked us to try again later" message = "the server has received too many requests and has asked us to try again later"
default: default:
if code >= 500 { if code >= 500 {
reason = unversioned.StatusReasonInternalError reason = metav1.StatusReasonInternalError
message = fmt.Sprintf("an error on the server (%q) has prevented the request from succeeding", serverMessage) message = fmt.Sprintf("an error on the server (%q) has prevented the request from succeeding", serverMessage)
} }
} }
@ -333,22 +333,22 @@ func NewGenericServerResponse(code int, verb string, qualifiedResource schema.Gr
case !qualifiedResource.Empty(): case !qualifiedResource.Empty():
message = fmt.Sprintf("%s (%s %s)", message, strings.ToLower(verb), qualifiedResource.String()) message = fmt.Sprintf("%s (%s %s)", message, strings.ToLower(verb), qualifiedResource.String())
} }
var causes []unversioned.StatusCause var causes []metav1.StatusCause
if isUnexpectedResponse { if isUnexpectedResponse {
causes = []unversioned.StatusCause{ causes = []metav1.StatusCause{
{ {
Type: unversioned.CauseTypeUnexpectedServerResponse, Type: metav1.CauseTypeUnexpectedServerResponse,
Message: serverMessage, Message: serverMessage,
}, },
} }
} else { } else {
causes = nil causes = nil
} }
return &StatusError{unversioned.Status{ return &StatusError{metav1.Status{
Status: unversioned.StatusFailure, Status: metav1.StatusFailure,
Code: int32(code), Code: int32(code),
Reason: reason, Reason: reason,
Details: &unversioned.StatusDetails{ Details: &metav1.StatusDetails{
Group: qualifiedResource.Group, Group: qualifiedResource.Group,
Kind: qualifiedResource.Resource, Kind: qualifiedResource.Resource,
Name: name, Name: name,
@ -362,56 +362,56 @@ func NewGenericServerResponse(code int, verb string, qualifiedResource schema.Gr
// IsNotFound returns true if the specified error was created by NewNotFound. // IsNotFound returns true if the specified error was created by NewNotFound.
func IsNotFound(err error) bool { func IsNotFound(err error) bool {
return reasonForError(err) == unversioned.StatusReasonNotFound return reasonForError(err) == metav1.StatusReasonNotFound
} }
// IsAlreadyExists determines if the err is an error which indicates that a specified resource already exists. // IsAlreadyExists determines if the err is an error which indicates that a specified resource already exists.
func IsAlreadyExists(err error) bool { func IsAlreadyExists(err error) bool {
return reasonForError(err) == unversioned.StatusReasonAlreadyExists return reasonForError(err) == metav1.StatusReasonAlreadyExists
} }
// IsConflict determines if the err is an error which indicates the provided update conflicts. // IsConflict determines if the err is an error which indicates the provided update conflicts.
func IsConflict(err error) bool { func IsConflict(err error) bool {
return reasonForError(err) == unversioned.StatusReasonConflict return reasonForError(err) == metav1.StatusReasonConflict
} }
// IsInvalid determines if the err is an error which indicates the provided resource is not valid. // IsInvalid determines if the err is an error which indicates the provided resource is not valid.
func IsInvalid(err error) bool { func IsInvalid(err error) bool {
return reasonForError(err) == unversioned.StatusReasonInvalid return reasonForError(err) == metav1.StatusReasonInvalid
} }
// IsMethodNotSupported determines if the err is an error which indicates the provided action could not // IsMethodNotSupported determines if the err is an error which indicates the provided action could not
// be performed because it is not supported by the server. // be performed because it is not supported by the server.
func IsMethodNotSupported(err error) bool { func IsMethodNotSupported(err error) bool {
return reasonForError(err) == unversioned.StatusReasonMethodNotAllowed return reasonForError(err) == metav1.StatusReasonMethodNotAllowed
} }
// IsBadRequest determines if err is an error which indicates that the request is invalid. // IsBadRequest determines if err is an error which indicates that the request is invalid.
func IsBadRequest(err error) bool { func IsBadRequest(err error) bool {
return reasonForError(err) == unversioned.StatusReasonBadRequest return reasonForError(err) == metav1.StatusReasonBadRequest
} }
// IsUnauthorized determines if err is an error which indicates that the request is unauthorized and // IsUnauthorized determines if err is an error which indicates that the request is unauthorized and
// requires authentication by the user. // requires authentication by the user.
func IsUnauthorized(err error) bool { func IsUnauthorized(err error) bool {
return reasonForError(err) == unversioned.StatusReasonUnauthorized return reasonForError(err) == metav1.StatusReasonUnauthorized
} }
// IsForbidden determines if err is an error which indicates that the request is forbidden and cannot // IsForbidden determines if err is an error which indicates that the request is forbidden and cannot
// be completed as requested. // be completed as requested.
func IsForbidden(err error) bool { func IsForbidden(err error) bool {
return reasonForError(err) == unversioned.StatusReasonForbidden return reasonForError(err) == metav1.StatusReasonForbidden
} }
// IsServerTimeout determines if err is an error which indicates that the request needs to be retried // IsServerTimeout determines if err is an error which indicates that the request needs to be retried
// by the client. // by the client.
func IsServerTimeout(err error) bool { func IsServerTimeout(err error) bool {
return reasonForError(err) == unversioned.StatusReasonServerTimeout return reasonForError(err) == metav1.StatusReasonServerTimeout
} }
// IsInternalError determines if err is an error which indicates an internal server error. // IsInternalError determines if err is an error which indicates an internal server error.
func IsInternalError(err error) bool { func IsInternalError(err error) bool {
return reasonForError(err) == unversioned.StatusReasonInternalError return reasonForError(err) == metav1.StatusReasonInternalError
} }
// IsTooManyRequests determines if err is an error which indicates that there are too many requests // IsTooManyRequests determines if err is an error which indicates that there are too many requests
@ -432,7 +432,7 @@ func IsUnexpectedServerError(err error) bool {
case APIStatus: case APIStatus:
if d := t.Status().Details; d != nil { if d := t.Status().Details; d != nil {
for _, cause := range d.Causes { for _, cause := range d.Causes {
if cause.Type == unversioned.CauseTypeUnexpectedServerResponse { if cause.Type == metav1.CauseTypeUnexpectedServerResponse {
return true return true
} }
} }
@ -454,7 +454,7 @@ func SuggestsClientDelay(err error) (int, bool) {
case APIStatus: case APIStatus:
if t.Status().Details != nil { if t.Status().Details != nil {
switch t.Status().Reason { switch t.Status().Reason {
case unversioned.StatusReasonServerTimeout, unversioned.StatusReasonTimeout: case metav1.StatusReasonServerTimeout, metav1.StatusReasonTimeout:
return int(t.Status().Details.RetryAfterSeconds), true return int(t.Status().Details.RetryAfterSeconds), true
} }
} }
@ -462,10 +462,10 @@ func SuggestsClientDelay(err error) (int, bool) {
return 0, false return 0, false
} }
func reasonForError(err error) unversioned.StatusReason { func reasonForError(err error) metav1.StatusReason {
switch t := err.(type) { switch t := err.(type) {
case APIStatus: case APIStatus:
return t.Status().Reason return t.Status().Reason
} }
return unversioned.StatusReasonUnknown return metav1.StatusReasonUnknown
} }

12
pkg/api/helpers.go
View File

@ -25,7 +25,7 @@ import (
"time" "time"
"k8s.io/client-go/pkg/api/resource" "k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/conversion"
"k8s.io/client-go/pkg/fields" "k8s.io/client-go/pkg/fields"
"k8s.io/client-go/pkg/labels" "k8s.io/client-go/pkg/labels"
@ -61,7 +61,7 @@ var Semantic = conversion.EqualitiesOrDie(
// Uninitialized quantities are equivalent to 0 quantities. // Uninitialized quantities are equivalent to 0 quantities.
return a.Cmp(b) == 0 return a.Cmp(b) == 0
}, },
func(a, b unversioned.Time) bool { func(a, b metav1.Time) bool {
return a.UTC() == b.UTC() return a.UTC() == b.UTC()
}, },
func(a, b labels.Selector) bool { func(a, b labels.Selector) bool {
@ -397,15 +397,15 @@ func containsAccessMode(modes []PersistentVolumeAccessMode, mode PersistentVolum
} }
// ParseRFC3339 parses an RFC3339 date in either RFC3339Nano or RFC3339 format. // ParseRFC3339 parses an RFC3339 date in either RFC3339Nano or RFC3339 format.
func ParseRFC3339(s string, nowFn func() unversioned.Time) (unversioned.Time, error) { func ParseRFC3339(s string, nowFn func() metav1.Time) (metav1.Time, error) {
if t, timeErr := time.Parse(time.RFC3339Nano, s); timeErr == nil { if t, timeErr := time.Parse(time.RFC3339Nano, s); timeErr == nil {
return unversioned.Time{Time: t}, nil return metav1.Time{Time: t}, nil
} }
t, err := time.Parse(time.RFC3339, s) t, err := time.Parse(time.RFC3339, s)
if err != nil { if err != nil {
return unversioned.Time{}, err return metav1.Time{}, err
} }
return unversioned.Time{Time: t}, nil return metav1.Time{Time: t}, nil
} }
// NodeSelectorRequirementsAsSelector converts the []NodeSelectorRequirement api type into a struct that implements // NodeSelectorRequirementsAsSelector converts the []NodeSelectorRequirement api type into a struct that implements

11
pkg/api/install/OWNERS Executable file
View File

@ -0,0 +1,11 @@
reviewers:
- lavalamp
- smarterclayton
- deads2k
- caesarxuchao
- liggitt
- nikhiljindal
- dims
- krousey
- david-mcmahon
- feihujiang

16
pkg/api/meta.go
View File

@ -19,7 +19,7 @@ package api
import ( import (
"k8s.io/client-go/pkg/api/meta" "k8s.io/client-go/pkg/api/meta"
"k8s.io/client-go/pkg/api/meta/metatypes" "k8s.io/client-go/pkg/api/meta/metatypes"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/conversion"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/types" "k8s.io/client-go/pkg/types"
@ -28,7 +28,7 @@ import (
// FillObjectMetaSystemFields populates fields that are managed by the system on ObjectMeta. // FillObjectMetaSystemFields populates fields that are managed by the system on ObjectMeta.
func FillObjectMetaSystemFields(ctx Context, meta *ObjectMeta) { func FillObjectMetaSystemFields(ctx Context, meta *ObjectMeta) {
meta.CreationTimestamp = unversioned.Now() meta.CreationTimestamp = metav1.Now()
// allows admission controllers to assign a UID earlier in the request processing // allows admission controllers to assign a UID earlier in the request processing
// to support tracking resources pending creation. // to support tracking resources pending creation.
uid, found := UIDFrom(ctx) uid, found := UIDFrom(ctx)
@ -61,12 +61,12 @@ func ObjectMetaFor(obj runtime.Object) (*ObjectMeta, error) {
// ListMetaFor returns a pointer to a provided object's ListMeta, // ListMetaFor returns a pointer to a provided object's ListMeta,
// or an error if the object does not have that pointer. // or an error if the object does not have that pointer.
// TODO: allow runtime.Unknown to extract this object // TODO: allow runtime.Unknown to extract this object
func ListMetaFor(obj runtime.Object) (*unversioned.ListMeta, error) { func ListMetaFor(obj runtime.Object) (*metav1.ListMeta, error) {
v, err := conversion.EnforcePtr(obj) v, err := conversion.EnforcePtr(obj)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var meta *unversioned.ListMeta var meta *metav1.ListMeta
err = runtime.FieldPtr(v, "ListMeta", &meta) err = runtime.FieldPtr(v, "ListMeta", &meta)
return meta, err return meta, err
} }
@ -87,12 +87,12 @@ func (meta *ObjectMeta) GetResourceVersion() string { return meta.Re
func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version }
func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink }
func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink }
func (meta *ObjectMeta) GetCreationTimestamp() unversioned.Time { return meta.CreationTimestamp } func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp }
func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp unversioned.Time) { func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) {
meta.CreationTimestamp = creationTimestamp meta.CreationTimestamp = creationTimestamp
} }
func (meta *ObjectMeta) GetDeletionTimestamp() *unversioned.Time { return meta.DeletionTimestamp } func (meta *ObjectMeta) GetDeletionTimestamp() *metav1.Time { return meta.DeletionTimestamp }
func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *unversioned.Time) { func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *metav1.Time) {
meta.DeletionTimestamp = deletionTimestamp meta.DeletionTimestamp = deletionTimestamp
} }
func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels } func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels }

26
pkg/api/meta/OWNERS Executable file
View File

@ -0,0 +1,26 @@
reviewers:
- thockin
- smarterclayton
- wojtek-t
- deads2k
- brendandburns
- derekwaynecarr
- caesarxuchao
- mikedanese
- liggitt
- nikhiljindal
- gmarek
- kargakis
- janetkuo
- ncdc
- eparis
- dims
- krousey
- markturansky
- fabioy
- resouer
- david-mcmahon
- mfojtik
- jianhuiz
- feihujiang
- ghodss

14
pkg/api/meta/interfaces.go
View File

@ -18,7 +18,7 @@ package meta
import ( import (
"k8s.io/client-go/pkg/api/meta/metatypes" "k8s.io/client-go/pkg/api/meta/metatypes"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/types" "k8s.io/client-go/pkg/types"
@ -51,10 +51,10 @@ type Object interface {
SetResourceVersion(version string) SetResourceVersion(version string)
GetSelfLink() string GetSelfLink() string
SetSelfLink(selfLink string) SetSelfLink(selfLink string)
GetCreationTimestamp() unversioned.Time GetCreationTimestamp() metav1.Time
SetCreationTimestamp(timestamp unversioned.Time) SetCreationTimestamp(timestamp metav1.Time)
GetDeletionTimestamp() *unversioned.Time GetDeletionTimestamp() *metav1.Time
SetDeletionTimestamp(timestamp *unversioned.Time) SetDeletionTimestamp(timestamp *metav1.Time)
GetLabels() map[string]string GetLabels() map[string]string
SetLabels(labels map[string]string) SetLabels(labels map[string]string)
GetAnnotations() map[string]string GetAnnotations() map[string]string
@ -76,10 +76,10 @@ type ListMetaAccessor interface {
// List lets you work with list metadata from any of the versioned or // List lets you work with list metadata from any of the versioned or
// internal API objects. Attempting to set or retrieve a field on an object that does // internal API objects. Attempting to set or retrieve a field on an object that does
// not support that field will be a no-op and return a default value. // not support that field will be a no-op and return a default value.
type List unversioned.List type List metav1.List
// Type exposes the type and APIVersion of versioned or internal API objects. // Type exposes the type and APIVersion of versioned or internal API objects.
type Type unversioned.Type type Type metav1.Type
// MetadataAccessor lets you work with object and list metadata from any of the versioned or // MetadataAccessor lets you work with object and list metadata from any of the versioned or
// internal API objects. Attempting to set or retrieve a field on an object that does // internal API objects. Attempting to set or retrieve a field on an object that does

20
pkg/api/meta/meta.go
View File

@ -21,7 +21,7 @@ import (
"reflect" "reflect"
"k8s.io/client-go/pkg/api/meta/metatypes" "k8s.io/client-go/pkg/api/meta/metatypes"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/conversion"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
@ -43,14 +43,14 @@ func ListAccessor(obj interface{}) (List, error) {
switch t := obj.(type) { switch t := obj.(type) {
case List: case List:
return t, nil return t, nil
case unversioned.List: case metav1.List:
return t, nil return t, nil
case ListMetaAccessor: case ListMetaAccessor:
if m := t.GetListMeta(); m != nil { if m := t.GetListMeta(); m != nil {
return m, nil return m, nil
} }
return nil, errNotList return nil, errNotList
case unversioned.ListMetaAccessor: case metav1.ListMetaAccessor:
if m := t.GetListMeta(); m != nil { if m := t.GetListMeta(); m != nil {
return m, nil return m, nil
} }
@ -85,7 +85,7 @@ func Accessor(obj interface{}) (Object, error) {
return m, nil return m, nil
} }
return nil, errNotObject return nil, errNotObject
case List, unversioned.List, ListMetaAccessor, unversioned.ListMetaAccessor: case List, metav1.List, ListMetaAccessor, metav1.ListMetaAccessor:
return nil, errNotObject return nil, errNotObject
default: default:
return nil, errNotObject return nil, errNotObject
@ -372,8 +372,8 @@ type genericAccessor struct {
kind *string kind *string
resourceVersion *string resourceVersion *string
selfLink *string selfLink *string
creationTimestamp *unversioned.Time creationTimestamp *metav1.Time
deletionTimestamp **unversioned.Time deletionTimestamp **metav1.Time
labels *map[string]string labels *map[string]string
annotations *map[string]string annotations *map[string]string
ownerReferences reflect.Value ownerReferences reflect.Value
@ -468,19 +468,19 @@ func (a genericAccessor) SetSelfLink(selfLink string) {
*a.selfLink = selfLink *a.selfLink = selfLink
} }
func (a genericAccessor) GetCreationTimestamp() unversioned.Time { func (a genericAccessor) GetCreationTimestamp() metav1.Time {
return *a.creationTimestamp return *a.creationTimestamp
} }
func (a genericAccessor) SetCreationTimestamp(timestamp unversioned.Time) { func (a genericAccessor) SetCreationTimestamp(timestamp metav1.Time) {
*a.creationTimestamp = timestamp *a.creationTimestamp = timestamp
} }
func (a genericAccessor) GetDeletionTimestamp() *unversioned.Time { func (a genericAccessor) GetDeletionTimestamp() *metav1.Time {
return *a.deletionTimestamp return *a.deletionTimestamp
} }
func (a genericAccessor) SetDeletionTimestamp(timestamp *unversioned.Time) { func (a genericAccessor) SetDeletionTimestamp(timestamp *metav1.Time) {
*a.deletionTimestamp = timestamp *a.deletionTimestamp = timestamp
} }

15
pkg/api/register.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package api package api
import ( import (
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
"k8s.io/client-go/pkg/runtime/serializer" "k8s.io/client-go/pkg/runtime/serializer"
@ -76,7 +76,7 @@ func init() {
} }
func addKnownTypes(scheme *runtime.Scheme) error { func addKnownTypes(scheme *runtime.Scheme) error {
if err := scheme.AddIgnoredConversionType(&unversioned.TypeMeta{}, &unversioned.TypeMeta{}); err != nil { if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil {
return err return err
} }
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
@ -129,12 +129,11 @@ func addKnownTypes(scheme *runtime.Scheme) error {
// Register Unversioned types under their own special group // Register Unversioned types under their own special group
scheme.AddUnversionedTypes(Unversioned, scheme.AddUnversionedTypes(Unversioned,
&unversioned.ExportOptions{}, &metav1.Status{},
&unversioned.Status{}, &metav1.APIVersions{},
&unversioned.APIVersions{}, &metav1.APIGroupList{},
&unversioned.APIGroupList{}, &metav1.APIGroup{},
&unversioned.APIGroup{}, &metav1.APIResourceList{},
&unversioned.APIResourceList{},
) )
return nil return nil
} }

17
pkg/api/resource/OWNERS Executable file
View File

@ -0,0 +1,17 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- derekwaynecarr
- mikedanese
- saad-ali
- janetkuo
- timstclair
- eparis
- timothysc
- jbeda
- xiang90
- mbohlool
- david-mcmahon
- goltermann

6
pkg/api/resource_helpers.go
View File

@ -20,7 +20,7 @@ import (
"time" "time"
"k8s.io/client-go/pkg/api/resource" "k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// Returns string version of ResourceName. // Returns string version of ResourceName.
@ -81,7 +81,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain
// of that, there are two cases when a pod can be considered available: // of that, there are two cases when a pod can be considered available:
// 1. minReadySeconds == 0, or // 1. minReadySeconds == 0, or
// 2. LastTransitionTime (is set) + minReadySeconds < current time // 2. LastTransitionTime (is set) + minReadySeconds < current time
func IsPodAvailable(pod *Pod, minReadySeconds int32, now unversioned.Time) bool { func IsPodAvailable(pod *Pod, minReadySeconds int32, now metav1.Time) bool {
if !IsPodReady(pod) { if !IsPodReady(pod) {
return false return false
} }
@ -144,7 +144,7 @@ func GetNodeCondition(status *NodeStatus, conditionType NodeConditionType) (int,
// status has changed. // status has changed.
// Returns true if pod condition has changed or has been added. // Returns true if pod condition has changed or has been added.
func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool {
condition.LastTransitionTime = unversioned.Now() condition.LastTransitionTime = metav1.Now()
// Try to find this pod condition. // Try to find this pod condition.
conditionIndex, oldCondition := GetPodCondition(status, condition.Type) conditionIndex, oldCondition := GetPodCondition(status, condition.Type)

21
pkg/api/testapi/OWNERS Executable file
View File

@ -0,0 +1,21 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- deads2k
- caesarxuchao
- mikedanese
- liggitt
- nikhiljindal
- bprashanth
- erictune
- timstclair
- eparis
- soltysh
- madhusudancs
- markturansky
- mml
- david-mcmahon
- ericchiang
- jianhuiz

16577
pkg/api/types.generated.go
View File

File diff suppressed because it is too large Load Diff

171
pkg/api/types.go
View File

@ -18,7 +18,7 @@ package api
import ( import (
"k8s.io/client-go/pkg/api/resource" "k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/fields" "k8s.io/client-go/pkg/fields"
"k8s.io/client-go/pkg/labels" "k8s.io/client-go/pkg/labels"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
@ -112,7 +112,7 @@ type ObjectMeta struct {
// created. It is not guaranteed to be set in happens-before order across separate operations. // created. It is not guaranteed to be set in happens-before order across separate operations.
// Clients may not set this value. It is represented in RFC3339 form and is in UTC. // Clients may not set this value. It is represented in RFC3339 form and is in UTC.
// +optional // +optional
CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty"` CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"`
// DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This
// field is set by the server when a graceful deletion is requested by the user, and is not // field is set by the server when a graceful deletion is requested by the user, and is not
@ -132,7 +132,7 @@ type ObjectMeta struct {
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
DeletionTimestamp *unversioned.Time `json:"deletionTimestamp,omitempty"` DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty"`
// DeletionGracePeriodSeconds records the graceful deletion value set when graceful deletion // DeletionGracePeriodSeconds records the graceful deletion value set when graceful deletion
// was requested. Represents the most recent grace period, and may only be shortened once set. // was requested. Represents the most recent grace period, and may only be shortened once set.
@ -368,7 +368,7 @@ type PersistentVolumeClaimVolumeSource struct {
// +nonNamespaced=true // +nonNamespaced=true
type PersistentVolume struct { type PersistentVolume struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -429,9 +429,9 @@ type PersistentVolumeStatus struct {
} }
type PersistentVolumeList struct { type PersistentVolumeList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []PersistentVolume `json:"items"` Items []PersistentVolume `json:"items"`
} }
@ -439,7 +439,7 @@ type PersistentVolumeList struct {
// PersistentVolumeClaim is a user's request for and claim to a persistent volume // PersistentVolumeClaim is a user's request for and claim to a persistent volume
type PersistentVolumeClaim struct { type PersistentVolumeClaim struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -453,9 +453,9 @@ type PersistentVolumeClaim struct {
} }
type PersistentVolumeClaimList struct { type PersistentVolumeClaimList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []PersistentVolumeClaim `json:"items"` Items []PersistentVolumeClaim `json:"items"`
} }
@ -468,7 +468,7 @@ type PersistentVolumeClaimSpec struct {
// A label query over volumes to consider for binding. This selector is // A label query over volumes to consider for binding. This selector is
// ignored when VolumeName is set // ignored when VolumeName is set
// +optional // +optional
Selector *unversioned.LabelSelector `json:"selector,omitempty"` Selector *metav1.LabelSelector `json:"selector,omitempty"`
// Resources represents the minimum resources required // Resources represents the minimum resources required
// +optional // +optional
Resources ResourceRequirements `json:"resources,omitempty"` Resources ResourceRequirements `json:"resources,omitempty"`
@ -1362,7 +1362,7 @@ type ContainerStateWaiting struct {
type ContainerStateRunning struct { type ContainerStateRunning struct {
// +optional // +optional
StartedAt unversioned.Time `json:"startedAt,omitempty"` StartedAt metav1.Time `json:"startedAt,omitempty"`
} }
type ContainerStateTerminated struct { type ContainerStateTerminated struct {
@ -1374,9 +1374,9 @@ type ContainerStateTerminated struct {
// +optional // +optional
Message string `json:"message,omitempty"` Message string `json:"message,omitempty"`
// +optional // +optional
StartedAt unversioned.Time `json:"startedAt,omitempty"` StartedAt metav1.Time `json:"startedAt,omitempty"`
// +optional // +optional
FinishedAt unversioned.Time `json:"finishedAt,omitempty"` FinishedAt metav1.Time `json:"finishedAt,omitempty"`
// +optional // +optional
ContainerID string `json:"containerID,omitempty"` ContainerID string `json:"containerID,omitempty"`
} }
@ -1454,9 +1454,9 @@ type PodCondition struct {
Type PodConditionType `json:"type"` Type PodConditionType `json:"type"`
Status ConditionStatus `json:"status"` Status ConditionStatus `json:"status"`
// +optional // +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty"`
// +optional // +optional
@ -1477,9 +1477,9 @@ const (
// PodList is a list of Pods. // PodList is a list of Pods.
type PodList struct { type PodList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []Pod `json:"items"` Items []Pod `json:"items"`
} }
@ -1641,7 +1641,7 @@ type WeightedPodAffinityTerm struct {
type PodAffinityTerm struct { type PodAffinityTerm struct {
// A label query over a set of resources, in this case pods. // A label query over a set of resources, in this case pods.
// +optional // +optional
LabelSelector *unversioned.LabelSelector `json:"labelSelector,omitempty"` LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
// namespaces specifies which namespaces the labelSelector applies to (matches against); // namespaces specifies which namespaces the labelSelector applies to (matches against);
// nil list means "this pod's namespace," empty list means "all namespaces" // nil list means "this pod's namespace," empty list means "all namespaces"
// The json tag here is not "omitempty" since we need to distinguish nil and empty. // The json tag here is not "omitempty" since we need to distinguish nil and empty.
@ -1916,7 +1916,7 @@ type PodStatus struct {
// Date and time at which the object was acknowledged by the Kubelet. // Date and time at which the object was acknowledged by the Kubelet.
// This is before the Kubelet pulled the container image(s) for the pod. // This is before the Kubelet pulled the container image(s) for the pod.
// +optional // +optional
StartTime *unversioned.Time `json:"startTime,omitempty"` StartTime *metav1.Time `json:"startTime,omitempty"`
// The list has one entry per init container in the manifest. The most recent successful // The list has one entry per init container in the manifest. The most recent successful
// init container will have ready = true, the most recently started container will have // init container will have ready = true, the most recently started container will have
@ -1934,7 +1934,7 @@ type PodStatus struct {
// PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded
type PodStatusResult struct { type PodStatusResult struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
// Status represents the current information about a pod. This data may not be up // Status represents the current information about a pod. This data may not be up
@ -1947,7 +1947,7 @@ type PodStatusResult struct {
// Pod is a collection of containers, used as either input (create, update) or as output (list, get). // Pod is a collection of containers, used as either input (create, update) or as output (list, get).
type Pod struct { type Pod struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -1976,7 +1976,7 @@ type PodTemplateSpec struct {
// PodTemplate describes a template for creating copies of a predefined pod. // PodTemplate describes a template for creating copies of a predefined pod.
type PodTemplate struct { type PodTemplate struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -1987,9 +1987,9 @@ type PodTemplate struct {
// PodTemplateList is a list of PodTemplates. // PodTemplateList is a list of PodTemplates.
type PodTemplateList struct { type PodTemplateList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []PodTemplate `json:"items"` Items []PodTemplate `json:"items"`
} }
@ -2068,7 +2068,7 @@ type ReplicationControllerCondition struct {
Status ConditionStatus `json:"status"` Status ConditionStatus `json:"status"`
// The last time the condition transitioned from one status to another. // The last time the condition transitioned from one status to another.
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
// The reason for the condition's last transition. // The reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty"`
@ -2081,7 +2081,7 @@ type ReplicationControllerCondition struct {
// ReplicationController represents the configuration of a replication controller. // ReplicationController represents the configuration of a replication controller.
type ReplicationController struct { type ReplicationController struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -2097,9 +2097,9 @@ type ReplicationController struct {
// ReplicationControllerList is a collection of replication controllers. // ReplicationControllerList is a collection of replication controllers.
type ReplicationControllerList struct { type ReplicationControllerList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []ReplicationController `json:"items"` Items []ReplicationController `json:"items"`
} }
@ -2112,9 +2112,9 @@ const (
// ServiceList holds a list of services. // ServiceList holds a list of services.
type ServiceList struct { type ServiceList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []Service `json:"items"` Items []Service `json:"items"`
} }
@ -2286,7 +2286,7 @@ type ServicePort struct {
// (for example 3306) that the proxy listens on, and the selector that determines which pods // (for example 3306) that the proxy listens on, and the selector that determines which pods
// will answer requests sent through the proxy. // will answer requests sent through the proxy.
type Service struct { type Service struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -2306,7 +2306,7 @@ type Service struct {
// * a principal that can be authenticated and authorized // * a principal that can be authenticated and authorized
// * a set of secrets // * a set of secrets
type ServiceAccount struct { type ServiceAccount struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -2322,9 +2322,9 @@ type ServiceAccount struct {
// ServiceAccountList is a list of ServiceAccount objects // ServiceAccountList is a list of ServiceAccount objects
type ServiceAccountList struct { type ServiceAccountList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []ServiceAccount `json:"items"` Items []ServiceAccount `json:"items"`
} }
@ -2344,7 +2344,7 @@ type ServiceAccountList struct {
// }, // },
// ] // ]
type Endpoints struct { type Endpoints struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -2401,9 +2401,9 @@ type EndpointPort struct {
// EndpointsList is a list of endpoints. // EndpointsList is a list of endpoints.
type EndpointsList struct { type EndpointsList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []Endpoints `json:"items"` Items []Endpoints `json:"items"`
} }
@ -2537,7 +2537,7 @@ type PreferAvoidPodsEntry struct {
PodSignature PodSignature `json:"podSignature"` PodSignature PodSignature `json:"podSignature"`
// Time at which this entry was added to the list. // Time at which this entry was added to the list.
// +optional // +optional
EvictionTime unversioned.Time `json:"evictionTime,omitempty"` EvictionTime metav1.Time `json:"evictionTime,omitempty"`
// (brief) reason why this entry was added to the list. // (brief) reason why this entry was added to the list.
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty"`
@ -2598,9 +2598,9 @@ type NodeCondition struct {
Type NodeConditionType `json:"type"` Type NodeConditionType `json:"type"`
Status ConditionStatus `json:"status"` Status ConditionStatus `json:"status"`
// +optional // +optional
LastHeartbeatTime unversioned.Time `json:"lastHeartbeatTime,omitempty"` LastHeartbeatTime metav1.Time `json:"lastHeartbeatTime,omitempty"`
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty"`
// +optional // +optional
@ -2666,7 +2666,7 @@ type ResourceList map[ResourceName]resource.Quantity
// Node is a worker node in Kubernetes // Node is a worker node in Kubernetes
// The name of the node according to etcd is in ObjectMeta.Name. // The name of the node according to etcd is in ObjectMeta.Name.
type Node struct { type Node struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -2681,9 +2681,9 @@ type Node struct {
// NodeList is a list of nodes. // NodeList is a list of nodes.
type NodeList struct { type NodeList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []Node `json:"items"` Items []Node `json:"items"`
} }
@ -2725,7 +2725,7 @@ const (
// A namespace provides a scope for Names. // A namespace provides a scope for Names.
// Use of multiple namespaces is optional // Use of multiple namespaces is optional
type Namespace struct { type Namespace struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -2740,16 +2740,16 @@ type Namespace struct {
// NamespaceList is a list of Namespaces. // NamespaceList is a list of Namespaces.
type NamespaceList struct { type NamespaceList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []Namespace `json:"items"` Items []Namespace `json:"items"`
} }
// Binding ties one object to another - for example, a pod is bound to a node by a scheduler. // Binding ties one object to another - for example, a pod is bound to a node by a scheduler.
type Binding struct { type Binding struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// ObjectMeta describes the object that is being bound. // ObjectMeta describes the object that is being bound.
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -2767,7 +2767,7 @@ type Preconditions struct {
// DeleteOptions may be provided when deleting an API object // DeleteOptions may be provided when deleting an API object
type DeleteOptions struct { type DeleteOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Optional duration in seconds before the object should be deleted. Value must be non-negative integer. // Optional duration in seconds before the object should be deleted. Value must be non-negative integer.
// The value zero indicates delete immediately. If this value is nil, the default grace period for the // The value zero indicates delete immediately. If this value is nil, the default grace period for the
@ -2786,19 +2786,10 @@ type DeleteOptions struct {
OrphanDependents *bool `json:"orphanDependents,omitempty"` OrphanDependents *bool `json:"orphanDependents,omitempty"`
} }
// ExportOptions is the query options to the standard REST get call.
type ExportOptions struct {
unversioned.TypeMeta `json:",inline"`
// Should this value be exported. Export strips fields that a user can not specify.
Export bool `json:"export"`
// Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'
Exact bool `json:"exact"`
}
// ListOptions is the query options to a standard REST list call, and has future support for // ListOptions is the query options to a standard REST list call, and has future support for
// watch calls. // watch calls.
type ListOptions struct { type ListOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// A selector based on labels // A selector based on labels
LabelSelector labels.Selector LabelSelector labels.Selector
@ -2818,7 +2809,7 @@ type ListOptions struct {
// PodLogOptions is the query options for a Pod's logs REST call // PodLogOptions is the query options for a Pod's logs REST call
type PodLogOptions struct { type PodLogOptions struct {
unversioned.TypeMeta metav1.TypeMeta
// Container for which to return logs // Container for which to return logs
Container string Container string
@ -2835,7 +2826,7 @@ type PodLogOptions struct {
// precedes the time a pod was started, only logs since the pod start will be returned. // precedes the time a pod was started, only logs since the pod start will be returned.
// If this value is in the future, no logs will be returned. // If this value is in the future, no logs will be returned.
// Only one of sinceSeconds or sinceTime may be specified. // Only one of sinceSeconds or sinceTime may be specified.
SinceTime *unversioned.Time SinceTime *metav1.Time
// If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line
// of log output. // of log output.
Timestamps bool Timestamps bool
@ -2851,7 +2842,7 @@ type PodLogOptions struct {
// PodAttachOptions is the query options to a Pod's remote attach call // PodAttachOptions is the query options to a Pod's remote attach call
// TODO: merge w/ PodExecOptions below for stdin, stdout, etc // TODO: merge w/ PodExecOptions below for stdin, stdout, etc
type PodAttachOptions struct { type PodAttachOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Stdin if true indicates that stdin is to be redirected for the attach call // Stdin if true indicates that stdin is to be redirected for the attach call
// +optional // +optional
@ -2876,7 +2867,7 @@ type PodAttachOptions struct {
// PodExecOptions is the query options to a Pod's remote exec call // PodExecOptions is the query options to a Pod's remote exec call
type PodExecOptions struct { type PodExecOptions struct {
unversioned.TypeMeta metav1.TypeMeta
// Stdin if true indicates that stdin is to be redirected for the exec call // Stdin if true indicates that stdin is to be redirected for the exec call
Stdin bool Stdin bool
@ -2899,7 +2890,7 @@ type PodExecOptions struct {
// PodProxyOptions is the query options to a Pod's proxy call // PodProxyOptions is the query options to a Pod's proxy call
type PodProxyOptions struct { type PodProxyOptions struct {
unversioned.TypeMeta metav1.TypeMeta
// Path is the URL path to use for the current proxy request // Path is the URL path to use for the current proxy request
Path string Path string
@ -2907,7 +2898,7 @@ type PodProxyOptions struct {
// NodeProxyOptions is the query options to a Node's proxy call // NodeProxyOptions is the query options to a Node's proxy call
type NodeProxyOptions struct { type NodeProxyOptions struct {
unversioned.TypeMeta metav1.TypeMeta
// Path is the URL path to use for the current proxy request // Path is the URL path to use for the current proxy request
Path string Path string
@ -2915,7 +2906,7 @@ type NodeProxyOptions struct {
// ServiceProxyOptions is the query options to a Service's proxy call. // ServiceProxyOptions is the query options to a Service's proxy call.
type ServiceProxyOptions struct { type ServiceProxyOptions struct {
unversioned.TypeMeta metav1.TypeMeta
// Path is the part of URLs that include service endpoints, suffixes, // Path is the part of URLs that include service endpoints, suffixes,
// and parameters to use for the current proxy request to service. // and parameters to use for the current proxy request to service.
@ -2979,7 +2970,7 @@ type LocalObjectReference struct {
} }
type SerializedReference struct { type SerializedReference struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
Reference ObjectReference `json:"reference,omitempty"` Reference ObjectReference `json:"reference,omitempty"`
} }
@ -3006,7 +2997,7 @@ const (
// Event is a report of an event somewhere in the cluster. // Event is a report of an event somewhere in the cluster.
// TODO: Decide whether to store these separately or with the object they apply to. // TODO: Decide whether to store these separately or with the object they apply to.
type Event struct { type Event struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -3032,11 +3023,11 @@ type Event struct {
// The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)
// +optional // +optional
FirstTimestamp unversioned.Time `json:"firstTimestamp,omitempty"` FirstTimestamp metav1.Time `json:"firstTimestamp,omitempty"`
// The time at which the most recent occurrence of this event was recorded. // The time at which the most recent occurrence of this event was recorded.
// +optional // +optional
LastTimestamp unversioned.Time `json:"lastTimestamp,omitempty"` LastTimestamp metav1.Time `json:"lastTimestamp,omitempty"`
// The number of times this event has occurred. // The number of times this event has occurred.
// +optional // +optional
@ -3049,18 +3040,18 @@ type Event struct {
// EventList is a list of events. // EventList is a list of events.
type EventList struct { type EventList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []Event `json:"items"` Items []Event `json:"items"`
} }
// List holds a list of objects, which may not be known by the server. // List holds a list of objects, which may not be known by the server.
type List struct { type List struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []runtime.Object `json:"items"` Items []runtime.Object `json:"items"`
} }
@ -3109,7 +3100,7 @@ type LimitRangeSpec struct {
// LimitRange sets resource usage limits for each kind of resource in a Namespace // LimitRange sets resource usage limits for each kind of resource in a Namespace
type LimitRange struct { type LimitRange struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -3120,9 +3111,9 @@ type LimitRange struct {
// LimitRangeList is a list of LimitRange items. // LimitRangeList is a list of LimitRange items.
type LimitRangeList struct { type LimitRangeList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
// Items is a list of LimitRange objects // Items is a list of LimitRange objects
Items []LimitRange `json:"items"` Items []LimitRange `json:"items"`
@ -3199,7 +3190,7 @@ type ResourceQuotaStatus struct {
// ResourceQuota sets aggregate quota restrictions enforced per namespace // ResourceQuota sets aggregate quota restrictions enforced per namespace
type ResourceQuota struct { type ResourceQuota struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -3214,9 +3205,9 @@ type ResourceQuota struct {
// ResourceQuotaList is a list of ResourceQuota items // ResourceQuotaList is a list of ResourceQuota items
type ResourceQuotaList struct { type ResourceQuotaList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
// Items is a list of ResourceQuota objects // Items is a list of ResourceQuota objects
Items []ResourceQuota `json:"items"` Items []ResourceQuota `json:"items"`
@ -3227,7 +3218,7 @@ type ResourceQuotaList struct {
// Secret holds secret data of a certain type. The total bytes of the values in // Secret holds secret data of a certain type. The total bytes of the values in
// the Data field must be less than MaxSecretSize bytes. // the Data field must be less than MaxSecretSize bytes.
type Secret struct { type Secret struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -3328,9 +3319,9 @@ const (
) )
type SecretList struct { type SecretList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []Secret `json:"items"` Items []Secret `json:"items"`
} }
@ -3339,7 +3330,7 @@ type SecretList struct {
// ConfigMap holds configuration data for components or applications to consume. // ConfigMap holds configuration data for components or applications to consume.
type ConfigMap struct { type ConfigMap struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -3351,9 +3342,9 @@ type ConfigMap struct {
// ConfigMapList is a resource containing a list of ConfigMap objects. // ConfigMapList is a resource containing a list of ConfigMap objects.
type ConfigMapList struct { type ConfigMapList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
// Items is the list of ConfigMaps. // Items is the list of ConfigMaps.
Items []ConfigMap `json:"items"` Items []ConfigMap `json:"items"`
@ -3433,7 +3424,7 @@ type ComponentCondition struct {
// ComponentStatus (and ComponentStatusList) holds the cluster validation info. // ComponentStatus (and ComponentStatusList) holds the cluster validation info.
type ComponentStatus struct { type ComponentStatus struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
@ -3442,9 +3433,9 @@ type ComponentStatus struct {
} }
type ComponentStatusList struct { type ComponentStatusList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []ComponentStatus `json:"items"` Items []ComponentStatus `json:"items"`
} }
@ -3512,7 +3503,7 @@ type SELinuxOptions struct {
// data encoding hints). A range allocation should *ALWAYS* be recreatable at any time by observation // data encoding hints). A range allocation should *ALWAYS* be recreatable at any time by observation
// of the cluster, thus the object is less strongly typed than most. // of the cluster, thus the object is less strongly typed than most.
type RangeAllocation struct { type RangeAllocation struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
ObjectMeta `json:"metadata,omitempty"` ObjectMeta `json:"metadata,omitempty"`
// A string representing a unique label for a range of resources, such as a CIDR "10.0.0.0/8" or // A string representing a unique label for a range of resources, such as a CIDR "10.0.0.0/8" or
@ -3538,5 +3529,5 @@ const (
// When the --failure-domains scheduler flag is not specified, // When the --failure-domains scheduler flag is not specified,
// DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. // DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity.
DefaultFailureDomains string = unversioned.LabelHostname + "," + unversioned.LabelZoneFailureDomain + "," + unversioned.LabelZoneRegion DefaultFailureDomains string = metav1.LabelHostname + "," + metav1.LabelZoneFailureDomain + "," + metav1.LabelZoneRegion
) )

41
pkg/api/v1/OWNERS Executable file
View File

@ -0,0 +1,41 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- deads2k
- yujuhong
- brendandburns
- derekwaynecarr
- caesarxuchao
- vishh
- mikedanese
- liggitt
- nikhiljindal
- bprashanth
- gmarek
- erictune
- davidopp
- pmorie
- sttts
- kargakis
- dchen1107
- saad-ali
- zmerlynn
- luxas
- janetkuo
- justinsb
- roberthbailey
- ncdc
- timstclair
- eparis
- timothysc
- piosz
- jsafrane
- dims
- errordeveloper
- madhusudancs
- krousey
- jayunit100
- rootfs
- markturansky

1716
pkg/api/v1/generated.pb.go
View File

File diff suppressed because it is too large Load Diff

81
pkg/api/v1/generated.proto
View File

@ -22,7 +22,7 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.api.v1; package k8s.io.kubernetes.pkg.api.v1;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
@ -252,7 +252,7 @@ message ComponentStatusList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of ComponentStatus objects. // List of ComponentStatus objects.
repeated ComponentStatus items = 2; repeated ComponentStatus items = 2;
@ -284,7 +284,7 @@ message ConfigMapKeySelector {
message ConfigMapList { message ConfigMapList {
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is the list of ConfigMaps. // Items is the list of ConfigMaps.
repeated ConfigMap items = 2; repeated ConfigMap items = 2;
@ -508,7 +508,7 @@ message ContainerState {
message ContainerStateRunning { message ContainerStateRunning {
// Time at which the container was last (re-)started // Time at which the container was last (re-)started
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 1;
} }
// ContainerStateTerminated is a terminated state of a container. // ContainerStateTerminated is a terminated state of a container.
@ -530,11 +530,11 @@ message ContainerStateTerminated {
// Time at which previous execution of the container started // Time at which previous execution of the container started
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 5; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 5;
// Time at which the container last terminated // Time at which the container last terminated
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time finishedAt = 6; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time finishedAt = 6;
// Container's ID in the format 'docker://<container_id>' // Container's ID in the format 'docker://<container_id>'
// +optional // +optional
@ -765,7 +765,7 @@ message EndpointsList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of endpoints. // List of endpoints.
repeated Endpoints items = 2; repeated Endpoints items = 2;
@ -840,11 +840,11 @@ message Event {
// The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time firstTimestamp = 6; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time firstTimestamp = 6;
// The time at which the most recent occurrence of this event was recorded. // The time at which the most recent occurrence of this event was recorded.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTimestamp = 7; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTimestamp = 7;
// The number of times this event has occurred. // The number of times this event has occurred.
// +optional // +optional
@ -860,7 +860,7 @@ message EventList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of events // List of events
repeated Event items = 2; repeated Event items = 2;
@ -888,15 +888,6 @@ message ExecAction {
repeated string command = 1; repeated string command = 1;
} }
// ExportOptions is the query options to the standard REST get call.
message ExportOptions {
// Should this value be exported. Export strips fields that a user can not specify.
optional bool export = 1;
// Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'
optional bool exact = 2;
}
// Represents a Fibre Channel volume. // Represents a Fibre Channel volume.
// Fibre Channel volumes can only be mounted as read/write once. // Fibre Channel volumes can only be mounted as read/write once.
// Fibre Channel volumes support ownership management and SELinux relabeling. // Fibre Channel volumes support ownership management and SELinux relabeling.
@ -1214,7 +1205,7 @@ message LimitRangeList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is a list of LimitRange objects. // Items is a list of LimitRange objects.
// More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md
@ -1232,7 +1223,7 @@ message List {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of objects // List of objects
repeated k8s.io.kubernetes.pkg.runtime.RawExtension items = 2; repeated k8s.io.kubernetes.pkg.runtime.RawExtension items = 2;
@ -1340,7 +1331,7 @@ message NamespaceList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is the list of Namespace objects in the list. // Items is the list of Namespace objects in the list.
// More info: http://kubernetes.io/docs/user-guide/namespaces // More info: http://kubernetes.io/docs/user-guide/namespaces
@ -1426,11 +1417,11 @@ message NodeCondition {
// Last time we got an update on a given condition. // Last time we got an update on a given condition.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastHeartbeatTime = 3; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastHeartbeatTime = 3;
// Last time the condition transit from one status to another. // Last time the condition transit from one status to another.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4;
// (brief) reason for the condition's last transition. // (brief) reason for the condition's last transition.
// +optional // +optional
@ -1453,7 +1444,7 @@ message NodeList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of nodes // List of nodes
repeated Node items = 2; repeated Node items = 2;
@ -1522,7 +1513,7 @@ message NodeSpec {
optional string providerID = 3; optional string providerID = 3;
// Unschedulable controls node schedulability of new pods. By default, node is schedulable. // Unschedulable controls node schedulability of new pods. By default, node is schedulable.
// More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration" // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration
// +optional // +optional
optional bool unschedulable = 4; optional bool unschedulable = 4;
} }
@ -1709,7 +1700,7 @@ message ObjectMeta {
// Null for lists. // Null for lists.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time creationTimestamp = 8; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time creationTimestamp = 8;
// DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This
// field is set by the server when a graceful deletion is requested by the user, and is not // field is set by the server when a graceful deletion is requested by the user, and is not
@ -1729,7 +1720,7 @@ message ObjectMeta {
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time deletionTimestamp = 9; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time deletionTimestamp = 9;
// Number of seconds allowed for this object to gracefully terminate before // Number of seconds allowed for this object to gracefully terminate before
// it will be removed from the system. Only set when deletionTimestamp is also set. // it will be removed from the system. Only set when deletionTimestamp is also set.
@ -1887,7 +1878,7 @@ message PersistentVolumeClaimList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// A list of persistent volume claims. // A list of persistent volume claims.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims
@ -1904,7 +1895,7 @@ message PersistentVolumeClaimSpec {
// A label query over volumes to consider for binding. // A label query over volumes to consider for binding.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4;
// Resources represents the minimum resources the volume should have. // Resources represents the minimum resources the volume should have.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources
@ -1952,7 +1943,7 @@ message PersistentVolumeList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of persistent volumes. // List of persistent volumes.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes // More info: http://kubernetes.io/docs/user-guide/persistent-volumes
@ -2170,7 +2161,7 @@ message PodAffinity {
message PodAffinityTerm { message PodAffinityTerm {
// A label query over a set of resources, in this case pods. // A label query over a set of resources, in this case pods.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector labelSelector = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector labelSelector = 1;
// namespaces specifies which namespaces the labelSelector applies to (matches against); // namespaces specifies which namespaces the labelSelector applies to (matches against);
// nil list means "this pod's namespace," empty list means "all namespaces" // nil list means "this pod's namespace," empty list means "all namespaces"
@ -2271,11 +2262,11 @@ message PodCondition {
// Last time we probed the condition. // Last time we probed the condition.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3;
// Last time the condition transitioned from one status to another. // Last time the condition transitioned from one status to another.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4;
// Unique, one-word, CamelCase reason for the condition's last transition. // Unique, one-word, CamelCase reason for the condition's last transition.
// +optional // +optional
@ -2325,7 +2316,7 @@ message PodList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of pods. // List of pods.
// More info: http://kubernetes.io/docs/user-guide/pods // More info: http://kubernetes.io/docs/user-guide/pods
@ -2358,7 +2349,7 @@ message PodLogOptions {
// If this value is in the future, no logs will be returned. // If this value is in the future, no logs will be returned.
// Only one of sinceSeconds or sinceTime may be specified. // Only one of sinceSeconds or sinceTime may be specified.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time sinceTime = 5; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time sinceTime = 5;
// If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line
// of log output. Defaults to false. // of log output. Defaults to false.
@ -2582,7 +2573,7 @@ message PodStatus {
// RFC 3339 date and time at which the object was acknowledged by the Kubelet. // RFC 3339 date and time at which the object was acknowledged by the Kubelet.
// This is before the Kubelet pulled the container image(s) for the pod. // This is before the Kubelet pulled the container image(s) for the pod.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 7; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 7;
// The list has one entry per container in the manifest. Each entry is currently the output // The list has one entry per container in the manifest. Each entry is currently the output
// of `docker inspect`. // of `docker inspect`.
@ -2625,7 +2616,7 @@ message PodTemplateList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of pod templates // List of pod templates
repeated PodTemplate items = 2; repeated PodTemplate items = 2;
@ -2658,7 +2649,7 @@ message PreferAvoidPodsEntry {
// Time at which this entry was added to the list. // Time at which this entry was added to the list.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time evictionTime = 2; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time evictionTime = 2;
// (brief) reason why this entry was added to the list. // (brief) reason why this entry was added to the list.
// +optional // +optional
@ -2836,7 +2827,7 @@ message ReplicationControllerCondition {
// The last time the condition transitioned from one status to another. // The last time the condition transitioned from one status to another.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 3;
// The reason for the condition's last transition. // The reason for the condition's last transition.
// +optional // +optional
@ -2852,7 +2843,7 @@ message ReplicationControllerList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of replication controllers. // List of replication controllers.
// More info: http://kubernetes.io/docs/user-guide/replication-controller // More info: http://kubernetes.io/docs/user-guide/replication-controller
@ -2954,7 +2945,7 @@ message ResourceQuotaList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is a list of ResourceQuota objects. // Items is a list of ResourceQuota objects.
// More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota
@ -3063,7 +3054,7 @@ message SecretList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is a list of secret objects. // Items is a list of secret objects.
// More info: http://kubernetes.io/docs/user-guide/secrets // More info: http://kubernetes.io/docs/user-guide/secrets
@ -3201,7 +3192,7 @@ message ServiceAccountList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of ServiceAccounts. // List of ServiceAccounts.
// More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts
@ -3213,7 +3204,7 @@ message ServiceList {
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// List of services // List of services
repeated Service items = 2; repeated Service items = 2;

10
pkg/api/v1/meta.go
View File

@ -19,7 +19,7 @@ package v1
import ( import (
"k8s.io/client-go/pkg/api/meta" "k8s.io/client-go/pkg/api/meta"
"k8s.io/client-go/pkg/api/meta/metatypes" "k8s.io/client-go/pkg/api/meta/metatypes"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/types" "k8s.io/client-go/pkg/types"
) )
@ -39,12 +39,12 @@ func (meta *ObjectMeta) GetResourceVersion() string { return meta.Re
func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version }
func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink }
func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink }
func (meta *ObjectMeta) GetCreationTimestamp() unversioned.Time { return meta.CreationTimestamp } func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp }
func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp unversioned.Time) { func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) {
meta.CreationTimestamp = creationTimestamp meta.CreationTimestamp = creationTimestamp
} }
func (meta *ObjectMeta) GetDeletionTimestamp() *unversioned.Time { return meta.DeletionTimestamp } func (meta *ObjectMeta) GetDeletionTimestamp() *metav1.Time { return meta.DeletionTimestamp }
func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *unversioned.Time) { func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *metav1.Time) {
meta.DeletionTimestamp = deletionTimestamp meta.DeletionTimestamp = deletionTimestamp
} }
func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels } func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels }

11
pkg/api/v1/register.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package v1 package v1
import ( import (
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
versionedwatch "k8s.io/client-go/pkg/watch/versioned" versionedwatch "k8s.io/client-go/pkg/watch/versioned"
@ -29,6 +29,11 @@ const GroupName = ""
// 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: "v1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs, addFastPathConversionFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs, addFastPathConversionFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
@ -71,7 +76,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&PersistentVolumeClaim{}, &PersistentVolumeClaim{},
&PersistentVolumeClaimList{}, &PersistentVolumeClaimList{},
&DeleteOptions{}, &DeleteOptions{},
&ExportOptions{}, &metav1.ExportOptions{},
&ListOptions{}, &ListOptions{},
&PodAttachOptions{}, &PodAttachOptions{},
&PodLogOptions{}, &PodLogOptions{},
@ -86,7 +91,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
) )
// Add common types // Add common types
scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{}) scheme.AddKnownTypes(SchemeGroupVersion, &metav1.Status{})
// Add the watch version that applies // Add the watch version that applies
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)

6
pkg/api/v1/resource_helpers.go
View File

@ -20,7 +20,7 @@ import (
"time" "time"
"k8s.io/client-go/pkg/api/resource" "k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// Returns string version of ResourceName. // Returns string version of ResourceName.
@ -81,7 +81,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain
// of that, there are two cases when a pod can be considered available: // of that, there are two cases when a pod can be considered available:
// 1. minReadySeconds == 0, or // 1. minReadySeconds == 0, or
// 2. LastTransitionTime (is set) + minReadySeconds < current time // 2. LastTransitionTime (is set) + minReadySeconds < current time
func IsPodAvailable(pod *Pod, minReadySeconds int32, now unversioned.Time) bool { func IsPodAvailable(pod *Pod, minReadySeconds int32, now metav1.Time) bool {
if !IsPodReady(pod) { if !IsPodReady(pod) {
return false return false
} }
@ -144,7 +144,7 @@ func GetNodeCondition(status *NodeStatus, conditionType NodeConditionType) (int,
// status has changed. // status has changed.
// Returns true if pod condition has changed or has been added. // Returns true if pod condition has changed or has been added.
func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool {
condition.LastTransitionTime = unversioned.Now() condition.LastTransitionTime = metav1.Now()
// Try to find this pod condition. // Try to find this pod condition.
conditionIndex, oldCondition := GetPodCondition(status, condition.Type) conditionIndex, oldCondition := GetPodCondition(status, condition.Type)

17493
pkg/api/v1/types.generated.go
View File

File diff suppressed because it is too large Load Diff

174
pkg/api/v1/types.go
View File

@ -18,7 +18,7 @@ package v1
import ( import (
"k8s.io/client-go/pkg/api/resource" "k8s.io/client-go/pkg/api/resource"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/types" "k8s.io/client-go/pkg/types"
"k8s.io/client-go/pkg/util/intstr" "k8s.io/client-go/pkg/util/intstr"
@ -147,7 +147,7 @@ type ObjectMeta struct {
// Null for lists. // Null for lists.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty" protobuf:"bytes,8,opt,name=creationTimestamp"` CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty" protobuf:"bytes,8,opt,name=creationTimestamp"`
// DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This
// field is set by the server when a graceful deletion is requested by the user, and is not // field is set by the server when a graceful deletion is requested by the user, and is not
@ -167,7 +167,7 @@ type ObjectMeta struct {
// Read-only. // Read-only.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
DeletionTimestamp *unversioned.Time `json:"deletionTimestamp,omitempty" protobuf:"bytes,9,opt,name=deletionTimestamp"` DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty" protobuf:"bytes,9,opt,name=deletionTimestamp"`
// Number of seconds allowed for this object to gracefully terminate before // Number of seconds allowed for this object to gracefully terminate before
// it will be removed from the system. Only set when deletionTimestamp is also set. // it will be removed from the system. Only set when deletionTimestamp is also set.
@ -418,7 +418,7 @@ type PersistentVolumeSource struct {
// It is analogous to a node. // It is analogous to a node.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes // More info: http://kubernetes.io/docs/user-guide/persistent-volumes
type PersistentVolume struct { type PersistentVolume struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -496,11 +496,11 @@ type PersistentVolumeStatus struct {
// PersistentVolumeList is a list of PersistentVolume items. // PersistentVolumeList is a list of PersistentVolume items.
type PersistentVolumeList struct { type PersistentVolumeList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of persistent volumes. // List of persistent volumes.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes // More info: http://kubernetes.io/docs/user-guide/persistent-volumes
Items []PersistentVolume `json:"items" protobuf:"bytes,2,rep,name=items"` Items []PersistentVolume `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -510,7 +510,7 @@ type PersistentVolumeList struct {
// PersistentVolumeClaim is a user's request for and claim to a persistent volume // PersistentVolumeClaim is a user's request for and claim to a persistent volume
type PersistentVolumeClaim struct { type PersistentVolumeClaim struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -530,11 +530,11 @@ type PersistentVolumeClaim struct {
// PersistentVolumeClaimList is a list of PersistentVolumeClaim items. // PersistentVolumeClaimList is a list of PersistentVolumeClaim items.
type PersistentVolumeClaimList struct { type PersistentVolumeClaimList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// A list of persistent volume claims. // A list of persistent volume claims.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims
Items []PersistentVolumeClaim `json:"items" protobuf:"bytes,2,rep,name=items"` Items []PersistentVolumeClaim `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -549,7 +549,7 @@ type PersistentVolumeClaimSpec struct {
AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" protobuf:"bytes,1,rep,name=accessModes,casttype=PersistentVolumeAccessMode"` AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" protobuf:"bytes,1,rep,name=accessModes,casttype=PersistentVolumeAccessMode"`
// A label query over volumes to consider for binding. // A label query over volumes to consider for binding.
// +optional // +optional
Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"`
// Resources represents the minimum resources the volume should have. // Resources represents the minimum resources the volume should have.
// More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources
// +optional // +optional
@ -1543,7 +1543,7 @@ type ContainerStateWaiting struct {
type ContainerStateRunning struct { type ContainerStateRunning struct {
// Time at which the container was last (re-)started // Time at which the container was last (re-)started
// +optional // +optional
StartedAt unversioned.Time `json:"startedAt,omitempty" protobuf:"bytes,1,opt,name=startedAt"` StartedAt metav1.Time `json:"startedAt,omitempty" protobuf:"bytes,1,opt,name=startedAt"`
} }
// ContainerStateTerminated is a terminated state of a container. // ContainerStateTerminated is a terminated state of a container.
@ -1561,10 +1561,10 @@ type ContainerStateTerminated struct {
Message string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"` Message string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"`
// Time at which previous execution of the container started // Time at which previous execution of the container started
// +optional // +optional
StartedAt unversioned.Time `json:"startedAt,omitempty" protobuf:"bytes,5,opt,name=startedAt"` StartedAt metav1.Time `json:"startedAt,omitempty" protobuf:"bytes,5,opt,name=startedAt"`
// Time at which the container last terminated // Time at which the container last terminated
// +optional // +optional
FinishedAt unversioned.Time `json:"finishedAt,omitempty" protobuf:"bytes,6,opt,name=finishedAt"` FinishedAt metav1.Time `json:"finishedAt,omitempty" protobuf:"bytes,6,opt,name=finishedAt"`
// Container's ID in the format 'docker://<container_id>' // Container's ID in the format 'docker://<container_id>'
// +optional // +optional
ContainerID string `json:"containerID,omitempty" protobuf:"bytes,7,opt,name=containerID"` ContainerID string `json:"containerID,omitempty" protobuf:"bytes,7,opt,name=containerID"`
@ -1667,10 +1667,10 @@ type PodCondition struct {
Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"`
// Last time we probed the condition. // Last time we probed the condition.
// +optional // +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"`
// Last time the condition transitioned from one status to another. // Last time the condition transitioned from one status to another.
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"`
// Unique, one-word, CamelCase reason for the condition's last transition. // Unique, one-word, CamelCase reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"`
@ -1850,7 +1850,7 @@ type WeightedPodAffinityTerm struct {
type PodAffinityTerm struct { type PodAffinityTerm struct {
// A label query over a set of resources, in this case pods. // A label query over a set of resources, in this case pods.
// +optional // +optional
LabelSelector *unversioned.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"` LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"`
// namespaces specifies which namespaces the labelSelector applies to (matches against); // namespaces specifies which namespaces the labelSelector applies to (matches against);
// nil list means "this pod's namespace," empty list means "all namespaces" // nil list means "this pod's namespace," empty list means "all namespaces"
// The json tag here is not "omitempty" since we need to distinguish nil and empty. // The json tag here is not "omitempty" since we need to distinguish nil and empty.
@ -2183,7 +2183,7 @@ type PodStatus struct {
// RFC 3339 date and time at which the object was acknowledged by the Kubelet. // RFC 3339 date and time at which the object was acknowledged by the Kubelet.
// This is before the Kubelet pulled the container image(s) for the pod. // This is before the Kubelet pulled the container image(s) for the pod.
// +optional // +optional
StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,7,opt,name=startTime"` StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,7,opt,name=startTime"`
// The list has one entry per init container in the manifest. The most recent successful // The list has one entry per init container in the manifest. The most recent successful
// init container will have ready = true, the most recently started container will have // init container will have ready = true, the most recently started container will have
@ -2200,7 +2200,7 @@ type PodStatus struct {
// PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded
type PodStatusResult struct { type PodStatusResult struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2219,7 +2219,7 @@ type PodStatusResult struct {
// Pod is a collection of containers that can run on a host. This resource is created // Pod is a collection of containers that can run on a host. This resource is created
// by clients and scheduled onto hosts. // by clients and scheduled onto hosts.
type Pod struct { type Pod struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2241,11 +2241,11 @@ type Pod struct {
// PodList is a list of Pods. // PodList is a list of Pods.
type PodList struct { type PodList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of pods. // List of pods.
// More info: http://kubernetes.io/docs/user-guide/pods // More info: http://kubernetes.io/docs/user-guide/pods
@ -2269,7 +2269,7 @@ type PodTemplateSpec struct {
// PodTemplate describes a template for creating copies of a predefined pod. // PodTemplate describes a template for creating copies of a predefined pod.
type PodTemplate struct { type PodTemplate struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2283,11 +2283,11 @@ type PodTemplate struct {
// PodTemplateList is a list of PodTemplates. // PodTemplateList is a list of PodTemplates.
type PodTemplateList struct { type PodTemplateList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of pod templates // List of pod templates
Items []PodTemplate `json:"items" protobuf:"bytes,2,rep,name=items"` Items []PodTemplate `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -2375,7 +2375,7 @@ type ReplicationControllerCondition struct {
Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"`
// The last time the condition transitioned from one status to another. // The last time the condition transitioned from one status to another.
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"`
// The reason for the condition's last transition. // The reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"`
@ -2388,7 +2388,7 @@ type ReplicationControllerCondition struct {
// ReplicationController represents the configuration of a replication controller. // ReplicationController represents the configuration of a replication controller.
type ReplicationController struct { type ReplicationController struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// If the Labels of a ReplicationController are empty, they are defaulted to // If the Labels of a ReplicationController are empty, they are defaulted to
// be the same as the Pod(s) that the replication controller manages. // be the same as the Pod(s) that the replication controller manages.
@ -2412,11 +2412,11 @@ type ReplicationController struct {
// ReplicationControllerList is a collection of replication controllers. // ReplicationControllerList is a collection of replication controllers.
type ReplicationControllerList struct { type ReplicationControllerList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of replication controllers. // List of replication controllers.
// More info: http://kubernetes.io/docs/user-guide/replication-controller // More info: http://kubernetes.io/docs/user-guide/replication-controller
@ -2623,7 +2623,7 @@ type ServicePort struct {
// (for example 3306) that the proxy listens on, and the selector that determines which pods // (for example 3306) that the proxy listens on, and the selector that determines which pods
// will answer requests sent through the proxy. // will answer requests sent through the proxy.
type Service struct { type Service struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2650,11 +2650,11 @@ const (
// ServiceList holds a list of services. // ServiceList holds a list of services.
type ServiceList struct { type ServiceList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of services // List of services
Items []Service `json:"items" protobuf:"bytes,2,rep,name=items"` Items []Service `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -2667,7 +2667,7 @@ type ServiceList struct {
// * a principal that can be authenticated and authorized // * a principal that can be authenticated and authorized
// * a set of secrets // * a set of secrets
type ServiceAccount struct { type ServiceAccount struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2688,11 +2688,11 @@ type ServiceAccount struct {
// ServiceAccountList is a list of ServiceAccount objects // ServiceAccountList is a list of ServiceAccount objects
type ServiceAccountList struct { type ServiceAccountList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of ServiceAccounts. // List of ServiceAccounts.
// More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts
@ -2714,7 +2714,7 @@ type ServiceAccountList struct {
// }, // },
// ] // ]
type Endpoints struct { type Endpoints struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -2795,11 +2795,11 @@ type EndpointPort struct {
// EndpointsList is a list of endpoints. // EndpointsList is a list of endpoints.
type EndpointsList struct { type EndpointsList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of endpoints. // List of endpoints.
Items []Endpoints `json:"items" protobuf:"bytes,2,rep,name=items"` Items []Endpoints `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -2818,7 +2818,7 @@ type NodeSpec struct {
// +optional // +optional
ProviderID string `json:"providerID,omitempty" protobuf:"bytes,3,opt,name=providerID"` ProviderID string `json:"providerID,omitempty" protobuf:"bytes,3,opt,name=providerID"`
// Unschedulable controls node schedulability of new pods. By default, node is schedulable. // Unschedulable controls node schedulability of new pods. By default, node is schedulable.
// More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration" // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration
// +optional // +optional
Unschedulable bool `json:"unschedulable,omitempty" protobuf:"varint,4,opt,name=unschedulable"` Unschedulable bool `json:"unschedulable,omitempty" protobuf:"varint,4,opt,name=unschedulable"`
} }
@ -2939,7 +2939,7 @@ type PreferAvoidPodsEntry struct {
PodSignature PodSignature `json:"podSignature" protobuf:"bytes,1,opt,name=podSignature"` PodSignature PodSignature `json:"podSignature" protobuf:"bytes,1,opt,name=podSignature"`
// Time at which this entry was added to the list. // Time at which this entry was added to the list.
// +optional // +optional
EvictionTime unversioned.Time `json:"evictionTime,omitempty" protobuf:"bytes,2,opt,name=evictionTime"` EvictionTime metav1.Time `json:"evictionTime,omitempty" protobuf:"bytes,2,opt,name=evictionTime"`
// (brief) reason why this entry was added to the list. // (brief) reason why this entry was added to the list.
// +optional // +optional
Reason string `json:"reason,omitempty" protobuf:"bytes,3,opt,name=reason"` Reason string `json:"reason,omitempty" protobuf:"bytes,3,opt,name=reason"`
@ -3007,10 +3007,10 @@ type NodeCondition struct {
Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"`
// Last time we got an update on a given condition. // Last time we got an update on a given condition.
// +optional // +optional
LastHeartbeatTime unversioned.Time `json:"lastHeartbeatTime,omitempty" protobuf:"bytes,3,opt,name=lastHeartbeatTime"` LastHeartbeatTime metav1.Time `json:"lastHeartbeatTime,omitempty" protobuf:"bytes,3,opt,name=lastHeartbeatTime"`
// Last time the condition transit from one status to another. // Last time the condition transit from one status to another.
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"`
// (brief) reason for the condition's last transition. // (brief) reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"`
@ -3072,7 +3072,7 @@ type ResourceList map[ResourceName]resource.Quantity
// Node is a worker node in Kubernetes. // Node is a worker node in Kubernetes.
// Each node will have a unique identifier in the cache (i.e. in etcd). // Each node will have a unique identifier in the cache (i.e. in etcd).
type Node struct { type Node struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3093,11 +3093,11 @@ type Node struct {
// NodeList is the whole list of all Nodes which have been registered with master. // NodeList is the whole list of all Nodes which have been registered with master.
type NodeList struct { type NodeList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of nodes // List of nodes
Items []Node `json:"items" protobuf:"bytes,2,rep,name=items"` Items []Node `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -3143,7 +3143,7 @@ const (
// Namespace provides a scope for Names. // Namespace provides a scope for Names.
// Use of multiple namespaces is optional. // Use of multiple namespaces is optional.
type Namespace struct { type Namespace struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3162,11 +3162,11 @@ type Namespace struct {
// NamespaceList is a list of Namespaces. // NamespaceList is a list of Namespaces.
type NamespaceList struct { type NamespaceList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is the list of Namespace objects in the list. // Items is the list of Namespace objects in the list.
// More info: http://kubernetes.io/docs/user-guide/namespaces // More info: http://kubernetes.io/docs/user-guide/namespaces
@ -3176,7 +3176,7 @@ type NamespaceList struct {
// Binding ties one object to another. // Binding ties one object to another.
// For example, a pod is bound to a node by a scheduler. // For example, a pod is bound to a node by a scheduler.
type Binding struct { type Binding struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3195,7 +3195,7 @@ type Preconditions struct {
// DeleteOptions may be provided when deleting an API object // DeleteOptions may be provided when deleting an API object
type DeleteOptions struct { type DeleteOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// The duration in seconds before the object should be deleted. Value must be non-negative integer. // The duration in seconds before the object should be deleted. Value must be non-negative integer.
// The value zero indicates delete immediately. If this value is nil, the default grace period for the // The value zero indicates delete immediately. If this value is nil, the default grace period for the
@ -3215,19 +3215,9 @@ type DeleteOptions struct {
OrphanDependents *bool `json:"orphanDependents,omitempty" protobuf:"varint,3,opt,name=orphanDependents"` OrphanDependents *bool `json:"orphanDependents,omitempty" protobuf:"varint,3,opt,name=orphanDependents"`
} }
// ExportOptions is the query options to the standard REST get call.
type ExportOptions struct {
unversioned.TypeMeta `json:",inline"`
// Should this value be exported. Export strips fields that a user can not specify.
Export bool `json:"export" protobuf:"varint,1,opt,name=export"`
// Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'
Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"`
}
// ListOptions is the query options to a standard REST list call. // ListOptions is the query options to a standard REST list call.
type ListOptions struct { type ListOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// A selector to restrict the list of returned objects by their labels. // A selector to restrict the list of returned objects by their labels.
// Defaults to everything. // Defaults to everything.
@ -3252,7 +3242,7 @@ type ListOptions struct {
// PodLogOptions is the query options for a Pod's logs REST call. // PodLogOptions is the query options for a Pod's logs REST call.
type PodLogOptions struct { type PodLogOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// The container for which to stream logs. Defaults to only container if there is one container in the pod. // The container for which to stream logs. Defaults to only container if there is one container in the pod.
// +optional // +optional
@ -3274,7 +3264,7 @@ type PodLogOptions struct {
// If this value is in the future, no logs will be returned. // If this value is in the future, no logs will be returned.
// Only one of sinceSeconds or sinceTime may be specified. // Only one of sinceSeconds or sinceTime may be specified.
// +optional // +optional
SinceTime *unversioned.Time `json:"sinceTime,omitempty" protobuf:"bytes,5,opt,name=sinceTime"` SinceTime *metav1.Time `json:"sinceTime,omitempty" protobuf:"bytes,5,opt,name=sinceTime"`
// If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line
// of log output. Defaults to false. // of log output. Defaults to false.
// +optional // +optional
@ -3295,7 +3285,7 @@ type PodLogOptions struct {
// TODO: merge w/ PodExecOptions below for stdin, stdout, etc // TODO: merge w/ PodExecOptions below for stdin, stdout, etc
// and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY
type PodAttachOptions struct { type PodAttachOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Stdin if true, redirects the standard input stream of the pod for this call. // Stdin if true, redirects the standard input stream of the pod for this call.
// Defaults to false. // Defaults to false.
@ -3330,7 +3320,7 @@ type PodAttachOptions struct {
// TODO: This is largely identical to PodAttachOptions above, make sure they stay in sync and see about merging // TODO: This is largely identical to PodAttachOptions above, make sure they stay in sync and see about merging
// and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY
type PodExecOptions struct { type PodExecOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Redirect the standard input stream of the pod for this call. // Redirect the standard input stream of the pod for this call.
// Defaults to false. // Defaults to false.
@ -3363,7 +3353,7 @@ type PodExecOptions struct {
// PodProxyOptions is the query options to a Pod's proxy call. // PodProxyOptions is the query options to a Pod's proxy call.
type PodProxyOptions struct { type PodProxyOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Path is the URL path to use for the current proxy request to pod. // Path is the URL path to use for the current proxy request to pod.
// +optional // +optional
@ -3372,7 +3362,7 @@ type PodProxyOptions struct {
// NodeProxyOptions is the query options to a Node's proxy call. // NodeProxyOptions is the query options to a Node's proxy call.
type NodeProxyOptions struct { type NodeProxyOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Path is the URL path to use for the current proxy request to node. // Path is the URL path to use for the current proxy request to node.
// +optional // +optional
@ -3381,7 +3371,7 @@ type NodeProxyOptions struct {
// ServiceProxyOptions is the query options to a Service's proxy call. // ServiceProxyOptions is the query options to a Service's proxy call.
type ServiceProxyOptions struct { type ServiceProxyOptions struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Path is the part of URLs that include service endpoints, suffixes, // Path is the part of URLs that include service endpoints, suffixes,
// and parameters to use for the current proxy request to service. // and parameters to use for the current proxy request to service.
@ -3462,7 +3452,7 @@ type LocalObjectReference struct {
// SerializedReference is a reference to serialized object. // SerializedReference is a reference to serialized object.
type SerializedReference struct { type SerializedReference struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// The reference to an object in the system. // The reference to an object in the system.
// +optional // +optional
Reference ObjectReference `json:"reference,omitempty" protobuf:"bytes,1,opt,name=reference"` Reference ObjectReference `json:"reference,omitempty" protobuf:"bytes,1,opt,name=reference"`
@ -3491,7 +3481,7 @@ const (
// Event is a report of an event somewhere in the cluster. // Event is a report of an event somewhere in the cluster.
// TODO: Decide whether to store these separately or with the object they apply to. // TODO: Decide whether to store these separately or with the object they apply to.
type Event struct { type Event struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
ObjectMeta `json:"metadata" protobuf:"bytes,1,opt,name=metadata"` ObjectMeta `json:"metadata" protobuf:"bytes,1,opt,name=metadata"`
@ -3516,11 +3506,11 @@ type Event struct {
// The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)
// +optional // +optional
FirstTimestamp unversioned.Time `json:"firstTimestamp,omitempty" protobuf:"bytes,6,opt,name=firstTimestamp"` FirstTimestamp metav1.Time `json:"firstTimestamp,omitempty" protobuf:"bytes,6,opt,name=firstTimestamp"`
// The time at which the most recent occurrence of this event was recorded. // The time at which the most recent occurrence of this event was recorded.
// +optional // +optional
LastTimestamp unversioned.Time `json:"lastTimestamp,omitempty" protobuf:"bytes,7,opt,name=lastTimestamp"` LastTimestamp metav1.Time `json:"lastTimestamp,omitempty" protobuf:"bytes,7,opt,name=lastTimestamp"`
// The number of times this event has occurred. // The number of times this event has occurred.
// +optional // +optional
@ -3533,11 +3523,11 @@ type Event struct {
// EventList is a list of events. // EventList is a list of events.
type EventList struct { type EventList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of events // List of events
Items []Event `json:"items" protobuf:"bytes,2,rep,name=items"` Items []Event `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -3545,11 +3535,11 @@ type EventList struct {
// List holds a list of objects, which may not be known by the server. // List holds a list of objects, which may not be known by the server.
type List struct { type List struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of objects // List of objects
Items []runtime.RawExtension `json:"items" protobuf:"bytes,2,rep,name=items"` Items []runtime.RawExtension `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -3599,7 +3589,7 @@ type LimitRangeSpec struct {
// LimitRange sets resource usage limits for each kind of resource in a Namespace. // LimitRange sets resource usage limits for each kind of resource in a Namespace.
type LimitRange struct { type LimitRange struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3613,11 +3603,11 @@ type LimitRange struct {
// LimitRangeList is a list of LimitRange items. // LimitRangeList is a list of LimitRange items.
type LimitRangeList struct { type LimitRangeList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is a list of LimitRange objects. // Items is a list of LimitRange objects.
// More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md
@ -3697,7 +3687,7 @@ type ResourceQuotaStatus struct {
// ResourceQuota sets aggregate quota restrictions enforced per namespace // ResourceQuota sets aggregate quota restrictions enforced per namespace
type ResourceQuota struct { type ResourceQuota struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3716,11 +3706,11 @@ type ResourceQuota struct {
// ResourceQuotaList is a list of ResourceQuota items. // ResourceQuotaList is a list of ResourceQuota items.
type ResourceQuotaList struct { type ResourceQuotaList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is a list of ResourceQuota objects. // Items is a list of ResourceQuota objects.
// More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota
@ -3732,7 +3722,7 @@ type ResourceQuotaList struct {
// Secret holds secret data of a certain type. The total bytes of the values in // Secret holds secret data of a certain type. The total bytes of the values in
// the Data field must be less than MaxSecretSize bytes. // the Data field must be less than MaxSecretSize bytes.
type Secret struct { type Secret struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3844,11 +3834,11 @@ const (
// SecretList is a list of Secret. // SecretList is a list of Secret.
type SecretList struct { type SecretList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is a list of secret objects. // Items is a list of secret objects.
// More info: http://kubernetes.io/docs/user-guide/secrets // More info: http://kubernetes.io/docs/user-guide/secrets
@ -3859,7 +3849,7 @@ type SecretList struct {
// ConfigMap holds configuration data for pods to consume. // ConfigMap holds configuration data for pods to consume.
type ConfigMap struct { type ConfigMap struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3873,11 +3863,11 @@ type ConfigMap struct {
// ConfigMapList is a resource containing a list of ConfigMap objects. // ConfigMapList is a resource containing a list of ConfigMap objects.
type ConfigMapList struct { type ConfigMapList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is the list of ConfigMaps. // Items is the list of ConfigMaps.
Items []ConfigMap `json:"items" protobuf:"bytes,2,rep,name=items"` Items []ConfigMap `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -3914,7 +3904,7 @@ type ComponentCondition struct {
// ComponentStatus (and ComponentStatusList) holds the cluster validation info. // ComponentStatus (and ComponentStatusList) holds the cluster validation info.
type ComponentStatus struct { type ComponentStatus struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -3927,11 +3917,11 @@ type ComponentStatus struct {
// Status of all the conditions for the component as a list of ComponentStatus objects. // Status of all the conditions for the component as a list of ComponentStatus objects.
type ComponentStatusList struct { type ComponentStatusList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// List of ComponentStatus objects. // List of ComponentStatus objects.
Items []ComponentStatus `json:"items" protobuf:"bytes,2,rep,name=items"` Items []ComponentStatus `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -4032,7 +4022,7 @@ type SELinuxOptions struct {
// RangeAllocation is not a public type. // RangeAllocation is not a public type.
type RangeAllocation struct { type RangeAllocation struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -4056,5 +4046,5 @@ const (
// When the --failure-domains scheduler flag is not specified, // When the --failure-domains scheduler flag is not specified,
// DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. // DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity.
DefaultFailureDomains string = unversioned.LabelHostname + "," + unversioned.LabelZoneFailureDomain + "," + unversioned.LabelZoneRegion DefaultFailureDomains string = metav1.LabelHostname + "," + metav1.LabelZoneFailureDomain + "," + metav1.LabelZoneRegion
) )

12
pkg/api/v1/types_swagger_doc_generated.go
View File

@ -493,16 +493,6 @@ func (ExecAction) SwaggerDoc() map[string]string {
return map_ExecAction return map_ExecAction
} }
var map_ExportOptions = map[string]string{
"": "ExportOptions is the query options to the standard REST get call.",
"export": "Should this value be exported. Export strips fields that a user can not specify.",
"exact": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'",
}
func (ExportOptions) SwaggerDoc() map[string]string {
return map_ExportOptions
}
var map_FCVolumeSource = map[string]string{ var map_FCVolumeSource = map[string]string{
"": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.", "": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.",
"targetWWNs": "Required: FC target worldwide names (WWNs)", "targetWWNs": "Required: FC target worldwide names (WWNs)",
@ -901,7 +891,7 @@ var map_NodeSpec = map[string]string{
"podCIDR": "PodCIDR represents the pod IP range assigned to the node.", "podCIDR": "PodCIDR represents the pod IP range assigned to the node.",
"externalID": "External ID of the node assigned by some machine database (e.g. a cloud provider). Deprecated.", "externalID": "External ID of the node assigned by some machine database (e.g. a cloud provider). Deprecated.",
"providerID": "ID of the node assigned by the cloud provider in the format: <ProviderName>://<ProviderSpecificNodeID>", "providerID": "ID of the node assigned by the cloud provider in the format: <ProviderName>://<ProviderSpecificNodeID>",
"unschedulable": "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration\"", "unschedulable": "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration",
} }
func (NodeSpec) SwaggerDoc() map[string]string { func (NodeSpec) SwaggerDoc() map[string]string {

44
pkg/api/v1/zz_generated.conversion.go
View File

@ -22,7 +22,7 @@ package v1
import ( import (
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
unversioned "k8s.io/client-go/pkg/api/unversioned" meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
types "k8s.io/client-go/pkg/types" types "k8s.io/client-go/pkg/types"
@ -119,8 +119,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
Convert_api_EventSource_To_v1_EventSource, Convert_api_EventSource_To_v1_EventSource,
Convert_v1_ExecAction_To_api_ExecAction, Convert_v1_ExecAction_To_api_ExecAction,
Convert_api_ExecAction_To_v1_ExecAction, Convert_api_ExecAction_To_v1_ExecAction,
Convert_v1_ExportOptions_To_api_ExportOptions,
Convert_api_ExportOptions_To_v1_ExportOptions,
Convert_v1_FCVolumeSource_To_api_FCVolumeSource, Convert_v1_FCVolumeSource_To_api_FCVolumeSource,
Convert_api_FCVolumeSource_To_v1_FCVolumeSource, Convert_api_FCVolumeSource_To_v1_FCVolumeSource,
Convert_v1_FlexVolumeSource_To_api_FlexVolumeSource, Convert_v1_FlexVolumeSource_To_api_FlexVolumeSource,
@ -1344,26 +1342,6 @@ func Convert_api_ExecAction_To_v1_ExecAction(in *api.ExecAction, out *ExecAction
return autoConvert_api_ExecAction_To_v1_ExecAction(in, out, s) return autoConvert_api_ExecAction_To_v1_ExecAction(in, out, s)
} }
func autoConvert_v1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error {
out.Export = in.Export
out.Exact = in.Exact
return nil
}
func Convert_v1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error {
return autoConvert_v1_ExportOptions_To_api_ExportOptions(in, out, s)
}
func autoConvert_api_ExportOptions_To_v1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error {
out.Export = in.Export
out.Exact = in.Exact
return nil
}
func Convert_api_ExportOptions_To_v1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error {
return autoConvert_api_ExportOptions_To_v1_ExportOptions(in, out, s)
}
func autoConvert_v1_FCVolumeSource_To_api_FCVolumeSource(in *FCVolumeSource, out *api.FCVolumeSource, s conversion.Scope) error { func autoConvert_v1_FCVolumeSource_To_api_FCVolumeSource(in *FCVolumeSource, out *api.FCVolumeSource, s conversion.Scope) error {
out.TargetWWNs = *(*[]string)(unsafe.Pointer(&in.TargetWWNs)) out.TargetWWNs = *(*[]string)(unsafe.Pointer(&in.TargetWWNs))
out.Lun = (*int32)(unsafe.Pointer(in.Lun)) out.Lun = (*int32)(unsafe.Pointer(in.Lun))
@ -2365,7 +2343,7 @@ func autoConvert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *api.Object
out.ResourceVersion = in.ResourceVersion out.ResourceVersion = in.ResourceVersion
out.Generation = in.Generation out.Generation = in.Generation
out.CreationTimestamp = in.CreationTimestamp out.CreationTimestamp = in.CreationTimestamp
out.DeletionTimestamp = (*unversioned.Time)(unsafe.Pointer(in.DeletionTimestamp)) out.DeletionTimestamp = (*meta_v1.Time)(unsafe.Pointer(in.DeletionTimestamp))
out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds)) out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds))
out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels))
out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations))
@ -2388,7 +2366,7 @@ func autoConvert_api_ObjectMeta_To_v1_ObjectMeta(in *api.ObjectMeta, out *Object
out.ResourceVersion = in.ResourceVersion out.ResourceVersion = in.ResourceVersion
out.Generation = in.Generation out.Generation = in.Generation
out.CreationTimestamp = in.CreationTimestamp out.CreationTimestamp = in.CreationTimestamp
out.DeletionTimestamp = (*unversioned.Time)(unsafe.Pointer(in.DeletionTimestamp)) out.DeletionTimestamp = (*meta_v1.Time)(unsafe.Pointer(in.DeletionTimestamp))
out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds)) out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds))
out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels))
out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations))
@ -2548,7 +2526,7 @@ func Convert_api_PersistentVolumeClaimList_To_v1_PersistentVolumeClaimList(in *a
func autoConvert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *api.PersistentVolumeClaimSpec, s conversion.Scope) error { func autoConvert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *api.PersistentVolumeClaimSpec, s conversion.Scope) error {
out.AccessModes = *(*[]api.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) out.AccessModes = *(*[]api.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes))
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := Convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { if err := Convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
return err return err
} }
@ -2562,7 +2540,7 @@ func Convert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *P
func autoConvert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *api.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error { func autoConvert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *api.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error {
out.AccessModes = *(*[]PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) out.AccessModes = *(*[]PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes))
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := Convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { if err := Convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
return err return err
} }
@ -2825,7 +2803,7 @@ func Convert_api_PodAffinity_To_v1_PodAffinity(in *api.PodAffinity, out *PodAffi
} }
func autoConvert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out *api.PodAffinityTerm, s conversion.Scope) error { func autoConvert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out *api.PodAffinityTerm, s conversion.Scope) error {
out.LabelSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector))
out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces))
out.TopologyKey = in.TopologyKey out.TopologyKey = in.TopologyKey
return nil return nil
@ -2836,7 +2814,7 @@ func Convert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out
} }
func autoConvert_api_PodAffinityTerm_To_v1_PodAffinityTerm(in *api.PodAffinityTerm, out *PodAffinityTerm, s conversion.Scope) error { func autoConvert_api_PodAffinityTerm_To_v1_PodAffinityTerm(in *api.PodAffinityTerm, out *PodAffinityTerm, s conversion.Scope) error {
out.LabelSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector))
out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces))
out.TopologyKey = in.TopologyKey out.TopologyKey = in.TopologyKey
return nil return nil
@ -2993,7 +2971,7 @@ func autoConvert_v1_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *a
out.Follow = in.Follow out.Follow = in.Follow
out.Previous = in.Previous out.Previous = in.Previous
out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds))
out.SinceTime = (*unversioned.Time)(unsafe.Pointer(in.SinceTime)) out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime))
out.Timestamps = in.Timestamps out.Timestamps = in.Timestamps
out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.TailLines = (*int64)(unsafe.Pointer(in.TailLines))
out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes))
@ -3009,7 +2987,7 @@ func autoConvert_api_PodLogOptions_To_v1_PodLogOptions(in *api.PodLogOptions, ou
out.Follow = in.Follow out.Follow = in.Follow
out.Previous = in.Previous out.Previous = in.Previous
out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds))
out.SinceTime = (*unversioned.Time)(unsafe.Pointer(in.SinceTime)) out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime))
out.Timestamps = in.Timestamps out.Timestamps = in.Timestamps
out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.TailLines = (*int64)(unsafe.Pointer(in.TailLines))
out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes))
@ -3160,7 +3138,7 @@ func autoConvert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus
out.Reason = in.Reason out.Reason = in.Reason
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.PodIP = in.PodIP out.PodIP = in.PodIP
out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
out.InitContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.InitContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses))
out.ContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) out.ContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses))
return nil return nil
@ -3177,7 +3155,7 @@ func autoConvert_api_PodStatus_To_v1_PodStatus(in *api.PodStatus, out *PodStatus
out.Reason = in.Reason out.Reason = in.Reason
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.PodIP = in.PodIP out.PodIP = in.PodIP
out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
out.InitContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.InitContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses))
out.ContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) out.ContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses))
return nil return nil

28
pkg/api/v1/zz_generated.deepcopy.go
View File

@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
unversioned "k8s.io/client-go/pkg/api/unversioned" meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
types "k8s.io/client-go/pkg/types" types "k8s.io/client-go/pkg/types"
@ -77,7 +77,6 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventList, InType: reflect.TypeOf(&EventList{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventList, InType: reflect.TypeOf(&EventList{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventSource, InType: reflect.TypeOf(&EventSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventSource, InType: reflect.TypeOf(&EventSource{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ExecAction, InType: reflect.TypeOf(&ExecAction{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ExecAction, InType: reflect.TypeOf(&ExecAction{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ExportOptions, InType: reflect.TypeOf(&ExportOptions{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})},
@ -1087,17 +1086,6 @@ func DeepCopy_v1_ExecAction(in interface{}, out interface{}, c *conversion.Clone
} }
} }
func DeepCopy_v1_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*ExportOptions)
out := out.(*ExportOptions)
out.TypeMeta = in.TypeMeta
out.Export = in.Export
out.Exact = in.Exact
return nil
}
}
func DeepCopy_v1_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_v1_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*FCVolumeSource) in := in.(*FCVolumeSource)
@ -1895,7 +1883,7 @@ func DeepCopy_v1_ObjectMeta(in interface{}, out interface{}, c *conversion.Clone
out.CreationTimestamp = in.CreationTimestamp.DeepCopy() out.CreationTimestamp = in.CreationTimestamp.DeepCopy()
if in.DeletionTimestamp != nil { if in.DeletionTimestamp != nil {
in, out := &in.DeletionTimestamp, &out.DeletionTimestamp in, out := &in.DeletionTimestamp, &out.DeletionTimestamp
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.DeletionTimestamp = nil out.DeletionTimestamp = nil
@ -2052,8 +2040,8 @@ func DeepCopy_v1_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *c
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(meta_v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {
@ -2374,8 +2362,8 @@ func DeepCopy_v1_PodAffinityTerm(in interface{}, out interface{}, c *conversion.
out := out.(*PodAffinityTerm) out := out.(*PodAffinityTerm)
if in.LabelSelector != nil { if in.LabelSelector != nil {
in, out := &in.LabelSelector, &out.LabelSelector in, out := &in.LabelSelector, &out.LabelSelector
*out = new(unversioned.LabelSelector) *out = new(meta_v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {
@ -2510,7 +2498,7 @@ func DeepCopy_v1_PodLogOptions(in interface{}, out interface{}, c *conversion.Cl
} }
if in.SinceTime != nil { if in.SinceTime != nil {
in, out := &in.SinceTime, &out.SinceTime in, out := &in.SinceTime, &out.SinceTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.SinceTime = nil out.SinceTime = nil
@ -2718,7 +2706,7 @@ func DeepCopy_v1_PodStatus(in interface{}, out interface{}, c *conversion.Cloner
out.PodIP = in.PodIP out.PodIP = in.PodIP
if in.StartTime != nil { if in.StartTime != nil {
in, out := &in.StartTime, &out.StartTime in, out := &in.StartTime, &out.StartTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.StartTime = nil out.StartTime = nil

28
pkg/api/zz_generated.deepcopy.go
View File

@ -21,7 +21,7 @@ limitations under the License.
package api package api
import ( import (
unversioned "k8s.io/client-go/pkg/api/unversioned" v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
fields "k8s.io/client-go/pkg/fields" fields "k8s.io/client-go/pkg/fields"
labels "k8s.io/client-go/pkg/labels" labels "k8s.io/client-go/pkg/labels"
@ -80,7 +80,6 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventList, InType: reflect.TypeOf(&EventList{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventList, InType: reflect.TypeOf(&EventList{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventSource, InType: reflect.TypeOf(&EventSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventSource, InType: reflect.TypeOf(&EventSource{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ExecAction, InType: reflect.TypeOf(&ExecAction{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ExecAction, InType: reflect.TypeOf(&ExecAction{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ExportOptions, InType: reflect.TypeOf(&ExportOptions{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})},
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})}, conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})},
@ -1113,17 +1112,6 @@ func DeepCopy_api_ExecAction(in interface{}, out interface{}, c *conversion.Clon
} }
} }
func DeepCopy_api_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error {
{
in := in.(*ExportOptions)
out := out.(*ExportOptions)
out.TypeMeta = in.TypeMeta
out.Export = in.Export
out.Exact = in.Exact
return nil
}
}
func DeepCopy_api_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { func DeepCopy_api_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error {
{ {
in := in.(*FCVolumeSource) in := in.(*FCVolumeSource)
@ -1935,7 +1923,7 @@ func DeepCopy_api_ObjectMeta(in interface{}, out interface{}, c *conversion.Clon
out.CreationTimestamp = in.CreationTimestamp.DeepCopy() out.CreationTimestamp = in.CreationTimestamp.DeepCopy()
if in.DeletionTimestamp != nil { if in.DeletionTimestamp != nil {
in, out := &in.DeletionTimestamp, &out.DeletionTimestamp in, out := &in.DeletionTimestamp, &out.DeletionTimestamp
*out = new(unversioned.Time) *out = new(v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.DeletionTimestamp = nil out.DeletionTimestamp = nil
@ -2092,8 +2080,8 @@ func DeepCopy_api_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {
@ -2414,8 +2402,8 @@ func DeepCopy_api_PodAffinityTerm(in interface{}, out interface{}, c *conversion
out := out.(*PodAffinityTerm) out := out.(*PodAffinityTerm)
if in.LabelSelector != nil { if in.LabelSelector != nil {
in, out := &in.LabelSelector, &out.LabelSelector in, out := &in.LabelSelector, &out.LabelSelector
*out = new(unversioned.LabelSelector) *out = new(v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {
@ -2550,7 +2538,7 @@ func DeepCopy_api_PodLogOptions(in interface{}, out interface{}, c *conversion.C
} }
if in.SinceTime != nil { if in.SinceTime != nil {
in, out := &in.SinceTime, &out.SinceTime in, out := &in.SinceTime, &out.SinceTime
*out = new(unversioned.Time) *out = new(v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.SinceTime = nil out.SinceTime = nil
@ -2757,7 +2745,7 @@ func DeepCopy_api_PodStatus(in interface{}, out interface{}, c *conversion.Clone
out.PodIP = in.PodIP out.PodIP = in.PodIP
if in.StartTime != nil { if in.StartTime != nil {
in, out := &in.StartTime, &out.StartTime in, out := &in.StartTime, &out.StartTime
*out = new(unversioned.Time) *out = new(v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.StartTime = nil out.StartTime = nil

21
pkg/apis/apps/OWNERS Executable file
View File

@ -0,0 +1,21 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- deads2k
- caesarxuchao
- bprashanth
- pmorie
- sttts
- saad-ali
- ncdc
- timstclair
- timothysc
- dims
- errordeveloper
- mml
- m1093782566
- mbohlool
- david-mcmahon
- kevin-wangzefeng
- jianhuiz

12
pkg/apis/apps/types.generated.go
View File

@ -27,7 +27,7 @@ import (
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/client-go/pkg/api" pkg2_api "k8s.io/client-go/pkg/api"
pkg4_resource "k8s.io/client-go/pkg/api/resource" pkg4_resource "k8s.io/client-go/pkg/api/resource"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
pkg5_intstr "k8s.io/client-go/pkg/util/intstr" pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
"reflect" "reflect"
@ -67,7 +67,7 @@ func init() {
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_api.ObjectMeta
var v1 pkg4_resource.Quantity var v1 pkg4_resource.Quantity
var v2 pkg1_unversioned.TypeMeta var v2 pkg1_v1.TypeMeta
var v3 pkg3_types.UID var v3 pkg3_types.UID
var v4 pkg5_intstr.IntOrString var v4 pkg5_intstr.IntOrString
var v5 time.Time var v5 time.Time
@ -648,7 +648,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym54 := z.DecBinary() yym54 := z.DecBinary()
_ = yym54 _ = yym54
@ -730,7 +730,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym62 := z.DecBinary() yym62 := z.DecBinary()
_ = yym62 _ = yym62
@ -1265,7 +1265,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv108 := &x.ListMeta yyv108 := &x.ListMeta
yym109 := z.DecBinary() yym109 := z.DecBinary()
@ -1346,7 +1346,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv115 := &x.ListMeta yyv115 := &x.ListMeta
yym116 := z.DecBinary() yym116 := z.DecBinary()

10
pkg/apis/apps/types.go
View File

@ -18,7 +18,7 @@ package apps
import ( import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
@ -30,7 +30,7 @@ import (
// The StatefulSet guarantees that a given network identity will always // The StatefulSet guarantees that a given network identity will always
// map to the same storage identity. // map to the same storage identity.
type StatefulSet struct { type StatefulSet struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
api.ObjectMeta `json:"metadata,omitempty"` api.ObjectMeta `json:"metadata,omitempty"`
@ -58,7 +58,7 @@ type StatefulSetSpec struct {
// If empty, defaulted to labels on the pod template. // If empty, defaulted to labels on the pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
// +optional // +optional
Selector *unversioned.LabelSelector `json:"selector,omitempty"` Selector *metav1.LabelSelector `json:"selector,omitempty"`
// Template is the object that describes the pod that will be created if // Template is the object that describes the pod that will be created if
// insufficient replicas are detected. Each pod stamped out by the StatefulSet // insufficient replicas are detected. Each pod stamped out by the StatefulSet
@ -96,8 +96,8 @@ type StatefulSetStatus struct {
// StatefulSetList is a collection of StatefulSets. // StatefulSetList is a collection of StatefulSets.
type StatefulSetList struct { type StatefulSetList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
Items []StatefulSet `json:"items"` Items []StatefulSet `json:"items"`
} }

6
pkg/apis/apps/v1beta1/conversion.go
View File

@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned"
v1 "k8s.io/client-go/pkg/api/v1" v1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/apis/apps" "k8s.io/client-go/pkg/apis/apps"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/conversion"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
) )
@ -58,7 +58,7 @@ func Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *StatefulSetSpec
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(metav1.LabelSelector)
if err := s.Convert(*in, *out, 0); err != nil { if err := s.Convert(*in, *out, 0); err != nil {
return err return err
} }
@ -88,7 +88,7 @@ func Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSe
*out.Replicas = in.Replicas *out.Replicas = in.Replicas
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(metav1.LabelSelector)
if err := s.Convert(*in, *out, 0); err != nil { if err := s.Convert(*in, *out, 0); err != nil {
return err return err
} }

4
pkg/apis/apps/v1beta1/defaults.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
) )
@ -32,7 +32,7 @@ func SetDefaults_StatefulSet(obj *StatefulSet) {
labels := obj.Spec.Template.Labels labels := obj.Spec.Template.Labels
if labels != nil { if labels != nil {
if obj.Spec.Selector == nil { if obj.Spec.Selector == nil {
obj.Spec.Selector = &unversioned.LabelSelector{ obj.Spec.Selector = &metav1.LabelSelector{
MatchLabels: labels, MatchLabels: labels,
} }
} }

90
pkg/apis/apps/v1beta1/generated.pb.go
View File

@ -36,8 +36,8 @@ import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned"
import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1"
import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
import strings "strings" import strings "strings"
import reflect "reflect" import reflect "reflect"
@ -354,7 +354,7 @@ func (this *StatefulSetList) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&StatefulSetList{`, s := strings.Join([]string{`&StatefulSetList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StatefulSet", "StatefulSet", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StatefulSet", "StatefulSet", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
@ -366,7 +366,7 @@ func (this *StatefulSetSpec) String() string {
} }
s := strings.Join([]string{`&StatefulSetSpec{`, s := strings.Join([]string{`&StatefulSetSpec{`,
`Replicas:` + valueToStringGenerated(this.Replicas) + `,`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`,
`Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`,
`Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`,
`VolumeClaimTemplates:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.VolumeClaimTemplates), "PersistentVolumeClaim", "k8s_io_kubernetes_pkg_api_v1.PersistentVolumeClaim", 1), `&`, ``, 1) + `,`, `VolumeClaimTemplates:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.VolumeClaimTemplates), "PersistentVolumeClaim", "k8s_io_kubernetes_pkg_api_v1.PersistentVolumeClaim", 1), `&`, ``, 1) + `,`,
`ServiceName:` + fmt.Sprintf("%v", this.ServiceName) + `,`, `ServiceName:` + fmt.Sprintf("%v", this.ServiceName) + `,`,
@ -720,7 +720,7 @@ func (m *StatefulSetSpec) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Selector == nil { if m.Selector == nil {
m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{}
} }
if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -1032,45 +1032,45 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 637 bytes of a gzipped FileDescriptorProto // 627 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x6e, 0xd3, 0x4c, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcb, 0x6e, 0xd3, 0x4c,
0x14, 0x86, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0xfe, 0x86, 0x0a, 0x45, 0x11, 0x72, 0xab, 0x6c, 0x14, 0xc7, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0x6e, 0x43, 0x85, 0xa2, 0x0a, 0xb9, 0x55, 0x36,
0x08, 0x52, 0x3b, 0x56, 0x4a, 0x2b, 0x2a, 0x96, 0x46, 0x02, 0x21, 0x01, 0x45, 0x0e, 0xaa, 0xa0, 0x04, 0xa9, 0x1d, 0x2b, 0xa5, 0x88, 0x8a, 0xa5, 0x91, 0x40, 0x48, 0x40, 0x91, 0x83, 0x2a, 0x28,
0x08, 0xa4, 0xb1, 0x73, 0x9a, 0x9a, 0xd8, 0x1e, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0xb8, 0xab, 0xb1, 0x73, 0x9a, 0x0e, 0xb1, 0x63, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0x78, 0x0b,
0x0b, 0x2e, 0x81, 0x5b, 0xa8, 0xc4, 0xa6, 0x4b, 0x56, 0x15, 0x0d, 0x37, 0x82, 0x3c, 0x99, 0x24, 0x5e, 0x80, 0x87, 0xc8, 0xb2, 0x4b, 0x56, 0x15, 0x0d, 0x2f, 0x82, 0x66, 0x32, 0xb9, 0x50, 0xbb,
0xa6, 0x4e, 0x4a, 0xd5, 0x9d, 0xcf, 0xcc, 0x79, 0x9f, 0xf3, 0x33, 0xaf, 0xc9, 0xc3, 0xc1, 0xae, 0xa1, 0xea, 0xce, 0xe7, 0xcc, 0xf9, 0xff, 0xce, 0xd5, 0xe4, 0x49, 0x7f, 0x5f, 0x32, 0x11, 0x3b,
0x64, 0xbe, 0xb0, 0x06, 0xa9, 0x0b, 0x49, 0x04, 0x08, 0xd2, 0x8a, 0x07, 0x7d, 0x8b, 0xc7, 0xbe, 0xfd, 0xcc, 0x87, 0x74, 0x00, 0x08, 0xd2, 0x49, 0xfa, 0x3d, 0x87, 0x27, 0x42, 0x3a, 0x3c, 0x49,
0xb4, 0x78, 0x1c, 0x4b, 0x6b, 0xd8, 0x71, 0x01, 0x79, 0xc7, 0xea, 0x43, 0x04, 0x09, 0x47, 0xe8, 0xa4, 0x33, 0x6c, 0xfb, 0x80, 0xbc, 0xed, 0xf4, 0x60, 0x00, 0x29, 0x47, 0xe8, 0xb2, 0x24, 0x8d,
0xb1, 0x38, 0x11, 0x28, 0xe8, 0xbd, 0xb1, 0x90, 0xcd, 0x84, 0x2c, 0x1e, 0xf4, 0x59, 0x26, 0x64, 0x31, 0xa6, 0x0f, 0x26, 0x42, 0x36, 0x17, 0xb2, 0xa4, 0xdf, 0x63, 0x4a, 0xc8, 0x94, 0x90, 0x19,
0x99, 0x90, 0x69, 0x61, 0x73, 0xb3, 0xef, 0xe3, 0x51, 0xea, 0x32, 0x4f, 0x84, 0x56, 0x5f, 0xf4, 0xe1, 0xc6, 0x4e, 0x4f, 0xe0, 0x49, 0xe6, 0xb3, 0x20, 0x8e, 0x9c, 0x5e, 0xdc, 0x8b, 0x1d, 0xad,
0x85, 0xa5, 0xf4, 0x6e, 0x7a, 0xa8, 0x22, 0x15, 0xa8, 0xaf, 0x31, 0xb7, 0xb9, 0xb5, 0xb0, 0x21, 0xf7, 0xb3, 0x63, 0x6d, 0x69, 0x43, 0x7f, 0x4d, 0xb8, 0x1b, 0xbb, 0x97, 0x16, 0xe4, 0xa4, 0x20,
0x2b, 0x01, 0x29, 0xd2, 0xc4, 0x83, 0xf3, 0xbd, 0x34, 0x77, 0x16, 0x6b, 0xd2, 0x68, 0x08, 0x89, 0xe3, 0x2c, 0x0d, 0xe0, 0x62, 0x2d, 0x1b, 0xdb, 0x97, 0x6b, 0x86, 0xb9, 0xca, 0x97, 0x64, 0x90,
0xf4, 0x45, 0x04, 0xbd, 0x82, 0x6c, 0x63, 0xb1, 0x6c, 0x58, 0x18, 0xb8, 0xb9, 0x39, 0x3f, 0x3b, 0x4e, 0x04, 0xc8, 0x8b, 0x34, 0x3b, 0xc5, 0x9a, 0x34, 0x1b, 0xa0, 0x88, 0xf2, 0x05, 0xed, 0x2d,
0x49, 0x23, 0xf4, 0xc3, 0x62, 0x4f, 0xdb, 0x17, 0xa7, 0x4b, 0xef, 0x08, 0x42, 0x5e, 0x50, 0x75, 0x0f, 0x97, 0xc1, 0x09, 0x44, 0x3c, 0xa7, 0x6a, 0x17, 0xab, 0x32, 0x14, 0xa1, 0x23, 0x06, 0x28,
0xe6, 0xab, 0x52, 0xf4, 0x03, 0xcb, 0x8f, 0x50, 0x62, 0x72, 0x5e, 0xd2, 0xfa, 0x56, 0x26, 0xf5, 0x31, 0xbd, 0x28, 0x69, 0x7e, 0x2f, 0x93, 0x7a, 0x07, 0x39, 0xc2, 0x71, 0x16, 0x76, 0x00, 0xe9,
0x2e, 0x72, 0x84, 0xc3, 0x34, 0xe8, 0x02, 0xd2, 0x37, 0xa4, 0x16, 0x02, 0xf2, 0x1e, 0x47, 0xde, 0x7b, 0x52, 0x53, 0x2d, 0x74, 0x39, 0xf2, 0x86, 0xb5, 0x65, 0xb5, 0xea, 0xbb, 0x2d, 0x76, 0xe9,
0x30, 0xd6, 0x8d, 0x76, 0x7d, 0xab, 0xcd, 0x16, 0xbe, 0x15, 0x1b, 0x76, 0xd8, 0x9e, 0xfb, 0x11, 0xa2, 0xd8, 0xb0, 0xcd, 0x0e, 0xfc, 0x4f, 0x10, 0xe0, 0x6b, 0x40, 0xee, 0xd2, 0xd1, 0xd9, 0x66,
0x3c, 0x7c, 0x01, 0xc8, 0x6d, 0x7a, 0x7c, 0xba, 0x56, 0x1a, 0x9d, 0xae, 0x91, 0xd9, 0x99, 0x33, 0x69, 0x7c, 0xb6, 0x49, 0xe6, 0x3e, 0x6f, 0x46, 0xa3, 0x47, 0x64, 0x45, 0x26, 0x10, 0x34, 0xca,
0xa5, 0xd1, 0x03, 0xb2, 0x24, 0x63, 0xf0, 0x1a, 0x65, 0x45, 0xdd, 0x65, 0x97, 0x74, 0x00, 0xcb, 0x9a, 0xba, 0xcf, 0xae, 0xb8, 0x7e, 0xb6, 0x50, 0x5d, 0x27, 0x81, 0xc0, 0x5d, 0x33, 0x59, 0x56,
0x75, 0xd7, 0x8d, 0xc1, 0xb3, 0x57, 0x74, 0x95, 0xa5, 0x2c, 0x72, 0x14, 0x93, 0xba, 0x64, 0x59, 0x94, 0xe5, 0x69, 0x26, 0xf5, 0xc9, 0xaa, 0x44, 0x8e, 0x99, 0x6c, 0x54, 0x34, 0xfd, 0xe9, 0xb5,
0x22, 0xc7, 0x54, 0x36, 0x2a, 0x8a, 0xfe, 0xe8, 0x4a, 0x74, 0x45, 0xb0, 0xaf, 0x6b, 0xfe, 0xf2, 0xe8, 0x9a, 0xe0, 0xde, 0x34, 0xfc, 0xd5, 0x89, 0xed, 0x19, 0x72, 0x73, 0x64, 0x91, 0x5b, 0x0b,
0x38, 0x76, 0x34, 0xb9, 0xf5, 0xc3, 0x20, 0x37, 0x72, 0xd9, 0xcf, 0x7d, 0x89, 0xf4, 0x7d, 0x61, 0xd1, 0xaf, 0x84, 0x44, 0x7a, 0x94, 0x9b, 0xd6, 0xf6, 0xb2, 0xcc, 0x2a, 0x56, 0xcd, 0x4c, 0x69,
0x5b, 0xd6, 0x05, 0xdb, 0xca, 0xb9, 0x89, 0x65, 0x72, 0xb5, 0xb4, 0x9b, 0xba, 0x5c, 0x6d, 0x72, 0xf5, 0xc4, 0x6e, 0x9b, 0x5c, 0xb5, 0xa9, 0x67, 0x61, 0x5e, 0x1f, 0x48, 0x55, 0x20, 0x44, 0xb2,
0x92, 0x5b, 0xd9, 0x5b, 0x52, 0xf5, 0x11, 0x42, 0xd9, 0x28, 0xaf, 0x57, 0xda, 0xf5, 0xad, 0xed, 0x51, 0xde, 0xaa, 0xb4, 0xea, 0xbb, 0x7b, 0xd7, 0x69, 0xc9, 0xbd, 0x61, 0x12, 0x54, 0x5f, 0x2a,
0xab, 0x4c, 0x65, 0x5f, 0xd3, 0x05, 0xaa, 0xcf, 0x32, 0x94, 0x33, 0x26, 0xb6, 0xbe, 0x57, 0xfe, 0x94, 0x37, 0x21, 0x36, 0x7f, 0x54, 0xfe, 0x6a, 0x45, 0x0d, 0x92, 0xb6, 0x48, 0x2d, 0x85, 0x24,
0x9a, 0x26, 0xdb, 0x25, 0x6d, 0x93, 0x5a, 0x02, 0x71, 0xe0, 0x7b, 0x5c, 0xaa, 0x69, 0xaa, 0xf6, 0x14, 0x01, 0x97, 0xba, 0x95, 0xaa, 0xbb, 0xa6, 0x0a, 0xf3, 0x8c, 0xcf, 0x9b, 0xbd, 0xd2, 0x8f,
0x4a, 0xd6, 0x98, 0xa3, 0xcf, 0x9c, 0xe9, 0x2d, 0xfd, 0x40, 0x6a, 0x12, 0x02, 0xf0, 0x50, 0x24, 0xa4, 0x26, 0x21, 0x84, 0x00, 0xe3, 0xd4, 0x2c, 0xb3, 0x7d, 0xa5, 0xa6, 0xb9, 0x0f, 0x61, 0xc7,
0xfa, 0x3d, 0xb7, 0x2f, 0x3b, 0x37, 0x77, 0x21, 0xe8, 0x6a, 0xed, 0x98, 0x3f, 0x89, 0x9c, 0x29, 0x08, 0x27, 0xf0, 0xa9, 0xe5, 0xcd, 0x80, 0x0a, 0x8e, 0x10, 0x25, 0x21, 0x47, 0x30, 0xbb, 0xdc,
0x93, 0xbe, 0x23, 0x35, 0x84, 0x30, 0x0e, 0x38, 0x82, 0x7e, 0xd1, 0xcd, 0x8b, 0x5d, 0xf8, 0x4a, 0x59, 0x7e, 0x7f, 0x6f, 0xe3, 0xee, 0x3b, 0x23, 0xd0, 0xe7, 0x31, 0x1b, 0xe9, 0xd4, 0xeb, 0xcd,
0xf4, 0x5e, 0x6b, 0x81, 0x32, 0xc9, 0x74, 0xab, 0x93, 0x53, 0x67, 0x0a, 0xa4, 0x9f, 0x0d, 0xb2, 0x80, 0xf4, 0x8b, 0x45, 0xd6, 0x87, 0x71, 0x98, 0x45, 0xf0, 0x2c, 0xe4, 0x22, 0x9a, 0x46, 0xc8,
0x3a, 0x14, 0x41, 0x1a, 0xc2, 0xe3, 0x80, 0xfb, 0xe1, 0x24, 0x43, 0x36, 0x96, 0xd4, 0x96, 0x1f, 0xc6, 0x8a, 0x1e, 0xf1, 0xa3, 0x7f, 0x64, 0x82, 0x54, 0x0a, 0x89, 0x30, 0xc0, 0xc3, 0x39, 0xc3,
0xfc, 0xa3, 0x52, 0x36, 0x8a, 0x44, 0x88, 0x70, 0x7f, 0xc6, 0xb0, 0xef, 0xea, 0x7a, 0xab, 0xfb, 0xbd, 0x6f, 0xf2, 0xad, 0x1f, 0x16, 0x80, 0xbd, 0xc2, 0x74, 0xf4, 0x31, 0xa9, 0x4b, 0x48, 0x87,
0x73, 0xc0, 0xce, 0xdc, 0x72, 0x74, 0x87, 0xd4, 0x25, 0x24, 0x43, 0xdf, 0x83, 0x97, 0x3c, 0x84, 0x22, 0x80, 0x37, 0x3c, 0x82, 0x46, 0x75, 0xcb, 0x6a, 0xfd, 0xef, 0xde, 0x35, 0xa0, 0x7a, 0x67,
0x46, 0x75, 0xdd, 0x68, 0xff, 0x6f, 0xdf, 0xd6, 0xa0, 0x7a, 0x77, 0x76, 0xe5, 0xe4, 0xf3, 0x5a, 0xfe, 0xe4, 0x2d, 0xc6, 0x35, 0xbf, 0x5a, 0xe4, 0x4e, 0xee, 0x5e, 0xe9, 0x73, 0x42, 0x63, 0x5f,
0x5f, 0x0c, 0x72, 0xab, 0xe0, 0x5a, 0xfa, 0x84, 0x50, 0xe1, 0x66, 0x69, 0xd0, 0x7b, 0x3a, 0xfe, 0x85, 0x41, 0xf7, 0xc5, 0xe4, 0xe7, 0x16, 0xf1, 0x40, 0xaf, 0xb0, 0xe2, 0xde, 0x1b, 0x9f, 0x6d,
0xc5, 0x7d, 0x11, 0xa9, 0x57, 0xac, 0xd8, 0x77, 0x46, 0xa7, 0x6b, 0x74, 0xaf, 0x70, 0xeb, 0xcc, 0xd2, 0x83, 0xdc, 0xab, 0x57, 0xa0, 0xa0, 0xdb, 0x0b, 0x07, 0x50, 0xd6, 0x07, 0x30, 0x1b, 0x65,
0x51, 0xd0, 0x8d, 0x9c, 0x07, 0xca, 0xca, 0x03, 0xd3, 0x55, 0x16, 0x7d, 0x60, 0xdf, 0x3f, 0x3e, 0xfe, 0x08, 0xdc, 0x87, 0xa3, 0x73, 0xbb, 0x74, 0x7a, 0x6e, 0x97, 0x7e, 0x9e, 0xdb, 0xa5, 0xcf,
0x33, 0x4b, 0x27, 0x67, 0x66, 0xe9, 0xe7, 0x99, 0x59, 0xfa, 0x34, 0x32, 0x8d, 0xe3, 0x91, 0x69, 0x63, 0xdb, 0x1a, 0x8d, 0x6d, 0xeb, 0x74, 0x6c, 0x5b, 0xbf, 0xc6, 0xb6, 0xf5, 0xed, 0xb7, 0x5d,
0x9c, 0x8c, 0x4c, 0xe3, 0xd7, 0xc8, 0x34, 0xbe, 0xfe, 0x36, 0x4b, 0x07, 0xff, 0x69, 0x4b, 0xfe, 0x3a, 0xfa, 0xcf, 0xdc, 0xe3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x47, 0x2a, 0x55, 0x22,
0x09, 0x00, 0x00, 0xff, 0xff, 0x64, 0x32, 0x5a, 0xad, 0x2b, 0x06, 0x00, 0x00, 0x06, 0x00, 0x00,
} }

6
pkg/apis/apps/v1beta1/generated.proto
View File

@ -22,8 +22,8 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.apis.apps.v1beta1; package k8s.io.kubernetes.pkg.apis.apps.v1beta1;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/api/unversioned/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/meta/v1/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
@ -54,7 +54,7 @@ message StatefulSet {
// StatefulSetList is a collection of StatefulSets. // StatefulSetList is a collection of StatefulSets.
message StatefulSetList { message StatefulSetList {
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
repeated StatefulSet items = 2; repeated StatefulSet items = 2;
} }
@ -73,7 +73,7 @@ message StatefulSetSpec {
// If empty, defaulted to labels on the pod template. // If empty, defaulted to labels on the pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2;
// Template is the object that describes the pod that will be created if // Template is the object that describes the pod that will be created if
// insufficient replicas are detected. Each pod stamped out by the StatefulSet // insufficient replicas are detected. Each pod stamped out by the StatefulSet

8
pkg/apis/apps/v1beta1/register.go
View File

@ -18,6 +18,7 @@ package v1beta1
import ( import (
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
versionedwatch "k8s.io/client-go/pkg/watch/versioned" versionedwatch "k8s.io/client-go/pkg/watch/versioned"
@ -29,6 +30,11 @@ const GroupName = "apps"
// 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: "v1beta1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
@ -41,7 +47,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&StatefulSetList{}, &StatefulSetList{},
&v1.ListOptions{}, &v1.ListOptions{},
&v1.DeleteOptions{}, &v1.DeleteOptions{},
&v1.ExportOptions{}, &metav1.ExportOptions{},
) )
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil return nil

14
pkg/apis/apps/v1beta1/types.generated.go
View File

@ -26,8 +26,8 @@ import (
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg4_resource "k8s.io/client-go/pkg/api/resource" pkg4_resource "k8s.io/client-go/pkg/api/resource"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned"
pkg2_v1 "k8s.io/client-go/pkg/api/v1" pkg2_v1 "k8s.io/client-go/pkg/api/v1"
pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
pkg5_intstr "k8s.io/client-go/pkg/util/intstr" pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
"reflect" "reflect"
@ -66,8 +66,8 @@ func init() {
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg4_resource.Quantity var v0 pkg4_resource.Quantity
var v1 pkg1_unversioned.TypeMeta var v1 pkg2_v1.ObjectMeta
var v2 pkg2_v1.ObjectMeta var v2 pkg1_v1.TypeMeta
var v3 pkg3_types.UID var v3 pkg3_types.UID
var v4 pkg5_intstr.IntOrString var v4 pkg5_intstr.IntOrString
var v5 time.Time var v5 time.Time
@ -668,7 +668,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym57 := z.DecBinary() yym57 := z.DecBinary()
_ = yym57 _ = yym57
@ -760,7 +760,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym66 := z.DecBinary() yym66 := z.DecBinary()
_ = yym66 _ = yym66
@ -1295,7 +1295,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv112 := &x.ListMeta yyv112 := &x.ListMeta
yym113 := z.DecBinary() yym113 := z.DecBinary()
@ -1376,7 +1376,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv119 := &x.ListMeta yyv119 := &x.ListMeta
yym120 := z.DecBinary() yym120 := z.DecBinary()

10
pkg/apis/apps/v1beta1/types.go
View File

@ -17,8 +17,8 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
@ -30,7 +30,7 @@ import (
// The StatefulSet guarantees that a given network identity will always // The StatefulSet guarantees that a given network identity will always
// map to the same storage identity. // map to the same storage identity.
type StatefulSet struct { type StatefulSet struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -58,7 +58,7 @@ type StatefulSetSpec struct {
// If empty, defaulted to labels on the pod template. // If empty, defaulted to labels on the pod template.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
// +optional // +optional
Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"`
// Template is the object that describes the pod that will be created if // Template is the object that describes the pod that will be created if
// insufficient replicas are detected. Each pod stamped out by the StatefulSet // insufficient replicas are detected. Each pod stamped out by the StatefulSet
@ -96,8 +96,8 @@ type StatefulSetStatus struct {
// StatefulSetList is a collection of StatefulSets. // StatefulSetList is a collection of StatefulSets.
type StatefulSetList struct { type StatefulSetList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"`
} }

14
pkg/apis/apps/v1beta1/zz_generated.conversion.go
View File

@ -22,9 +22,9 @@ package v1beta1
import ( import (
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
unversioned "k8s.io/client-go/pkg/api/unversioned" api_v1 "k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/client-go/pkg/api/v1"
apps "k8s.io/client-go/pkg/apis/apps" apps "k8s.io/client-go/pkg/apis/apps"
v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
unsafe "unsafe" unsafe "unsafe"
@ -129,8 +129,8 @@ func autoConvert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *StatefulSet
if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]api.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]api.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))
@ -142,11 +142,11 @@ func autoConvert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.Statef
if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]api_v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))
out.ServiceName = in.ServiceName out.ServiceName = in.ServiceName
return nil return nil
} }

6
pkg/apis/apps/v1beta1/zz_generated.deepcopy.go
View File

@ -21,8 +21,8 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
unversioned "k8s.io/client-go/pkg/api/unversioned"
v1 "k8s.io/client-go/pkg/api/v1" v1 "k8s.io/client-go/pkg/api/v1"
meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
reflect "reflect" reflect "reflect"
@ -95,8 +95,8 @@ func DeepCopy_v1beta1_StatefulSetSpec(in interface{}, out interface{}, c *conver
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(meta_v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {

6
pkg/apis/apps/zz_generated.deepcopy.go
View File

@ -22,7 +22,7 @@ package apps
import ( import (
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
unversioned "k8s.io/client-go/pkg/api/unversioned" v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
reflect "reflect" reflect "reflect"
@ -89,8 +89,8 @@ func DeepCopy_apps_StatefulSetSpec(in interface{}, out interface{}, c *conversio
out.Replicas = in.Replicas out.Replicas = in.Replicas
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {

8
pkg/apis/authentication/OWNERS Executable file
View File

@ -0,0 +1,8 @@
reviewers:
- lavalamp
- wojtek-t
- deads2k
- sttts
- timothysc
- mbohlool
- jianhuiz

3
pkg/apis/authentication/register.go
View File

@ -18,6 +18,7 @@ package authentication
import ( import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
) )
@ -47,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&api.ListOptions{}, &api.ListOptions{},
&api.DeleteOptions{}, &api.DeleteOptions{},
&api.ExportOptions{}, &metav1.ExportOptions{},
&TokenReview{}, &TokenReview{},
) )

16
pkg/apis/authentication/types.generated.go
View File

@ -26,7 +26,7 @@ import (
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/client-go/pkg/api" pkg2_api "k8s.io/client-go/pkg/api"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
"reflect" "reflect"
"runtime" "runtime"
@ -64,7 +64,7 @@ func init() {
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_api.ObjectMeta
var v1 pkg1_unversioned.TypeMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
_, _, _, _ = v0, v1, v2, v3 _, _, _, _ = v0, v1, v2, v3
@ -784,7 +784,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "creationTimestamp": case "creationTimestamp":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv76 := &x.CreationTimestamp yyv76 := &x.CreationTimestamp
yym77 := z.DecBinary() yym77 := z.DecBinary()
@ -801,7 +801,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "deletionTimestamp": case "deletionTimestamp":
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
if x.DeletionTimestamp != nil { if x.DeletionTimestamp != nil {
@ -809,7 +809,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym79 := z.DecBinary() yym79 := z.DecBinary()
_ = yym79 _ = yym79
@ -1080,7 +1080,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv103 := &x.CreationTimestamp yyv103 := &x.CreationTimestamp
yym104 := z.DecBinary() yym104 := z.DecBinary()
@ -1096,7 +1096,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} }
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
yyj93++ yyj93++
if yyhl93 { if yyhl93 {
@ -1115,7 +1115,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym106 := z.DecBinary() yym106 := z.DecBinary()
_ = yym106 _ = yym106

4
pkg/apis/authentication/types.go
View File

@ -18,7 +18,7 @@ package authentication
import ( import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
const ( const (
@ -42,7 +42,7 @@ const (
// TokenReview attempts to authenticate a token to a known user. // TokenReview attempts to authenticate a token to a known user.
type TokenReview struct { type TokenReview struct {
unversioned.TypeMeta metav1.TypeMeta
// ObjectMeta fulfills the meta.ObjectMetaAccessor interface so that the stock // ObjectMeta fulfills the meta.ObjectMetaAccessor interface so that the stock
// REST handler paths work // REST handler paths work
api.ObjectMeta api.ObjectMeta

84
pkg/apis/authentication/v1beta1/generated.pb.go
View File

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

2
pkg/apis/authentication/v1beta1/generated.proto
View File

@ -22,8 +22,8 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.apis.authentication.v1beta1; package k8s.io.kubernetes.pkg.apis.authentication.v1beta1;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/api/unversioned/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/meta/v1/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";

8
pkg/apis/authentication/v1beta1/register.go
View File

@ -18,6 +18,7 @@ package v1beta1
import ( import (
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
) )
@ -28,6 +29,11 @@ const GroupName = "authentication.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: "v1beta1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
@ -38,7 +44,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&v1.ListOptions{}, &v1.ListOptions{},
&v1.DeleteOptions{}, &v1.DeleteOptions{},
&v1.ExportOptions{}, &metav1.ExportOptions{},
&TokenReview{}, &TokenReview{},
) )

6
pkg/apis/authentication/v1beta1/types.generated.go
View File

@ -25,8 +25,8 @@ import (
"errors" "errors"
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned"
pkg2_v1 "k8s.io/client-go/pkg/api/v1" pkg2_v1 "k8s.io/client-go/pkg/api/v1"
pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
"reflect" "reflect"
"runtime" "runtime"
@ -63,8 +63,8 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_unversioned.TypeMeta var v0 pkg2_v1.ObjectMeta
var v1 pkg2_v1.ObjectMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
_, _, _, _ = v0, v1, v2, v3 _, _, _, _ = v0, v1, v2, v3

4
pkg/apis/authentication/v1beta1/types.go
View File

@ -19,8 +19,8 @@ package v1beta1
import ( import (
"fmt" "fmt"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
@ -31,7 +31,7 @@ import (
// Note: TokenReview requests may be cached by the webhook token authenticator // Note: TokenReview requests may be cached by the webhook token authenticator
// plugin in the kube-apiserver. // plugin in the kube-apiserver.
type TokenReview struct { type TokenReview struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

17
pkg/apis/authorization/OWNERS Executable file
View File

@ -0,0 +1,17 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- deads2k
- liggitt
- nikhiljindal
- erictune
- sttts
- ncdc
- timothysc
- dims
- mml
- mbohlool
- david-mcmahon
- jianhuiz

40
pkg/apis/authorization/types.generated.go
View File

@ -26,7 +26,7 @@ import (
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/client-go/pkg/api" pkg2_api "k8s.io/client-go/pkg/api"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
"reflect" "reflect"
"runtime" "runtime"
@ -64,7 +64,7 @@ func init() {
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_api.ObjectMeta
var v1 pkg1_unversioned.TypeMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
_, _, _, _ = v0, v1, v2, v3 _, _, _, _ = v0, v1, v2, v3
@ -784,7 +784,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder
} }
case "creationTimestamp": case "creationTimestamp":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv76 := &x.CreationTimestamp yyv76 := &x.CreationTimestamp
yym77 := z.DecBinary() yym77 := z.DecBinary()
@ -801,7 +801,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder
} }
case "deletionTimestamp": case "deletionTimestamp":
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
if x.DeletionTimestamp != nil { if x.DeletionTimestamp != nil {
@ -809,7 +809,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym79 := z.DecBinary() yym79 := z.DecBinary()
_ = yym79 _ = yym79
@ -1080,7 +1080,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv103 := &x.CreationTimestamp yyv103 := &x.CreationTimestamp
yym104 := z.DecBinary() yym104 := z.DecBinary()
@ -1096,7 +1096,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod
} }
} }
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
yyj93++ yyj93++
if yyhl93 { if yyhl93 {
@ -1115,7 +1115,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym106 := z.DecBinary() yym106 := z.DecBinary()
_ = yym106 _ = yym106
@ -2025,7 +2025,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec
} }
case "creationTimestamp": case "creationTimestamp":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv195 := &x.CreationTimestamp yyv195 := &x.CreationTimestamp
yym196 := z.DecBinary() yym196 := z.DecBinary()
@ -2042,7 +2042,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec
} }
case "deletionTimestamp": case "deletionTimestamp":
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
if x.DeletionTimestamp != nil { if x.DeletionTimestamp != nil {
@ -2050,7 +2050,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym198 := z.DecBinary() yym198 := z.DecBinary()
_ = yym198 _ = yym198
@ -2321,7 +2321,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv222 := &x.CreationTimestamp yyv222 := &x.CreationTimestamp
yym223 := z.DecBinary() yym223 := z.DecBinary()
@ -2337,7 +2337,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D
} }
} }
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
yyj212++ yyj212++
if yyhl212 { if yyhl212 {
@ -2356,7 +2356,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym225 := z.DecBinary() yym225 := z.DecBinary()
_ = yym225 _ = yym225
@ -3266,7 +3266,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De
} }
case "creationTimestamp": case "creationTimestamp":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv314 := &x.CreationTimestamp yyv314 := &x.CreationTimestamp
yym315 := z.DecBinary() yym315 := z.DecBinary()
@ -3283,7 +3283,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De
} }
case "deletionTimestamp": case "deletionTimestamp":
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
if x.DeletionTimestamp != nil { if x.DeletionTimestamp != nil {
@ -3291,7 +3291,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym317 := z.DecBinary() yym317 := z.DecBinary()
_ = yym317 _ = yym317
@ -3562,7 +3562,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.CreationTimestamp = pkg1_unversioned.Time{} x.CreationTimestamp = pkg1_v1.Time{}
} else { } else {
yyv341 := &x.CreationTimestamp yyv341 := &x.CreationTimestamp
yym342 := z.DecBinary() yym342 := z.DecBinary()
@ -3578,7 +3578,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.
} }
} }
if x.ObjectMeta.DeletionTimestamp == nil { if x.ObjectMeta.DeletionTimestamp == nil {
x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time)
} }
yyj331++ yyj331++
if yyhl331 { if yyhl331 {
@ -3597,7 +3597,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.
} }
} else { } else {
if x.DeletionTimestamp == nil { if x.DeletionTimestamp == nil {
x.DeletionTimestamp = new(pkg1_unversioned.Time) x.DeletionTimestamp = new(pkg1_v1.Time)
} }
yym344 := z.DecBinary() yym344 := z.DecBinary()
_ = yym344 _ = yym344

8
pkg/apis/authorization/types.go
View File

@ -18,7 +18,7 @@ package authorization
import ( import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
@ -28,7 +28,7 @@ import (
// SubjectAccessReview checks whether or not a user or group can perform an action. Not filling in a // SubjectAccessReview checks whether or not a user or group can perform an action. Not filling in a
// spec.namespace means "in all namespaces". // spec.namespace means "in all namespaces".
type SubjectAccessReview struct { type SubjectAccessReview struct {
unversioned.TypeMeta metav1.TypeMeta
api.ObjectMeta api.ObjectMeta
// Spec holds information about the request being evaluated // Spec holds information about the request being evaluated
@ -46,7 +46,7 @@ type SubjectAccessReview struct {
// spec.namespace means "in all namespaces". Self is a special case, because users should always be able // spec.namespace means "in all namespaces". Self is a special case, because users should always be able
// to check whether they can perform an action // to check whether they can perform an action
type SelfSubjectAccessReview struct { type SelfSubjectAccessReview struct {
unversioned.TypeMeta metav1.TypeMeta
api.ObjectMeta api.ObjectMeta
// Spec holds information about the request being evaluated. // Spec holds information about the request being evaluated.
@ -63,7 +63,7 @@ type SelfSubjectAccessReview struct {
// Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions
// checking. // checking.
type LocalSubjectAccessReview struct { type LocalSubjectAccessReview struct {
unversioned.TypeMeta metav1.TypeMeta
api.ObjectMeta api.ObjectMeta
// Spec holds information about the request being evaluated. spec.namespace must be equal to the namespace // Spec holds information about the request being evaluated. spec.namespace must be equal to the namespace

113
pkg/apis/authorization/v1beta1/generated.pb.go
View File

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

2
pkg/apis/authorization/v1beta1/generated.proto
View File

@ -22,8 +22,8 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.apis.authorization.v1beta1; package k8s.io.kubernetes.pkg.apis.authorization.v1beta1;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/api/unversioned/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/meta/v1/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";

8
pkg/apis/authorization/v1beta1/register.go
View File

@ -18,6 +18,7 @@ package v1beta1
import ( import (
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
versionedwatch "k8s.io/client-go/pkg/watch/versioned" versionedwatch "k8s.io/client-go/pkg/watch/versioned"
@ -29,6 +30,11 @@ const GroupName = "authorization.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: "v1beta1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
@ -39,7 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&v1.ListOptions{}, &v1.ListOptions{},
&v1.DeleteOptions{}, &v1.DeleteOptions{},
&v1.ExportOptions{}, &metav1.ExportOptions{},
&SelfSubjectAccessReview{}, &SelfSubjectAccessReview{},
&SubjectAccessReview{}, &SubjectAccessReview{},

6
pkg/apis/authorization/v1beta1/types.generated.go
View File

@ -25,8 +25,8 @@ import (
"errors" "errors"
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned"
pkg2_v1 "k8s.io/client-go/pkg/api/v1" pkg2_v1 "k8s.io/client-go/pkg/api/v1"
pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
"reflect" "reflect"
"runtime" "runtime"
@ -63,8 +63,8 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_unversioned.TypeMeta var v0 pkg2_v1.ObjectMeta
var v1 pkg2_v1.ObjectMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
_, _, _, _ = v0, v1, v2, v3 _, _, _, _ = v0, v1, v2, v3

8
pkg/apis/authorization/v1beta1/types.go
View File

@ -19,8 +19,8 @@ package v1beta1
import ( import (
"fmt" "fmt"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
@ -29,7 +29,7 @@ import (
// SubjectAccessReview checks whether or not a user or group can perform an action. // SubjectAccessReview checks whether or not a user or group can perform an action.
type SubjectAccessReview struct { type SubjectAccessReview struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -49,7 +49,7 @@ type SubjectAccessReview struct {
// spec.namespace means "in all namespaces". Self is a special case, because users should always be able // spec.namespace means "in all namespaces". Self is a special case, because users should always be able
// to check whether they can perform an action // to check whether they can perform an action
type SelfSubjectAccessReview struct { type SelfSubjectAccessReview struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -68,7 +68,7 @@ type SelfSubjectAccessReview struct {
// Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions
// checking. // checking.
type LocalSubjectAccessReview struct { type LocalSubjectAccessReview struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

20
pkg/apis/autoscaling/OWNERS Executable file
View File

@ -0,0 +1,20 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- deads2k
- caesarxuchao
- erictune
- sttts
- ncdc
- timothysc
- piosz
- dims
- errordeveloper
- madhusudancs
- krousey
- mml
- mbohlool
- david-mcmahon
- jianhuiz

12
pkg/apis/autoscaling/types.generated.go
View File

@ -26,7 +26,7 @@ import (
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/client-go/pkg/api" pkg2_api "k8s.io/client-go/pkg/api"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
"reflect" "reflect"
"runtime" "runtime"
@ -64,7 +64,7 @@ func init() {
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_api.ObjectMeta
var v1 pkg1_unversioned.TypeMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
_, _, _, _ = v0, v1, v2, v3 _, _, _, _ = v0, v1, v2, v3
@ -1665,7 +1665,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19
} }
} else { } else {
if x.LastScaleTime == nil { if x.LastScaleTime == nil {
x.LastScaleTime = new(pkg1_unversioned.Time) x.LastScaleTime = new(pkg1_v1.Time)
} }
yym141 := z.DecBinary() yym141 := z.DecBinary()
_ = yym141 _ = yym141
@ -1764,7 +1764,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec
} }
} else { } else {
if x.LastScaleTime == nil { if x.LastScaleTime == nil {
x.LastScaleTime = new(pkg1_unversioned.Time) x.LastScaleTime = new(pkg1_v1.Time)
} }
yym150 := z.DecBinary() yym150 := z.DecBinary()
_ = yym150 _ = yym150
@ -2409,7 +2409,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv207 := &x.ListMeta yyv207 := &x.ListMeta
yym208 := z.DecBinary() yym208 := z.DecBinary()
@ -2490,7 +2490,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv214 := &x.ListMeta yyv214 := &x.ListMeta
yym215 := z.DecBinary() yym215 := z.DecBinary()

12
pkg/apis/autoscaling/types.go
View File

@ -18,12 +18,12 @@ package autoscaling
import ( import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// Scale represents a scaling request for a resource. // Scale represents a scaling request for a resource.
type Scale struct { type Scale struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
// +optional // +optional
api.ObjectMeta `json:"metadata,omitempty"` api.ObjectMeta `json:"metadata,omitempty"`
@ -93,7 +93,7 @@ type HorizontalPodAutoscalerStatus struct {
// last time the HorizontalPodAutoscaler scaled the number of pods; // last time the HorizontalPodAutoscaler scaled the number of pods;
// used by the autoscaler to control how often the number of pods is changed. // used by the autoscaler to control how often the number of pods is changed.
// +optional // +optional
LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty"` LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty"`
// current number of replicas of pods managed by this autoscaler. // current number of replicas of pods managed by this autoscaler.
CurrentReplicas int32 `json:"currentReplicas"` CurrentReplicas int32 `json:"currentReplicas"`
@ -111,7 +111,7 @@ type HorizontalPodAutoscalerStatus struct {
// configuration of a horizontal pod autoscaler. // configuration of a horizontal pod autoscaler.
type HorizontalPodAutoscaler struct { type HorizontalPodAutoscaler struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
api.ObjectMeta `json:"metadata,omitempty"` api.ObjectMeta `json:"metadata,omitempty"`
@ -126,9 +126,9 @@ type HorizontalPodAutoscaler struct {
// list of horizontal pod autoscaler objects. // list of horizontal pod autoscaler objects.
type HorizontalPodAutoscalerList struct { type HorizontalPodAutoscalerList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
// list of horizontal pod autoscaler objects. // list of horizontal pod autoscaler objects.
Items []HorizontalPodAutoscaler `json:"items"` Items []HorizontalPodAutoscaler `json:"items"`

116
pkg/apis/autoscaling/v1/generated.pb.go
View File

@ -40,7 +40,7 @@ import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
import strings "strings" import strings "strings"
import reflect "reflect" import reflect "reflect"
@ -555,7 +555,7 @@ func (this *HorizontalPodAutoscalerList) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, s := strings.Join([]string{`&HorizontalPodAutoscalerList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
@ -580,7 +580,7 @@ func (this *HorizontalPodAutoscalerStatus) String() string {
} }
s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`, s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`,
`ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`,
`LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`,
`CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`,
`DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`, `DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`,
`CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`, `CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`,
@ -1232,7 +1232,7 @@ func (m *HorizontalPodAutoscalerStatus) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.LastScaleTime == nil { if m.LastScaleTime == nil {
m.LastScaleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} m.LastScaleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{}
} }
if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -1730,58 +1730,58 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 845 bytes of a gzipped FileDescriptorProto // 838 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x8f, 0xdb, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6f, 0xdc, 0x44,
0x14, 0x8f, 0xf3, 0x51, 0x6d, 0xc7, 0xec, 0x2e, 0x0c, 0x52, 0x1b, 0x6d, 0x85, 0xbd, 0x0a, 0x1c, 0x14, 0x5f, 0xef, 0x47, 0x95, 0x8e, 0x49, 0x02, 0x83, 0xd4, 0xae, 0x52, 0x61, 0x47, 0x0b, 0x87,
0x16, 0xd1, 0xda, 0x4a, 0xd4, 0x22, 0x7a, 0x5c, 0x2f, 0x2a, 0xad, 0xe8, 0xd2, 0xd5, 0x6c, 0x5b, 0x20, 0xa5, 0xb6, 0x76, 0x55, 0x10, 0x3d, 0xc6, 0x41, 0xa5, 0x15, 0x0d, 0x8d, 0x26, 0x6d, 0x85,
0x21, 0x24, 0x90, 0x26, 0xf6, 0xab, 0x77, 0x9a, 0xf8, 0x43, 0x33, 0xe3, 0x08, 0xf5, 0xc4, 0x89, 0x7a, 0x40, 0x9a, 0xf5, 0xbe, 0x3a, 0xd3, 0x5d, 0x7b, 0xac, 0x99, 0xf1, 0x0a, 0xf5, 0xc4, 0x89,
0x33, 0x17, 0x0e, 0xfc, 0x3b, 0x9c, 0xf6, 0x46, 0x8f, 0x9c, 0x22, 0xd6, 0x88, 0xff, 0x82, 0x03, 0x33, 0x17, 0x0e, 0xfc, 0x35, 0x5c, 0x73, 0xa3, 0x47, 0x4e, 0x2b, 0x62, 0xfe, 0x0d, 0x0e, 0xc8,
0xf2, 0x64, 0xea, 0x38, 0xc9, 0x3a, 0xdd, 0x08, 0xb8, 0x65, 0xe6, 0xfd, 0x3e, 0xde, 0x7b, 0xf3, 0xb3, 0x53, 0xef, 0x57, 0xec, 0x12, 0x01, 0xb7, 0x9d, 0x79, 0xbf, 0x8f, 0x37, 0xef, 0x3d, 0xbf,
0xfc, 0x82, 0xee, 0x8f, 0x3e, 0x13, 0x0e, 0x4b, 0xdc, 0x51, 0x36, 0x04, 0x1e, 0x83, 0x04, 0xe1, 0x45, 0xf7, 0xc7, 0x5f, 0x48, 0x8f, 0x71, 0x7f, 0x9c, 0x0d, 0x41, 0x24, 0xa0, 0x40, 0xfa, 0xe9,
0xa6, 0xa3, 0xd0, 0xa5, 0x29, 0x13, 0x2e, 0xcd, 0x64, 0x22, 0x7c, 0x3a, 0x66, 0x71, 0xe8, 0x4e, 0x38, 0xf2, 0x69, 0xca, 0xa4, 0x4f, 0x33, 0xc5, 0x65, 0x48, 0x27, 0x2c, 0x89, 0xfc, 0x69, 0xdf,
0xfa, 0x6e, 0x08, 0x31, 0x70, 0x2a, 0x21, 0x70, 0x52, 0x9e, 0xc8, 0x04, 0x7f, 0x3c, 0xa3, 0x3a, 0x8f, 0x20, 0x01, 0x41, 0x15, 0x8c, 0xbc, 0x54, 0x70, 0xc5, 0xf1, 0xa7, 0x73, 0xaa, 0xb7, 0xa0,
0x73, 0xaa, 0x93, 0x8e, 0x42, 0xa7, 0xa0, 0x3a, 0x15, 0xaa, 0x33, 0xe9, 0xef, 0xdd, 0x09, 0x99, 0x7a, 0xe9, 0x38, 0xf2, 0x0a, 0xaa, 0xb7, 0x44, 0xf5, 0xa6, 0xfd, 0xbd, 0xbb, 0x11, 0x53, 0xe7,
0x3c, 0xcb, 0x86, 0x8e, 0x9f, 0x44, 0x6e, 0x98, 0x84, 0x89, 0xab, 0x14, 0x86, 0xd9, 0x0b, 0x75, 0xd9, 0xd0, 0x0b, 0x79, 0xec, 0x47, 0x3c, 0xe2, 0xbe, 0x56, 0x18, 0x66, 0x2f, 0xf5, 0x49, 0x1f,
0x52, 0x07, 0xf5, 0x6b, 0xa6, 0xbc, 0x37, 0xa8, 0x4d, 0xca, 0xe5, 0x20, 0x92, 0x8c, 0xfb, 0xb0, 0xf4, 0xaf, 0xb9, 0xf2, 0xde, 0xa0, 0x32, 0x29, 0x5f, 0x80, 0xe4, 0x99, 0x08, 0x61, 0x3d, 0x9b,
0x9c, 0xcd, 0xde, 0xbd, 0x7a, 0x4e, 0x16, 0x4f, 0x80, 0x0b, 0x96, 0xc4, 0x10, 0xac, 0xd0, 0x6e, 0xbd, 0xc3, 0x6a, 0xce, 0x66, 0xee, 0x35, 0x0e, 0xd2, 0x8f, 0x41, 0xd1, 0xab, 0x38, 0x77, 0xaf,
0xd7, 0xd3, 0x56, 0x4b, 0xde, 0xbb, 0x73, 0x39, 0x9a, 0x67, 0xb1, 0x64, 0xd1, 0x6a, 0x4e, 0x77, 0xe6, 0x88, 0x2c, 0x51, 0x2c, 0xde, 0x4c, 0xe8, 0x5e, 0x3d, 0x5c, 0x86, 0xe7, 0x10, 0xd3, 0x0d,
0xd7, 0xc3, 0x85, 0x7f, 0x06, 0x11, 0x5d, 0x61, 0xf5, 0x2f, 0x67, 0x65, 0x92, 0x8d, 0x5d, 0x16, 0x56, 0xff, 0x6a, 0x56, 0xa6, 0xd8, 0xc4, 0x67, 0x89, 0x92, 0x4a, 0xac, 0x53, 0x7a, 0x3f, 0x5b,
0x4b, 0x21, 0xf9, 0x32, 0xa5, 0xf7, 0xb3, 0x81, 0x6e, 0x1d, 0xf1, 0x44, 0x88, 0xe7, 0xb3, 0x42, 0xe8, 0xce, 0xb1, 0xe0, 0x52, 0x3e, 0x07, 0x21, 0x19, 0x4f, 0x9e, 0x0c, 0x5f, 0x41, 0xa8, 0x08,
0x9f, 0x0c, 0x5f, 0x82, 0x2f, 0x09, 0xbc, 0x00, 0x0e, 0xb1, 0x0f, 0x78, 0x1f, 0xb5, 0x47, 0x2c, 0xbc, 0x04, 0x01, 0x49, 0x08, 0x78, 0x1f, 0xb5, 0xc7, 0x2c, 0x19, 0x75, 0xad, 0x7d, 0xeb, 0xe0,
0x0e, 0xba, 0xc6, 0xbe, 0x71, 0x70, 0xdd, 0x7b, 0xe7, 0x7c, 0x6a, 0x37, 0xf2, 0xa9, 0xdd, 0xfe, 0x66, 0xf0, 0xde, 0xc5, 0xcc, 0x6d, 0xe4, 0x33, 0xb7, 0xfd, 0x35, 0x4b, 0x46, 0x44, 0x47, 0x0a,
0x92, 0xc5, 0x01, 0x51, 0x91, 0x02, 0x11, 0xd3, 0x08, 0xba, 0xcd, 0x45, 0xc4, 0x57, 0x34, 0x02, 0x44, 0x42, 0x63, 0xe8, 0x36, 0x57, 0x11, 0xdf, 0xd0, 0x18, 0x88, 0x8e, 0xe0, 0x01, 0x42, 0x34,
0xa2, 0x22, 0x78, 0x80, 0x10, 0x4d, 0x99, 0x36, 0xe8, 0xb6, 0x14, 0x0e, 0x6b, 0x1c, 0x3a, 0x3c, 0x65, 0xc6, 0xa0, 0xdb, 0xd2, 0x38, 0x6c, 0x70, 0xe8, 0xe8, 0xf4, 0x91, 0x89, 0x90, 0x25, 0x54,
0x79, 0xa4, 0x23, 0xa4, 0x82, 0xea, 0xfd, 0xd6, 0x44, 0x37, 0x1f, 0x26, 0x9c, 0xbd, 0x4a, 0x62, 0xef, 0xb7, 0x26, 0xba, 0xfd, 0x90, 0x0b, 0xf6, 0x9a, 0x27, 0x8a, 0x4e, 0x4e, 0xf9, 0xe8, 0xc8,
0x49, 0xc7, 0x27, 0x49, 0x70, 0xa8, 0xe7, 0x02, 0x38, 0xfe, 0x1a, 0x6d, 0x45, 0x20, 0x69, 0x40, 0x0c, 0x05, 0x08, 0xfc, 0x2d, 0xda, 0x2a, 0xca, 0x3c, 0xa2, 0x8a, 0xea, 0xbc, 0xec, 0xc1, 0x81,
0x25, 0x55, 0x79, 0x99, 0x83, 0x03, 0xa7, 0x76, 0xa2, 0x9c, 0x49, 0xdf, 0x99, 0x15, 0x75, 0x0c, 0x57, 0x39, 0x4e, 0xde, 0xb4, 0xef, 0xcd, 0x1f, 0x75, 0x02, 0x8a, 0x2e, 0x7c, 0x17, 0x77, 0xa4,
0x92, 0xce, 0x7d, 0xe7, 0x77, 0xa4, 0x54, 0xc3, 0x67, 0xa8, 0x2d, 0x52, 0xf0, 0x55, 0x2d, 0xe6, 0x54, 0xc3, 0xe7, 0xa8, 0x2d, 0x53, 0x08, 0xf5, 0x5b, 0xec, 0xc1, 0x03, 0xef, 0x1f, 0x0f, 0xa9,
0xe0, 0x81, 0x73, 0xe5, 0x39, 0x75, 0x6a, 0x72, 0x3d, 0x4d, 0xc1, 0x9f, 0xf7, 0xa4, 0x38, 0x11, 0x57, 0x91, 0xeb, 0x59, 0x0a, 0xe1, 0xa2, 0x26, 0xc5, 0x89, 0x68, 0x07, 0x9c, 0xa2, 0x1b, 0x52,
0xe5, 0x80, 0x53, 0x74, 0x4d, 0x48, 0x2a, 0x33, 0xa1, 0xfa, 0x61, 0x0e, 0x1e, 0xfe, 0x07, 0x5e, 0x51, 0x95, 0x49, 0x5d, 0x0f, 0x7b, 0xf0, 0xf0, 0x3f, 0xf0, 0xd2, 0x7a, 0xc1, 0x8e, 0x71, 0xbb,
0x4a, 0xcf, 0xdb, 0xd1, 0x6e, 0xd7, 0x66, 0x67, 0xa2, 0x7d, 0x7a, 0x7f, 0x19, 0xe8, 0x56, 0x0d, 0x31, 0x3f, 0x13, 0xe3, 0xd3, 0xcb, 0x2d, 0x74, 0xa7, 0x82, 0xf9, 0x98, 0x49, 0x85, 0x5f, 0x6c,
0xf3, 0x31, 0x13, 0x12, 0x7f, 0xbb, 0xd2, 0x55, 0x77, 0x4d, 0x57, 0x2b, 0x5f, 0x86, 0x53, 0xd0, 0x54, 0xf5, 0xb0, 0x2e, 0xa7, 0x02, 0x5b, 0x24, 0x53, 0x70, 0x75, 0x65, 0xdf, 0x37, 0xbe, 0x5b,
0x55, 0x73, 0xdf, 0xd5, 0xd6, 0x5b, 0x6f, 0x6e, 0x2a, 0xad, 0x0d, 0x51, 0x87, 0x49, 0x88, 0x44, 0x6f, 0x6f, 0x96, 0xea, 0x1a, 0xa1, 0x0e, 0x53, 0x10, 0xcb, 0x6e, 0x73, 0xbf, 0x75, 0x60, 0x0f,
0xb7, 0xb9, 0xdf, 0x3a, 0x30, 0x07, 0xde, 0xbf, 0xaf, 0xd7, 0xdb, 0xd6, 0x76, 0x9d, 0x47, 0x85, 0x82, 0x7f, 0xff, 0xd8, 0x60, 0xdb, 0xd8, 0x75, 0x1e, 0x15, 0xc2, 0x64, 0xae, 0xdf, 0xfb, 0xab,
0x30, 0x99, 0xe9, 0xf7, 0xfe, 0x6e, 0xd6, 0xd6, 0x59, 0xf4, 0x1f, 0xff, 0x68, 0xa0, 0x1d, 0x75, 0x59, 0xf9, 0xc8, 0xa2, 0xf8, 0xf8, 0x47, 0x0b, 0xed, 0xe8, 0xe3, 0x53, 0x2a, 0x22, 0x28, 0xe6,
0x7c, 0x4a, 0x79, 0x08, 0xc5, 0xa8, 0xeb, 0x72, 0x37, 0x79, 0xee, 0x35, 0x9f, 0x8c, 0x77, 0x43, 0xdc, 0xbc, 0xf5, 0x3a, 0xbd, 0xae, 0xf9, 0x5e, 0x82, 0x5b, 0x26, 0xad, 0x9d, 0xb3, 0x15, 0x17,
0xa7, 0xb5, 0x73, 0xba, 0xe0, 0x42, 0x96, 0x5c, 0x71, 0x1f, 0x99, 0x11, 0x8b, 0x09, 0xa4, 0x63, 0xb2, 0xe6, 0x8a, 0xfb, 0xc8, 0x8e, 0x59, 0x42, 0x20, 0x9d, 0xb0, 0x90, 0x4a, 0x3d, 0x70, 0x9d,
0xe6, 0x53, 0xa1, 0x66, 0xae, 0xe3, 0xed, 0xe6, 0x53, 0xdb, 0x3c, 0x9e, 0x5f, 0x93, 0x2a, 0x06, 0x60, 0x37, 0x9f, 0xb9, 0xf6, 0xc9, 0xe2, 0x9a, 0x2c, 0x63, 0xf0, 0x67, 0xc8, 0x8e, 0xe9, 0xf7,
0xdf, 0x43, 0x66, 0x44, 0xbf, 0x2f, 0x29, 0x2d, 0x45, 0x79, 0x5f, 0xfb, 0x99, 0xc7, 0xf3, 0x10, 0x25, 0xa5, 0xa5, 0x29, 0x1f, 0x1a, 0x3f, 0xfb, 0x64, 0x11, 0x22, 0xcb, 0x38, 0xfc, 0x0a, 0x39,
0xa9, 0xe2, 0xf0, 0x4b, 0x64, 0x49, 0x65, 0x7b, 0x74, 0xf2, 0xec, 0x99, 0x64, 0x63, 0xf6, 0x8a, 0x4a, 0xdb, 0x1e, 0x9f, 0x3e, 0x7b, 0xa6, 0xd8, 0x84, 0xbd, 0xa6, 0x8a, 0xf1, 0xe4, 0x14, 0x44,
0x4a, 0x96, 0xc4, 0x27, 0xc0, 0x7d, 0x88, 0x25, 0x0d, 0xa1, 0xdb, 0x56, 0x4a, 0xbd, 0x7c, 0x6a, 0x08, 0x89, 0xa2, 0x11, 0x74, 0xdb, 0x5a, 0xa9, 0x97, 0xcf, 0x5c, 0xe7, 0x69, 0x2d, 0x92, 0xbc,
0x5b, 0x4f, 0xd7, 0x22, 0xc9, 0x5b, 0x94, 0x7a, 0xbf, 0xb6, 0xd0, 0x07, 0x6b, 0x07, 0x14, 0x3f, 0x43, 0xa9, 0xf7, 0x6b, 0x0b, 0x7d, 0x54, 0x3b, 0x9d, 0xf8, 0x01, 0xc2, 0x7c, 0x28, 0x41, 0x4c,
0x40, 0x38, 0x19, 0x0a, 0xe0, 0x13, 0x08, 0xbe, 0x98, 0x6d, 0xa3, 0x62, 0x2d, 0x14, 0x6f, 0xd0, 0x61, 0xf4, 0xd5, 0x7c, 0x15, 0x15, 0x3b, 0xa1, 0xe8, 0x41, 0x2b, 0xb8, 0x95, 0xcf, 0x5c, 0xfc,
0xf2, 0x6e, 0xe4, 0x53, 0x1b, 0x3f, 0x59, 0x89, 0x92, 0x4b, 0x18, 0x38, 0x40, 0xdb, 0x63, 0x2a, 0x64, 0x23, 0x4a, 0xae, 0x60, 0x60, 0x8a, 0xb6, 0x27, 0x54, 0xaa, 0x79, 0x95, 0x99, 0x59, 0x3f,
0xe4, 0xac, 0xcb, 0x4c, 0x6f, 0x20, 0x73, 0xf0, 0xc9, 0x15, 0xa7, 0xb6, 0xa0, 0x78, 0xef, 0xe5, 0xb5, 0x8b, 0x60, 0x31, 0xb2, 0x05, 0x3e, 0xf8, 0x20, 0x9f, 0xb9, 0xdb, 0x8f, 0x97, 0x25, 0xc8,
0x53, 0x7b, 0xfb, 0x71, 0x55, 0x85, 0x2c, 0x8a, 0xe2, 0x43, 0xb4, 0xeb, 0x67, 0x9c, 0x43, 0x2c, 0xaa, 0x22, 0x3e, 0x42, 0xbb, 0x61, 0x26, 0x04, 0x24, 0x6a, 0xad, 0xe6, 0xb7, 0x4d, 0xcd, 0x77,
0x97, 0xda, 0x7e, 0x53, 0xb7, 0x7d, 0xf7, 0x68, 0x31, 0x4c, 0x96, 0xf1, 0x85, 0x44, 0x00, 0x82, 0x8f, 0x57, 0xc3, 0x64, 0x1d, 0x5f, 0x48, 0x8c, 0x40, 0x32, 0x01, 0xa3, 0x52, 0xa2, 0xbd, 0x2a,
0x71, 0x08, 0x4a, 0x89, 0xf6, 0xa2, 0xc4, 0xe7, 0x8b, 0x61, 0xb2, 0x8c, 0xc7, 0x11, 0xb2, 0xb5, 0xf1, 0xe5, 0x6a, 0x98, 0xac, 0xe3, 0x71, 0x8c, 0x5c, 0xa3, 0x5a, 0xd9, 0xbf, 0x8e, 0x96, 0xfc,
0x6a, 0xed, 0x13, 0x76, 0x94, 0xe4, 0x87, 0xf9, 0xd4, 0xb6, 0x8f, 0xd6, 0x43, 0xc9, 0xdb, 0xb4, 0x38, 0x9f, 0xb9, 0xee, 0x71, 0x3d, 0x94, 0xbc, 0x4b, 0xab, 0xf7, 0x4b, 0x13, 0x75, 0x74, 0x09,
0x7a, 0xbf, 0x34, 0x51, 0x47, 0xb5, 0xe0, 0x7f, 0xdc, 0xb5, 0xcf, 0x17, 0x76, 0xed, 0xdd, 0x0d, 0xfe, 0xc7, 0x2d, 0xfb, 0x7c, 0x65, 0xcb, 0xde, 0xbb, 0xc6, 0x97, 0xa7, 0x33, 0xab, 0xdc, 0xa9,
0x3e, 0x3e, 0x95, 0x59, 0xed, 0x66, 0xfd, 0x6e, 0x69, 0xb3, 0x7e, 0xba, 0xb1, 0xf2, 0xfa, 0x3d, 0xdf, 0xad, 0xed, 0xd4, 0xcf, 0xaf, 0xad, 0x5c, 0xbf, 0x41, 0xef, 0xa3, 0x9b, 0x65, 0x02, 0xf8,
0x7a, 0x1f, 0x5d, 0x2f, 0x13, 0xc0, 0xb7, 0xd1, 0x16, 0x7f, 0xf3, 0xa6, 0x86, 0x7a, 0x80, 0x72, 0x10, 0x6d, 0x89, 0xb7, 0x3d, 0xb5, 0x74, 0x03, 0xca, 0x05, 0x58, 0x36, 0xb3, 0x44, 0xf4, 0x18,
0x07, 0x96, 0x8f, 0x59, 0x22, 0x7a, 0x0c, 0x99, 0x15, 0x87, 0xcd, 0xc8, 0x05, 0x5a, 0xc0, 0x18, 0xb2, 0x97, 0x1c, 0xae, 0x47, 0x2e, 0xd0, 0x12, 0x26, 0x10, 0x2a, 0x2e, 0xcc, 0xbf, 0x6c, 0x89,
0x7c, 0x99, 0x70, 0xfd, 0x5f, 0x5b, 0xa2, 0x4f, 0xf5, 0x3d, 0x29, 0x11, 0xde, 0x47, 0xe7, 0x17, 0x3e, 0x33, 0xf7, 0xa4, 0x44, 0x04, 0x9f, 0x5c, 0x5c, 0x3a, 0x8d, 0x37, 0x97, 0x4e, 0xe3, 0xf7,
0x56, 0xe3, 0xf5, 0x85, 0xd5, 0xf8, 0xfd, 0xc2, 0x6a, 0xfc, 0x90, 0x5b, 0xc6, 0x79, 0x6e, 0x19, 0x4b, 0xa7, 0xf1, 0x43, 0xee, 0x58, 0x17, 0xb9, 0x63, 0xbd, 0xc9, 0x1d, 0xeb, 0x8f, 0xdc, 0xb1,
0xaf, 0x73, 0xcb, 0xf8, 0x23, 0xb7, 0x8c, 0x9f, 0xfe, 0xb4, 0x1a, 0xdf, 0x34, 0x27, 0xfd, 0x7f, 0x7e, 0xfa, 0xd3, 0x69, 0xbc, 0x68, 0x4e, 0xfb, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x62,
0x02, 0x00, 0x00, 0xff, 0xff, 0x11, 0x6a, 0xc0, 0x63, 0xc4, 0x09, 0x00, 0x00, 0x6b, 0x34, 0xbb, 0x09, 0x00, 0x00,
} }

6
pkg/apis/autoscaling/v1/generated.proto
View File

@ -22,8 +22,8 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.apis.autoscaling.v1; package k8s.io.kubernetes.pkg.apis.autoscaling.v1;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/api/unversioned/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/meta/v1/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
@ -63,7 +63,7 @@ message HorizontalPodAutoscaler {
message HorizontalPodAutoscalerList { message HorizontalPodAutoscalerList {
// Standard list metadata. // Standard list metadata.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// list of horizontal pod autoscaler objects. // list of horizontal pod autoscaler objects.
repeated HorizontalPodAutoscaler items = 2; repeated HorizontalPodAutoscaler items = 2;
@ -97,7 +97,7 @@ message HorizontalPodAutoscalerStatus {
// last time the HorizontalPodAutoscaler scaled the number of pods; // last time the HorizontalPodAutoscaler scaled the number of pods;
// used by the autoscaler to control how often the number of pods is changed. // used by the autoscaler to control how often the number of pods is changed.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScaleTime = 2;
// current number of replicas of pods managed by this autoscaler. // current number of replicas of pods managed by this autoscaler.
optional int32 currentReplicas = 3; optional int32 currentReplicas = 3;

8
pkg/apis/autoscaling/v1/register.go
View File

@ -18,6 +18,7 @@ package v1
import ( import (
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
versionedwatch "k8s.io/client-go/pkg/watch/versioned" versionedwatch "k8s.io/client-go/pkg/watch/versioned"
@ -29,6 +30,11 @@ const GroupName = "autoscaling"
// 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: "v1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
@ -42,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&Scale{}, &Scale{},
&v1.ListOptions{}, &v1.ListOptions{},
&v1.DeleteOptions{}, &v1.DeleteOptions{},
&v1.ExportOptions{}, &metav1.ExportOptions{},
) )
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil return nil

14
pkg/apis/autoscaling/v1/types.generated.go
View File

@ -25,8 +25,8 @@ import (
"errors" "errors"
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned"
pkg2_v1 "k8s.io/client-go/pkg/api/v1" pkg2_v1 "k8s.io/client-go/pkg/api/v1"
pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
"reflect" "reflect"
"runtime" "runtime"
@ -63,8 +63,8 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_unversioned.Time var v0 pkg2_v1.ObjectMeta
var v1 pkg2_v1.ObjectMeta var v1 pkg1_v1.Time
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
_, _, _, _ = v0, v1, v2, v3 _, _, _, _ = v0, v1, v2, v3
@ -943,7 +943,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19
} }
} else { } else {
if x.LastScaleTime == nil { if x.LastScaleTime == nil {
x.LastScaleTime = new(pkg1_unversioned.Time) x.LastScaleTime = new(pkg1_v1.Time)
} }
yym83 := z.DecBinary() yym83 := z.DecBinary()
_ = yym83 _ = yym83
@ -1042,7 +1042,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec
} }
} else { } else {
if x.LastScaleTime == nil { if x.LastScaleTime == nil {
x.LastScaleTime = new(pkg1_unversioned.Time) x.LastScaleTime = new(pkg1_v1.Time)
} }
yym92 := z.DecBinary() yym92 := z.DecBinary()
_ = yym92 _ = yym92
@ -1687,7 +1687,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv149 := &x.ListMeta yyv149 := &x.ListMeta
yym150 := z.DecBinary() yym150 := z.DecBinary()
@ -1768,7 +1768,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv156 := &x.ListMeta yyv156 := &x.ListMeta
yym157 := z.DecBinary() yym157 := z.DecBinary()

12
pkg/apis/autoscaling/v1/types.go
View File

@ -17,8 +17,8 @@ limitations under the License.
package v1 package v1
import ( import (
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// CrossVersionObjectReference contains enough information to let you identify the referred resource. // CrossVersionObjectReference contains enough information to let you identify the referred resource.
@ -57,7 +57,7 @@ type HorizontalPodAutoscalerStatus struct {
// last time the HorizontalPodAutoscaler scaled the number of pods; // last time the HorizontalPodAutoscaler scaled the number of pods;
// used by the autoscaler to control how often the number of pods is changed. // used by the autoscaler to control how often the number of pods is changed.
// +optional // +optional
LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"`
// current number of replicas of pods managed by this autoscaler. // current number of replicas of pods managed by this autoscaler.
CurrentReplicas int32 `json:"currentReplicas" protobuf:"varint,3,opt,name=currentReplicas"` CurrentReplicas int32 `json:"currentReplicas" protobuf:"varint,3,opt,name=currentReplicas"`
@ -75,7 +75,7 @@ type HorizontalPodAutoscalerStatus struct {
// configuration of a horizontal pod autoscaler. // configuration of a horizontal pod autoscaler.
type HorizontalPodAutoscaler struct { type HorizontalPodAutoscaler struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
@ -91,10 +91,10 @@ type HorizontalPodAutoscaler struct {
// list of horizontal pod autoscaler objects. // list of horizontal pod autoscaler objects.
type HorizontalPodAutoscalerList struct { type HorizontalPodAutoscalerList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata. // Standard list metadata.
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// list of horizontal pod autoscaler objects. // list of horizontal pod autoscaler objects.
Items []HorizontalPodAutoscaler `json:"items" protobuf:"bytes,2,rep,name=items"` Items []HorizontalPodAutoscaler `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -102,7 +102,7 @@ type HorizontalPodAutoscalerList struct {
// Scale represents a scaling request for a resource. // Scale represents a scaling request for a resource.
type Scale struct { type Scale struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
// +optional // +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

6
pkg/apis/autoscaling/v1/zz_generated.conversion.go
View File

@ -21,8 +21,8 @@ limitations under the License.
package v1 package v1
import ( import (
unversioned "k8s.io/client-go/pkg/api/unversioned"
autoscaling "k8s.io/client-go/pkg/apis/autoscaling" autoscaling "k8s.io/client-go/pkg/apis/autoscaling"
meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
unsafe "unsafe" unsafe "unsafe"
@ -163,7 +163,7 @@ func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscal
func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error { func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas out.DesiredReplicas = in.DesiredReplicas
out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage))
@ -176,7 +176,7 @@ func Convert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutosc
func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas out.DesiredReplicas = in.DesiredReplicas
out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage))

4
pkg/apis/autoscaling/v1/zz_generated.deepcopy.go
View File

@ -21,8 +21,8 @@ limitations under the License.
package v1 package v1
import ( import (
unversioned "k8s.io/client-go/pkg/api/unversioned"
api_v1 "k8s.io/client-go/pkg/api/v1" api_v1 "k8s.io/client-go/pkg/api/v1"
meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
reflect "reflect" reflect "reflect"
@ -134,7 +134,7 @@ func DeepCopy_v1_HorizontalPodAutoscalerStatus(in interface{}, out interface{},
} }
if in.LastScaleTime != nil { if in.LastScaleTime != nil {
in, out := &in.LastScaleTime, &out.LastScaleTime in, out := &in.LastScaleTime, &out.LastScaleTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.LastScaleTime = nil out.LastScaleTime = nil

4
pkg/apis/autoscaling/zz_generated.deepcopy.go
View File

@ -22,7 +22,7 @@ package autoscaling
import ( import (
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
unversioned "k8s.io/client-go/pkg/api/unversioned" v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
reflect "reflect" reflect "reflect"
@ -134,7 +134,7 @@ func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in interface{}, out inte
} }
if in.LastScaleTime != nil { if in.LastScaleTime != nil {
in, out := &in.LastScaleTime, &out.LastScaleTime in, out := &in.LastScaleTime, &out.LastScaleTime
*out = new(unversioned.Time) *out = new(v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.LastScaleTime = nil out.LastScaleTime = nil

19
pkg/apis/batch/OWNERS Executable file
View File

@ -0,0 +1,19 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- wojtek-t
- deads2k
- caesarxuchao
- erictune
- sttts
- saad-ali
- ncdc
- timothysc
- soltysh
- dims
- errordeveloper
- mml
- mbohlool
- david-mcmahon
- jianhuiz

36
pkg/apis/batch/types.generated.go
View File

@ -27,7 +27,7 @@ import (
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/client-go/pkg/api" pkg2_api "k8s.io/client-go/pkg/api"
pkg4_resource "k8s.io/client-go/pkg/api/resource" pkg4_resource "k8s.io/client-go/pkg/api/resource"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
pkg5_intstr "k8s.io/client-go/pkg/util/intstr" pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
"reflect" "reflect"
@ -67,7 +67,7 @@ func init() {
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_api.ObjectMeta
var v1 pkg4_resource.Quantity var v1 pkg4_resource.Quantity
var v2 pkg1_unversioned.TypeMeta var v2 pkg1_v1.TypeMeta
var v3 pkg3_types.UID var v3 pkg3_types.UID
var v4 pkg5_intstr.IntOrString var v4 pkg5_intstr.IntOrString
var v5 time.Time var v5 time.Time
@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv53 := &x.ListMeta yyv53 := &x.ListMeta
yym54 := z.DecBinary() yym54 := z.DecBinary()
@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv60 := &x.ListMeta yyv60 := &x.ListMeta
yym61 := z.DecBinary() yym61 := z.DecBinary()
@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym144 := z.DecBinary() yym144 := z.DecBinary()
_ = yym144 _ = yym144
@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym156 := z.DecBinary() yym156 := z.DecBinary()
_ = yym156 _ = yym156
@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.StartTime == nil { if x.StartTime == nil {
x.StartTime = new(pkg1_unversioned.Time) x.StartTime = new(pkg1_v1.Time)
} }
yym186 := z.DecBinary() yym186 := z.DecBinary()
_ = yym186 _ = yym186
@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.CompletionTime == nil { if x.CompletionTime == nil {
x.CompletionTime = new(pkg1_unversioned.Time) x.CompletionTime = new(pkg1_v1.Time)
} }
yym188 := z.DecBinary() yym188 := z.DecBinary()
_ = yym188 _ = yym188
@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.StartTime == nil { if x.StartTime == nil {
x.StartTime = new(pkg1_unversioned.Time) x.StartTime = new(pkg1_v1.Time)
} }
yym196 := z.DecBinary() yym196 := z.DecBinary()
_ = yym196 _ = yym196
@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.CompletionTime == nil { if x.CompletionTime == nil {
x.CompletionTime = new(pkg1_unversioned.Time) x.CompletionTime = new(pkg1_v1.Time)
} }
yym198 := z.DecBinary() yym198 := z.DecBinary()
_ = yym198 _ = yym198
@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "lastProbeTime": case "lastProbeTime":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastProbeTime = pkg1_unversioned.Time{} x.LastProbeTime = pkg1_v1.Time{}
} else { } else {
yyv231 := &x.LastProbeTime yyv231 := &x.LastProbeTime
yym232 := z.DecBinary() yym232 := z.DecBinary()
@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "lastTransitionTime": case "lastTransitionTime":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastTransitionTime = pkg1_unversioned.Time{} x.LastTransitionTime = pkg1_v1.Time{}
} else { } else {
yyv233 := &x.LastTransitionTime yyv233 := &x.LastTransitionTime
yym234 := z.DecBinary() yym234 := z.DecBinary()
@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastProbeTime = pkg1_unversioned.Time{} x.LastProbeTime = pkg1_v1.Time{}
} else { } else {
yyv240 := &x.LastProbeTime yyv240 := &x.LastProbeTime
yym241 := z.DecBinary() yym241 := z.DecBinary()
@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastTransitionTime = pkg1_unversioned.Time{} x.LastTransitionTime = pkg1_v1.Time{}
} else { } else {
yyv242 := &x.LastTransitionTime yyv242 := &x.LastTransitionTime
yym243 := z.DecBinary() yym243 := z.DecBinary()
@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv298 := &x.ListMeta yyv298 := &x.ListMeta
yym299 := z.DecBinary() yym299 := z.DecBinary()
@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv305 := &x.ListMeta yyv305 := &x.ListMeta
yym306 := z.DecBinary() yym306 := z.DecBinary()
@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.LastScheduleTime == nil { if x.LastScheduleTime == nil {
x.LastScheduleTime = new(pkg1_unversioned.Time) x.LastScheduleTime = new(pkg1_v1.Time)
} }
yym362 := z.DecBinary() yym362 := z.DecBinary()
_ = yym362 _ = yym362
@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.LastScheduleTime == nil { if x.LastScheduleTime == nil {
x.LastScheduleTime = new(pkg1_unversioned.Time) x.LastScheduleTime = new(pkg1_v1.Time)
} }
yym367 := z.DecBinary() yym367 := z.DecBinary()
_ = yym367 _ = yym367

28
pkg/apis/batch/types.go
View File

@ -18,14 +18,14 @@ package batch
import ( import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/unversioned" metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
// Job represents the configuration of a single job. // Job represents the configuration of a single job.
type Job struct { type Job struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -44,11 +44,11 @@ type Job struct {
// JobList is a collection of jobs. // JobList is a collection of jobs.
type JobList struct { type JobList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
// Items is the list of Job. // Items is the list of Job.
Items []Job `json:"items"` Items []Job `json:"items"`
@ -56,7 +56,7 @@ type JobList struct {
// JobTemplate describes a template for creating copies of a predefined pod. // JobTemplate describes a template for creating copies of a predefined pod.
type JobTemplate struct { type JobTemplate struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -107,7 +107,7 @@ type JobSpec struct {
// Selector is a label query over pods that should match the pod count. // Selector is a label query over pods that should match the pod count.
// Normally, the system sets this field for you. // Normally, the system sets this field for you.
// +optional // +optional
Selector *unversioned.LabelSelector `json:"selector,omitempty"` Selector *metav1.LabelSelector `json:"selector,omitempty"`
// ManualSelector controls generation of pod labels and pod selectors. // ManualSelector controls generation of pod labels and pod selectors.
// Leave `manualSelector` unset unless you are certain what you are doing. // Leave `manualSelector` unset unless you are certain what you are doing.
@ -137,13 +137,13 @@ type JobStatus struct {
// It is not guaranteed to be set in happens-before order across separate operations. // It is not guaranteed to be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
StartTime *unversioned.Time `json:"startTime,omitempty"` StartTime *metav1.Time `json:"startTime,omitempty"`
// CompletionTime represents time when the job was completed. It is not guaranteed to // CompletionTime represents time when the job was completed. It is not guaranteed to
// be set in happens-before order across separate operations. // be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
CompletionTime *unversioned.Time `json:"completionTime,omitempty"` CompletionTime *metav1.Time `json:"completionTime,omitempty"`
// Active is the number of actively running pods. // Active is the number of actively running pods.
// +optional // +optional
@ -176,10 +176,10 @@ type JobCondition struct {
Status api.ConditionStatus `json:"status"` Status api.ConditionStatus `json:"status"`
// Last time the condition was checked. // Last time the condition was checked.
// +optional // +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
// Last time the condition transit from one status to another. // Last time the condition transit from one status to another.
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
// (brief) reason for the condition's last transition. // (brief) reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty"` Reason string `json:"reason,omitempty"`
@ -192,7 +192,7 @@ type JobCondition struct {
// CronJob represents the configuration of a single cron job. // CronJob represents the configuration of a single cron job.
type CronJob struct { type CronJob struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -211,11 +211,11 @@ type CronJob struct {
// CronJobList is a collection of cron jobs. // CronJobList is a collection of cron jobs.
type CronJobList struct { type CronJobList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty"` metav1.ListMeta `json:"metadata,omitempty"`
// Items is the list of CronJob. // Items is the list of CronJob.
Items []CronJob `json:"items"` Items []CronJob `json:"items"`
@ -272,5 +272,5 @@ type CronJobStatus struct {
// LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // LastScheduleTime keeps information of when was the last time the job was successfully scheduled.
// +optional // +optional
LastScheduleTime *unversioned.Time `json:"lastScheduleTime,omitempty"` LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty"`
} }

131
pkg/apis/batch/v1/generated.pb.go
View File

@ -37,8 +37,8 @@ import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned"
import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1"
import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
import strings "strings" import strings "strings"
import reflect "reflect" import reflect "reflect"
@ -481,8 +481,8 @@ func (this *JobCondition) String() string {
s := strings.Join([]string{`&JobCondition{`, s := strings.Join([]string{`&JobCondition{`,
`Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`,
`Status:` + fmt.Sprintf("%v", this.Status) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`,
`LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`,
`LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`,
`Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`,
`Message:` + fmt.Sprintf("%v", this.Message) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`,
`}`, `}`,
@ -494,7 +494,7 @@ func (this *JobList) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&JobList{`, s := strings.Join([]string{`&JobList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
@ -508,7 +508,7 @@ func (this *JobSpec) String() string {
`Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`,
`Completions:` + valueToStringGenerated(this.Completions) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`,
`ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`,
`Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`,
`ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`,
`Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`,
`}`, `}`,
@ -521,8 +521,8 @@ func (this *JobStatus) String() string {
} }
s := strings.Join([]string{`&JobStatus{`, s := strings.Join([]string{`&JobStatus{`,
`Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`,
`StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`,
`CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`,
`Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`,
`Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`,
`Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`,
@ -1131,7 +1131,7 @@ func (m *JobSpec) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Selector == nil { if m.Selector == nil {
m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{}
} }
if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -1296,7 +1296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.StartTime == nil { if m.StartTime == nil {
m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{}
} }
if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -1329,7 +1329,7 @@ func (m *JobStatus) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.CompletionTime == nil { if m.CompletionTime == nil {
m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{}
} }
if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -1519,60 +1519,59 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 872 bytes of a gzipped FileDescriptorProto // 863 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6f, 0xe3, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6f, 0xe3, 0x44,
0x14, 0xce, 0x8f, 0xa6, 0x4d, 0xa6, 0x3f, 0x76, 0x19, 0xa9, 0x52, 0xc8, 0x21, 0x59, 0x05, 0x84, 0x18, 0xce, 0x47, 0xd3, 0x36, 0xd3, 0x8f, 0x5d, 0x46, 0xaa, 0x14, 0x7a, 0x48, 0x56, 0x01, 0xa1,
0x16, 0xb1, 0x1d, 0x2b, 0xa5, 0x48, 0x88, 0x03, 0x12, 0x2e, 0x42, 0xa2, 0x6a, 0xd9, 0x6a, 0x52, 0x22, 0xb5, 0xb6, 0x5c, 0xf6, 0x80, 0x38, 0x20, 0xe1, 0x22, 0x24, 0xaa, 0x96, 0xad, 0x26, 0x05,
0xa1, 0x15, 0x08, 0xa4, 0xb1, 0xfd, 0x36, 0x1d, 0x6a, 0x7b, 0x2c, 0xcf, 0x38, 0x68, 0x6f, 0xdc, 0xa1, 0xe5, 0x34, 0xb6, 0xdf, 0x4d, 0x4d, 0x6d, 0x8f, 0xe5, 0x19, 0x47, 0xda, 0x1b, 0x37, 0xae,
0xb8, 0xf2, 0xd7, 0x80, 0xf8, 0x0f, 0x7a, 0x5c, 0x71, 0xe2, 0x14, 0x51, 0xf3, 0x5f, 0xec, 0x09, 0xfc, 0x14, 0x0e, 0x88, 0xdf, 0xd0, 0x03, 0x87, 0x3d, 0x72, 0xb2, 0xa8, 0xf9, 0x17, 0x7b, 0x42,
0x79, 0x3c, 0xb1, 0x9d, 0x26, 0x8d, 0xb2, 0xdc, 0x3c, 0xef, 0x7d, 0xdf, 0xf7, 0x9e, 0xe7, 0x7d, 0x33, 0x1e, 0x7f, 0xa4, 0x49, 0x43, 0x76, 0x6f, 0xf6, 0x3b, 0xcf, 0xf3, 0xcc, 0x33, 0xf3, 0x3e,
0xf3, 0xd0, 0xc7, 0x37, 0x9f, 0x4a, 0xc2, 0x85, 0x75, 0x93, 0x38, 0x10, 0x87, 0xa0, 0x40, 0x5a, 0xf3, 0xa2, 0xcf, 0x6e, 0x3f, 0xe7, 0x86, 0xcf, 0xcc, 0xdb, 0xd4, 0x81, 0x24, 0x02, 0x01, 0xdc,
0xd1, 0xcd, 0xc4, 0x62, 0x11, 0x97, 0x96, 0xc3, 0x94, 0x7b, 0x6d, 0x4d, 0x47, 0xd6, 0x04, 0x42, 0x8c, 0x6f, 0xa7, 0x26, 0x8d, 0x7d, 0x6e, 0x3a, 0x54, 0xb8, 0x37, 0xe6, 0xcc, 0x32, 0xa7, 0x10,
0x88, 0x99, 0x02, 0x8f, 0x44, 0xb1, 0x50, 0x02, 0xbf, 0x97, 0x93, 0x48, 0x49, 0x22, 0xd1, 0xcd, 0x41, 0x42, 0x05, 0x78, 0x46, 0x9c, 0x30, 0xc1, 0xf0, 0x47, 0x05, 0xc9, 0xa8, 0x49, 0x46, 0x7c,
0x84, 0x64, 0x24, 0xa2, 0x49, 0x64, 0x3a, 0xea, 0x1d, 0x4d, 0xb8, 0xba, 0x4e, 0x1c, 0xe2, 0x8a, 0x3b, 0x35, 0x24, 0xc9, 0x50, 0x24, 0x63, 0x66, 0x1d, 0x9e, 0x4c, 0x7d, 0x71, 0x93, 0x3a, 0x86,
0xc0, 0x9a, 0x88, 0x89, 0xb0, 0x34, 0xd7, 0x49, 0x5e, 0xea, 0x93, 0x3e, 0xe8, 0xaf, 0x5c, 0xb3, 0xcb, 0x42, 0x73, 0xca, 0xa6, 0xcc, 0x54, 0x5c, 0x27, 0x7d, 0xa5, 0xfe, 0xd4, 0x8f, 0xfa, 0x2a,
0x77, 0xfc, 0x60, 0x23, 0x56, 0x0c, 0x52, 0x24, 0xb1, 0x0b, 0xf7, 0xfb, 0xe8, 0x7d, 0xf2, 0x30, 0x34, 0x0f, 0x4f, 0x1f, 0x35, 0x62, 0x26, 0xc0, 0x59, 0x9a, 0xb8, 0xf0, 0xd0, 0xc7, 0xe1, 0xf1,
0x27, 0x09, 0xa7, 0x10, 0x4b, 0x2e, 0x42, 0xf0, 0x96, 0x68, 0xcf, 0x1e, 0xa6, 0x2d, 0xff, 0x6c, 0xe3, 0x9c, 0x45, 0xd7, 0x2b, 0x76, 0xe0, 0x66, 0x08, 0x82, 0x2e, 0xe3, 0x9c, 0x2c, 0xe7, 0x24,
0xef, 0x68, 0x35, 0x3a, 0x4e, 0x42, 0xc5, 0x83, 0xe5, 0x9e, 0x4e, 0xd6, 0xc3, 0xa5, 0x7b, 0x0d, 0x69, 0x24, 0xfc, 0x70, 0xd1, 0xd0, 0xf3, 0xd5, 0x70, 0xee, 0xde, 0x40, 0x48, 0x17, 0x58, 0xd6,
0x01, 0x5b, 0x62, 0x8d, 0x56, 0xb3, 0x12, 0xc5, 0x7d, 0x8b, 0x87, 0x4a, 0xaa, 0xf8, 0x3e, 0x65, 0x72, 0x56, 0x2a, 0xfc, 0xc0, 0xf4, 0x23, 0xc1, 0x45, 0xf2, 0x90, 0x32, 0xfe, 0xb5, 0x83, 0xba,
0xf8, 0x6b, 0x03, 0x35, 0xcf, 0x84, 0x83, 0x5f, 0xa0, 0x76, 0x00, 0x8a, 0x79, 0x4c, 0xb1, 0x6e, 0xe7, 0xcc, 0xc1, 0x3f, 0xa2, 0x6d, 0x69, 0xdd, 0xa3, 0x82, 0x0e, 0xda, 0xcf, 0xda, 0x47, 0x3b,
0xfd, 0x49, 0xfd, 0xe9, 0xee, 0xf1, 0x53, 0xf2, 0xe0, 0x7c, 0xc8, 0x74, 0x44, 0x9e, 0x3b, 0x3f, 0xa7, 0x47, 0xc6, 0xa3, 0xcd, 0x31, 0x66, 0x96, 0xf1, 0xc2, 0xf9, 0x19, 0x5c, 0x71, 0x09, 0x82,
0x81, 0xab, 0x2e, 0x40, 0x31, 0x1b, 0xdf, 0xce, 0x06, 0xb5, 0x74, 0x36, 0x40, 0x65, 0x8c, 0x16, 0xda, 0xf8, 0x2e, 0x1b, 0xb5, 0xf2, 0x6c, 0x84, 0xea, 0x1a, 0xa9, 0xd4, 0xf0, 0x77, 0x68, 0x83,
0x6a, 0xf8, 0x1b, 0xb4, 0x25, 0x23, 0x70, 0xbb, 0x0d, 0xad, 0xfa, 0x8c, 0x6c, 0x30, 0x75, 0x72, 0xc7, 0xe0, 0x0e, 0x3a, 0x4a, 0xf5, 0xd8, 0x58, 0xa3, 0xe5, 0xc6, 0x39, 0x73, 0x26, 0x31, 0xb8,
0x26, 0x9c, 0x71, 0x04, 0xae, 0xbd, 0x67, 0x94, 0xb7, 0xb2, 0x13, 0xd5, 0x3a, 0xf8, 0x5b, 0xb4, 0xf6, 0xae, 0x56, 0xde, 0x90, 0x7f, 0x44, 0xe9, 0xe0, 0x1f, 0xd0, 0x26, 0x17, 0x54, 0xa4, 0x7c,
0x2d, 0x15, 0x53, 0x89, 0xec, 0x36, 0xb5, 0x22, 0xd9, 0x58, 0x51, 0xb3, 0xec, 0x03, 0xa3, 0xb9, 0xd0, 0x55, 0x8a, 0xc6, 0xda, 0x8a, 0x8a, 0x65, 0xef, 0x6b, 0xcd, 0xcd, 0xe2, 0x9f, 0x68, 0xb5,
0x9d, 0x9f, 0xa9, 0x51, 0x1b, 0xfe, 0xd5, 0x44, 0x7b, 0x67, 0xc2, 0x39, 0x15, 0xa1, 0xc7, 0x15, 0xf1, 0x5f, 0x5d, 0xb4, 0x7b, 0xce, 0x9c, 0x33, 0x16, 0x79, 0xbe, 0xf0, 0x59, 0x84, 0x9f, 0xa3,
0x17, 0x21, 0x3e, 0x41, 0x5b, 0xea, 0x55, 0x04, 0xfa, 0x3a, 0x3a, 0xf6, 0x93, 0x79, 0x2b, 0x57, 0x0d, 0xf1, 0x3a, 0x06, 0x75, 0x1d, 0x7d, 0xfb, 0x59, 0x69, 0xe5, 0xfa, 0x75, 0x0c, 0x6f, 0xb3,
0xaf, 0x22, 0x78, 0x33, 0x1b, 0x3c, 0xae, 0x62, 0xb3, 0x18, 0xd5, 0xe8, 0x4a, 0x7b, 0x0d, 0xcd, 0xd1, 0xd3, 0x26, 0x56, 0xd6, 0x88, 0x42, 0x37, 0xec, 0x75, 0x14, 0xef, 0xcb, 0xf9, 0xed, 0xde,
0xfb, 0x7c, 0xb1, 0xdc, 0x9b, 0xd9, 0x60, 0xad, 0x71, 0x48, 0xa1, 0xb9, 0xd8, 0x1e, 0xbe, 0x46, 0x66, 0xa3, 0x95, 0x61, 0x33, 0x2a, 0xcd, 0x79, 0x7b, 0x18, 0xd0, 0x5e, 0x40, 0xb9, 0xb8, 0x4a,
0xfb, 0x3e, 0x93, 0xea, 0x32, 0x16, 0x0e, 0x5c, 0xf1, 0x00, 0xcc, 0xdf, 0x7f, 0xb4, 0x66, 0x4a, 0x98, 0x03, 0xd7, 0x7e, 0x08, 0xfa, 0xf4, 0x47, 0xab, 0x4e, 0x2f, 0x7b, 0x20, 0x0f, 0x2f, 0xf1,
0x15, 0xf7, 0x92, 0x8c, 0x62, 0x1f, 0x9a, 0x5e, 0xf6, 0xcf, 0xab, 0x4a, 0x74, 0x51, 0x18, 0xff, 0xf6, 0x81, 0x36, 0xb2, 0x77, 0xd1, 0x94, 0x21, 0xf3, 0xaa, 0x58, 0x20, 0x2c, 0x0b, 0xd7, 0x09,
0x8c, 0x70, 0x16, 0xb8, 0x8a, 0x59, 0x28, 0xf3, 0xbf, 0xcb, 0xca, 0x6d, 0xbd, 0x7d, 0xb9, 0x9e, 0x8d, 0x78, 0x71, 0x34, 0xb9, 0xd7, 0xc6, 0x3b, 0xee, 0x75, 0xa8, 0xf7, 0xc2, 0x17, 0x0b, 0x5a,
0x29, 0x87, 0xcf, 0x97, 0xe4, 0xe8, 0x8a, 0x12, 0xf8, 0x03, 0xb4, 0x1d, 0x03, 0x93, 0x22, 0xec, 0x64, 0x89, 0x3e, 0xfe, 0x04, 0x6d, 0x26, 0x40, 0x39, 0x8b, 0x06, 0x3d, 0x75, 0x69, 0x55, 0x8f,
0xb6, 0xf4, 0xd5, 0x15, 0x93, 0xa2, 0x3a, 0x4a, 0x4d, 0x16, 0x7f, 0x88, 0x76, 0x02, 0x90, 0x92, 0x88, 0xaa, 0x12, 0xbd, 0x8a, 0x3f, 0x45, 0x5b, 0x21, 0x70, 0x4e, 0xa7, 0x30, 0xd8, 0x54, 0xc0,
0x4d, 0xa0, 0xbb, 0xad, 0x81, 0x8f, 0x0c, 0x70, 0xe7, 0x22, 0x0f, 0xd3, 0x79, 0x7e, 0xf8, 0x47, 0x27, 0x1a, 0xb8, 0x75, 0x59, 0x94, 0x49, 0xb9, 0x3e, 0xfe, 0xa3, 0x8d, 0xb6, 0xce, 0x99, 0x73,
0x1d, 0xed, 0x9c, 0x09, 0xe7, 0x9c, 0x4b, 0x85, 0x7f, 0x58, 0xb2, 0xb8, 0xb5, 0xe1, 0xdf, 0x64, 0xe1, 0x73, 0x81, 0x5f, 0x2e, 0x84, 0xfb, 0x78, 0x9d, 0xa3, 0x48, 0xae, 0x0a, 0xf8, 0x53, 0xbd,
0x74, 0xed, 0xf4, 0xc7, 0xa6, 0x50, 0x7b, 0x1e, 0xa9, 0xf8, 0xfc, 0x02, 0xb5, 0xb8, 0x82, 0x20, 0xcb, 0x76, 0x59, 0x69, 0xc4, 0xfb, 0x12, 0xf5, 0x7c, 0x01, 0xa1, 0x6c, 0x77, 0xf7, 0xff, 0xee,
0x9b, 0x7b, 0x73, 0xfd, 0xf3, 0x59, 0xb4, 0xa5, 0xbd, 0x6f, 0x44, 0x5b, 0x5f, 0x67, 0x74, 0x9a, 0xa8, 0x99, 0x46, 0x7b, 0x4f, 0x8b, 0xf6, 0xbe, 0x95, 0x74, 0x52, 0xa8, 0x8c, 0xff, 0xec, 0x2a,
0xab, 0x0c, 0xff, 0x6c, 0xea, 0xce, 0x33, 0xe3, 0xe3, 0x11, 0xda, 0x8d, 0x58, 0xcc, 0x7c, 0x1f, 0xdb, 0x32, 0xef, 0xd8, 0x42, 0x3b, 0x31, 0x4d, 0x68, 0x10, 0x40, 0xe0, 0xf3, 0x50, 0x39, 0xef,
0x7c, 0x2e, 0x03, 0xdd, 0x7c, 0xcb, 0x7e, 0x94, 0xce, 0x06, 0xbb, 0x97, 0x65, 0x98, 0x56, 0x31, 0xd9, 0x4f, 0xf2, 0x6c, 0xb4, 0x73, 0x55, 0x97, 0x49, 0x13, 0x23, 0x29, 0x2e, 0x0b, 0xe3, 0x00,
0x19, 0xc5, 0x15, 0x41, 0xe4, 0x43, 0x76, 0xbb, 0xb9, 0x17, 0x0d, 0xe5, 0xb4, 0x0c, 0xd3, 0x2a, 0xe4, 0xd5, 0x16, 0x11, 0xd4, 0x94, 0xb3, 0xba, 0x4c, 0x9a, 0x18, 0xfc, 0x02, 0x1d, 0x50, 0x57,
0x06, 0x3f, 0x47, 0x87, 0xcc, 0x55, 0x7c, 0x0a, 0x5f, 0x02, 0xf3, 0x7c, 0x1e, 0xc2, 0x18, 0x5c, 0xf8, 0x33, 0xf8, 0x1a, 0xa8, 0x17, 0xf8, 0x11, 0x4c, 0xc0, 0x65, 0x91, 0x57, 0x3c, 0xaf, 0xae,
0x11, 0x7a, 0xf9, 0x3b, 0x6b, 0xda, 0xef, 0xa6, 0xb3, 0xc1, 0xe1, 0x17, 0xab, 0x00, 0x74, 0x35, 0xfd, 0x61, 0x9e, 0x8d, 0x0e, 0xbe, 0x5a, 0x06, 0x20, 0xcb, 0x79, 0xf8, 0x27, 0xb4, 0xcd, 0x21,
0x0f, 0xff, 0x88, 0xda, 0x12, 0x7c, 0x70, 0x95, 0x88, 0x8d, 0x7d, 0x4e, 0x36, 0xbd, 0x70, 0xe6, 0x00, 0x57, 0xb0, 0x44, 0x07, 0xc7, 0x5a, 0xeb, 0xb6, 0xa9, 0x03, 0xc1, 0x44, 0x13, 0xed, 0x5d,
0x80, 0x3f, 0x36, 0x5c, 0x7b, 0x2f, 0xbb, 0xf1, 0xf9, 0x89, 0x16, 0x9a, 0xf8, 0x33, 0x74, 0x10, 0x79, 0xdd, 0xe5, 0x1f, 0xa9, 0x04, 0xf1, 0x17, 0x68, 0x3f, 0xa4, 0x51, 0x4a, 0x2b, 0xa4, 0x4a,
0xb0, 0x30, 0x61, 0x05, 0x52, 0xfb, 0xa6, 0x6d, 0xe3, 0x74, 0x36, 0x38, 0xb8, 0x58, 0xc8, 0xd0, 0xcc, 0xb6, 0x8d, 0xf3, 0x6c, 0xb4, 0x7f, 0x39, 0xb7, 0x42, 0x1e, 0x20, 0xa5, 0x31, 0x01, 0x61,
0x7b, 0x48, 0xfc, 0x3d, 0x6a, 0x2b, 0x08, 0x22, 0x9f, 0xa9, 0xdc, 0x44, 0xbb, 0xc7, 0x47, 0xeb, 0x1c, 0x50, 0x51, 0xc4, 0x67, 0xe7, 0xf4, 0x64, 0xf5, 0x8c, 0xbb, 0x62, 0xde, 0xb5, 0x26, 0xa8,
0xf7, 0xdd, 0xa5, 0xf0, 0xae, 0x0c, 0x41, 0xaf, 0xa6, 0xc2, 0x0a, 0xf3, 0x28, 0x2d, 0x04, 0x87, 0x71, 0x54, 0xe5, 0xa0, 0xac, 0x92, 0x4a, 0x70, 0xfc, 0x7b, 0x17, 0xf5, 0xab, 0x21, 0x83, 0x01,
0xbf, 0x37, 0x51, 0xa7, 0x58, 0x38, 0x18, 0x10, 0x72, 0xe7, 0x8f, 0x5a, 0x76, 0xeb, 0xda, 0x1d, 0x21, 0xb7, 0x7c, 0xc8, 0x7c, 0xd0, 0x56, 0xd1, 0xb0, 0xd6, 0x8d, 0x46, 0x35, 0x02, 0xea, 0xc9,
0xa3, 0x4d, 0xdd, 0x51, 0xac, 0x83, 0x72, 0xcb, 0x16, 0x21, 0x49, 0x2b, 0xc2, 0xf8, 0x05, 0xea, 0x5a, 0x95, 0x38, 0x69, 0x08, 0xe3, 0xef, 0x51, 0x9f, 0x0b, 0x9a, 0x08, 0xf5, 0x48, 0x3b, 0xef,
0x48, 0xc5, 0x62, 0xa5, 0x5f, 0x6b, 0xe3, 0xed, 0x5f, 0xeb, 0x7e, 0x3a, 0x1b, 0x74, 0xc6, 0x73, 0xf8, 0x48, 0xf7, 0xf2, 0x6c, 0xd4, 0x9f, 0x94, 0x74, 0x52, 0x2b, 0x61, 0x0f, 0xed, 0xd7, 0x09,
0x05, 0x5a, 0x8a, 0xe1, 0x09, 0x3a, 0x28, 0x7d, 0xf2, 0x7f, 0x77, 0x8f, 0x1e, 0xca, 0xe9, 0x82, 0x79, 0xaf, 0x61, 0xa3, 0xda, 0x71, 0x36, 0xa7, 0x41, 0x1e, 0x68, 0xca, 0x47, 0x5f, 0x04, 0x48,
0x0c, 0xbd, 0x27, 0x9b, 0x2d, 0x80, 0xdc, 0x49, 0xda, 0x2e, 0xad, 0x72, 0x01, 0xe4, 0xb6, 0xa3, 0xa5, 0xa4, 0x57, 0x3f, 0xfa, 0x22, 0x6d, 0x44, 0xaf, 0x62, 0x13, 0xf5, 0x79, 0xea, 0xba, 0x00,
0x26, 0x8b, 0x2d, 0xd4, 0x91, 0x89, 0xeb, 0x02, 0x78, 0xe0, 0xe9, 0x99, 0xb7, 0xec, 0x77, 0x0c, 0x1e, 0x78, 0xaa, 0xdb, 0x3d, 0xfb, 0x03, 0x0d, 0xed, 0x4f, 0xca, 0x05, 0x52, 0x63, 0xa4, 0xf0,
0xb4, 0x33, 0x9e, 0x27, 0x68, 0x89, 0xc9, 0x84, 0x5f, 0x32, 0xee, 0x83, 0xa7, 0x67, 0x5d, 0x11, 0x2b, 0xea, 0x07, 0xe0, 0xa9, 0x2e, 0x37, 0x84, 0xbf, 0x51, 0x55, 0xa2, 0x57, 0xed, 0x8f, 0xef,
0xfe, 0x4a, 0x47, 0xa9, 0xc9, 0xda, 0xef, 0xdf, 0xde, 0xf5, 0x6b, 0xaf, 0xef, 0xfa, 0xb5, 0xbf, 0xee, 0x87, 0xad, 0x37, 0xf7, 0xc3, 0xd6, 0xdf, 0xf7, 0xc3, 0xd6, 0x2f, 0xf9, 0xb0, 0x7d, 0x97,
0xef, 0xfa, 0xb5, 0x5f, 0xd2, 0x7e, 0xfd, 0x36, 0xed, 0xd7, 0x5f, 0xa7, 0xfd, 0xfa, 0x3f, 0x69, 0x0f, 0xdb, 0x6f, 0xf2, 0x61, 0xfb, 0x9f, 0x7c, 0xd8, 0xfe, 0xed, 0xdf, 0x61, 0xeb, 0x65, 0x67,
0xbf, 0xfe, 0xdb, 0xbf, 0xfd, 0xda, 0x77, 0x8d, 0xe9, 0xe8, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x66, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x37, 0xe1, 0x87, 0xd9, 0x08, 0x00, 0x00,
0x9f, 0xc8, 0x32, 0x84, 0xee, 0x08, 0x00, 0x00,
} }

14
pkg/apis/batch/v1/generated.proto
View File

@ -22,8 +22,8 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.apis.batch.v1; package k8s.io.kubernetes.pkg.apis.batch.v1;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/api/unversioned/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/meta/v1/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
@ -59,11 +59,11 @@ message JobCondition {
// Last time the condition was checked. // Last time the condition was checked.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3;
// Last time the condition transit from one status to another. // Last time the condition transit from one status to another.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4;
// (brief) reason for the condition's last transition. // (brief) reason for the condition's last transition.
// +optional // +optional
@ -79,7 +79,7 @@ message JobList {
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is the list of Job. // Items is the list of Job.
repeated Job items = 2; repeated Job items = 2;
@ -113,7 +113,7 @@ message JobSpec {
// Normally, the system sets this field for you. // Normally, the system sets this field for you.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4;
// ManualSelector controls generation of pod labels and pod selectors. // ManualSelector controls generation of pod labels and pod selectors.
// Leave `manualSelector` unset unless you are certain what you are doing. // Leave `manualSelector` unset unless you are certain what you are doing.
@ -145,13 +145,13 @@ message JobStatus {
// It is not guaranteed to be set in happens-before order across separate operations. // It is not guaranteed to be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2;
// CompletionTime represents time when the job was completed. It is not guaranteed to // CompletionTime represents time when the job was completed. It is not guaranteed to
// be set in happens-before order across separate operations. // be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3;
// Active is the number of actively running pods. // Active is the number of actively running pods.
// +optional // +optional

8
pkg/apis/batch/v1/register.go
View File

@ -18,6 +18,7 @@ package v1
import ( import (
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/schema"
versionedwatch "k8s.io/client-go/pkg/watch/versioned" versionedwatch "k8s.io/client-go/pkg/watch/versioned"
@ -29,6 +30,11 @@ const GroupName = "batch"
// 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: "v1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
@ -41,7 +47,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&JobList{}, &JobList{},
&v1.ListOptions{}, &v1.ListOptions{},
&v1.DeleteOptions{}, &v1.DeleteOptions{},
&v1.ExportOptions{}, &metav1.ExportOptions{},
) )
versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil return nil

30
pkg/apis/batch/v1/types.generated.go
View File

@ -26,8 +26,8 @@ import (
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg4_resource "k8s.io/client-go/pkg/api/resource" pkg4_resource "k8s.io/client-go/pkg/api/resource"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned"
pkg2_v1 "k8s.io/client-go/pkg/api/v1" pkg2_v1 "k8s.io/client-go/pkg/api/v1"
pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
pkg5_intstr "k8s.io/client-go/pkg/util/intstr" pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
"reflect" "reflect"
@ -66,8 +66,8 @@ func init() {
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg4_resource.Quantity var v0 pkg4_resource.Quantity
var v1 pkg1_unversioned.TypeMeta var v1 pkg2_v1.ObjectMeta
var v2 pkg2_v1.ObjectMeta var v2 pkg1_v1.TypeMeta
var v3 pkg3_types.UID var v3 pkg3_types.UID
var v4 pkg5_intstr.IntOrString var v4 pkg5_intstr.IntOrString
var v5 time.Time var v5 time.Time
@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv53 := &x.ListMeta yyv53 := &x.ListMeta
yym54 := z.DecBinary() yym54 := z.DecBinary()
@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv60 := &x.ListMeta yyv60 := &x.ListMeta
yym61 := z.DecBinary() yym61 := z.DecBinary()
@ -1099,7 +1099,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym102 := z.DecBinary() yym102 := z.DecBinary()
_ = yym102 _ = yym102
@ -1241,7 +1241,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym114 := z.DecBinary() yym114 := z.DecBinary()
_ = yym114 _ = yym114
@ -1620,7 +1620,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.StartTime == nil { if x.StartTime == nil {
x.StartTime = new(pkg1_unversioned.Time) x.StartTime = new(pkg1_v1.Time)
} }
yym144 := z.DecBinary() yym144 := z.DecBinary()
_ = yym144 _ = yym144
@ -1641,7 +1641,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.CompletionTime == nil { if x.CompletionTime == nil {
x.CompletionTime = new(pkg1_unversioned.Time) x.CompletionTime = new(pkg1_v1.Time)
} }
yym146 := z.DecBinary() yym146 := z.DecBinary()
_ = yym146 _ = yym146
@ -1726,7 +1726,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.StartTime == nil { if x.StartTime == nil {
x.StartTime = new(pkg1_unversioned.Time) x.StartTime = new(pkg1_v1.Time)
} }
yym154 := z.DecBinary() yym154 := z.DecBinary()
_ = yym154 _ = yym154
@ -1757,7 +1757,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.CompletionTime == nil { if x.CompletionTime == nil {
x.CompletionTime = new(pkg1_unversioned.Time) x.CompletionTime = new(pkg1_v1.Time)
} }
yym156 := z.DecBinary() yym156 := z.DecBinary()
_ = yym156 _ = yym156
@ -2124,7 +2124,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "lastProbeTime": case "lastProbeTime":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastProbeTime = pkg1_unversioned.Time{} x.LastProbeTime = pkg1_v1.Time{}
} else { } else {
yyv189 := &x.LastProbeTime yyv189 := &x.LastProbeTime
yym190 := z.DecBinary() yym190 := z.DecBinary()
@ -2141,7 +2141,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "lastTransitionTime": case "lastTransitionTime":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastTransitionTime = pkg1_unversioned.Time{} x.LastTransitionTime = pkg1_v1.Time{}
} else { } else {
yyv191 := &x.LastTransitionTime yyv191 := &x.LastTransitionTime
yym192 := z.DecBinary() yym192 := z.DecBinary()
@ -2226,7 +2226,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastProbeTime = pkg1_unversioned.Time{} x.LastProbeTime = pkg1_v1.Time{}
} else { } else {
yyv198 := &x.LastProbeTime yyv198 := &x.LastProbeTime
yym199 := z.DecBinary() yym199 := z.DecBinary()
@ -2253,7 +2253,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastTransitionTime = pkg1_unversioned.Time{} x.LastTransitionTime = pkg1_v1.Time{}
} else { } else {
yyv200 := &x.LastTransitionTime yyv200 := &x.LastTransitionTime
yym201 := z.DecBinary() yym201 := z.DecBinary()

18
pkg/apis/batch/v1/types.go
View File

@ -17,15 +17,15 @@ limitations under the License.
package v1 package v1
import ( import (
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
// Job represents the configuration of a single job. // Job represents the configuration of a single job.
type Job struct { type Job struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -44,11 +44,11 @@ type Job struct {
// JobList is a collection of jobs. // JobList is a collection of jobs.
type JobList struct { type JobList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is the list of Job. // Items is the list of Job.
Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -83,7 +83,7 @@ type JobSpec struct {
// Normally, the system sets this field for you. // Normally, the system sets this field for you.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
// +optional // +optional
Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"`
// ManualSelector controls generation of pod labels and pod selectors. // ManualSelector controls generation of pod labels and pod selectors.
// Leave `manualSelector` unset unless you are certain what you are doing. // Leave `manualSelector` unset unless you are certain what you are doing.
@ -116,13 +116,13 @@ type JobStatus struct {
// It is not guaranteed to be set in happens-before order across separate operations. // It is not guaranteed to be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"`
// CompletionTime represents time when the job was completed. It is not guaranteed to // CompletionTime represents time when the job was completed. It is not guaranteed to
// be set in happens-before order across separate operations. // be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"`
// Active is the number of actively running pods. // Active is the number of actively running pods.
// +optional // +optional
@ -155,10 +155,10 @@ type JobCondition struct {
Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"`
// Last time the condition was checked. // Last time the condition was checked.
// +optional // +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"`
// Last time the condition transit from one status to another. // Last time the condition transit from one status to another.
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"`
// (brief) reason for the condition's last transition. // (brief) reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"`

14
pkg/apis/batch/v1/zz_generated.conversion.go
View File

@ -22,9 +22,9 @@ package v1
import ( import (
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
unversioned "k8s.io/client-go/pkg/api/unversioned"
api_v1 "k8s.io/client-go/pkg/api/v1" api_v1 "k8s.io/client-go/pkg/api/v1"
batch "k8s.io/client-go/pkg/apis/batch" batch "k8s.io/client-go/pkg/apis/batch"
meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
unsafe "unsafe" unsafe "unsafe"
@ -159,7 +159,7 @@ func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s
out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism))
out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.Completions = (*int32)(unsafe.Pointer(in.Completions))
out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector))
out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector))
if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
@ -171,7 +171,7 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s
out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism))
out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.Completions = (*int32)(unsafe.Pointer(in.Completions))
out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector))
out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector))
if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
@ -181,8 +181,8 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s
func autoConvert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { func autoConvert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error {
out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions))
out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime))
out.Active = in.Active out.Active = in.Active
out.Succeeded = in.Succeeded out.Succeeded = in.Succeeded
out.Failed = in.Failed out.Failed = in.Failed
@ -195,8 +195,8 @@ func Convert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus
func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error {
out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions))
out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime))
out.Active = in.Active out.Active = in.Active
out.Succeeded = in.Succeeded out.Succeeded = in.Succeeded
out.Failed = in.Failed out.Failed = in.Failed

10
pkg/apis/batch/v1/zz_generated.deepcopy.go
View File

@ -21,8 +21,8 @@ limitations under the License.
package v1 package v1
import ( import (
unversioned "k8s.io/client-go/pkg/api/unversioned"
api_v1 "k8s.io/client-go/pkg/api/v1" api_v1 "k8s.io/client-go/pkg/api/v1"
meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
reflect "reflect" reflect "reflect"
@ -124,8 +124,8 @@ func DeepCopy_v1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner)
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(meta_v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {
@ -162,14 +162,14 @@ func DeepCopy_v1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner
} }
if in.StartTime != nil { if in.StartTime != nil {
in, out := &in.StartTime, &out.StartTime in, out := &in.StartTime, &out.StartTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.StartTime = nil out.StartTime = nil
} }
if in.CompletionTime != nil { if in.CompletionTime != nil {
in, out := &in.CompletionTime, &out.CompletionTime in, out := &in.CompletionTime, &out.CompletionTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.CompletionTime = nil out.CompletionTime = nil

172
pkg/apis/batch/v2alpha1/generated.pb.go
View File

@ -43,8 +43,8 @@ import proto "github.com/gogo/protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned"
import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1"
import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
import strings "strings" import strings "strings"
import reflect "reflect" import reflect "reflect"
@ -832,7 +832,7 @@ func (this *CronJobList) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&CronJobList{`, s := strings.Join([]string{`&CronJobList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CronJob", "CronJob", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CronJob", "CronJob", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
@ -858,7 +858,7 @@ func (this *CronJobStatus) String() string {
} }
s := strings.Join([]string{`&CronJobStatus{`, s := strings.Join([]string{`&CronJobStatus{`,
`Active:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Active), "ObjectReference", "k8s_io_kubernetes_pkg_api_v1.ObjectReference", 1), `&`, ``, 1) + `,`, `Active:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Active), "ObjectReference", "k8s_io_kubernetes_pkg_api_v1.ObjectReference", 1), `&`, ``, 1) + `,`,
`LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, `LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -882,8 +882,8 @@ func (this *JobCondition) String() string {
s := strings.Join([]string{`&JobCondition{`, s := strings.Join([]string{`&JobCondition{`,
`Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`,
`Status:` + fmt.Sprintf("%v", this.Status) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`,
`LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`,
`LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`,
`Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`,
`Message:` + fmt.Sprintf("%v", this.Message) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`,
`}`, `}`,
@ -895,7 +895,7 @@ func (this *JobList) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&JobList{`, s := strings.Join([]string{`&JobList{`,
`ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`,
`Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
@ -909,7 +909,7 @@ func (this *JobSpec) String() string {
`Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`,
`Completions:` + valueToStringGenerated(this.Completions) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`,
`ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`,
`Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`,
`ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`,
`Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`,
`}`, `}`,
@ -922,8 +922,8 @@ func (this *JobStatus) String() string {
} }
s := strings.Join([]string{`&JobStatus{`, s := strings.Join([]string{`&JobStatus{`,
`Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`,
`StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`,
`CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`,
`Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`,
`Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`,
`Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`,
@ -1478,7 +1478,7 @@ func (m *CronJobStatus) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.LastScheduleTime == nil { if m.LastScheduleTime == nil {
m.LastScheduleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} m.LastScheduleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{}
} }
if err := m.LastScheduleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.LastScheduleTime.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -2098,7 +2098,7 @@ func (m *JobSpec) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Selector == nil { if m.Selector == nil {
m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{}
} }
if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -2263,7 +2263,7 @@ func (m *JobStatus) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.StartTime == nil { if m.StartTime == nil {
m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{}
} }
if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -2296,7 +2296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.CompletionTime == nil { if m.CompletionTime == nil {
m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{}
} }
if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err return err
@ -2706,77 +2706,77 @@ var (
) )
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 1149 bytes of a gzipped FileDescriptorProto // 1137 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x6f, 0xe3, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4b, 0x6f, 0x23, 0x45,
0x18, 0xae, 0x93, 0x36, 0x1f, 0x93, 0xed, 0xd7, 0x40, 0xb5, 0xa1, 0x48, 0x49, 0x15, 0x09, 0xd4, 0x17, 0x4d, 0xdb, 0x89, 0x1f, 0xe5, 0x3c, 0xeb, 0xfb, 0xa2, 0x31, 0x41, 0xb2, 0x23, 0x4b, 0xa0,
0x85, 0xad, 0xad, 0x46, 0x05, 0x96, 0x3d, 0x20, 0xad, 0x8b, 0x90, 0xa8, 0x5a, 0x6d, 0x35, 0xe9, 0x0c, 0x4a, 0xba, 0x15, 0x2b, 0x82, 0x61, 0x16, 0x48, 0xd3, 0x41, 0x48, 0x44, 0x89, 0x26, 0x2a,
0x42, 0x05, 0x0b, 0x62, 0x62, 0x4f, 0x13, 0x6f, 0x6d, 0x8f, 0xf1, 0x8c, 0x8b, 0x7a, 0xe3, 0xcc, 0x27, 0x30, 0x1a, 0x66, 0x41, 0xb9, 0xbb, 0xe2, 0x74, 0xd2, 0xee, 0x6a, 0xba, 0xaa, 0x23, 0x65,
0x09, 0x89, 0x1f, 0xc0, 0xef, 0x40, 0x82, 0x03, 0x07, 0xa4, 0x1e, 0x17, 0x24, 0x24, 0x4e, 0x11, 0xc7, 0x9a, 0x15, 0x12, 0x3f, 0x80, 0x7f, 0xc1, 0x82, 0x1d, 0xac, 0xb2, 0x60, 0x31, 0xb0, 0x62,
0x35, 0xff, 0xa2, 0x27, 0xe4, 0xf1, 0xf8, 0x23, 0x5f, 0xa5, 0x29, 0x5a, 0x24, 0x6e, 0xf1, 0x3b, 0x65, 0x91, 0xe6, 0x5f, 0x64, 0x85, 0xaa, 0x5c, 0xfd, 0xf0, 0x93, 0x38, 0x68, 0x90, 0xd8, 0xb9,
0xcf, 0xf3, 0xcc, 0x3b, 0xf3, 0x3e, 0xf3, 0xbe, 0x01, 0xef, 0x9e, 0x3e, 0x60, 0xaa, 0x45, 0xb5, 0x6f, 0x9d, 0x73, 0xea, 0x56, 0xdd, 0x53, 0xf7, 0x1a, 0x7c, 0x78, 0xf9, 0x84, 0xe9, 0x0e, 0x35,
0xd3, 0xa0, 0x4b, 0x7c, 0x97, 0x70, 0xc2, 0x34, 0xef, 0xb4, 0xa7, 0x61, 0xcf, 0x62, 0x5a, 0x17, 0x2e, 0xc3, 0x36, 0x09, 0x3c, 0xc2, 0x09, 0x33, 0xfc, 0xcb, 0x8e, 0x81, 0x7d, 0x87, 0x19, 0x6d,
0x73, 0xa3, 0xaf, 0x9d, 0xb5, 0xb1, 0xed, 0xf5, 0xf1, 0xb6, 0xd6, 0x23, 0x2e, 0xf1, 0x31, 0x27, 0xcc, 0xad, 0x73, 0xe3, 0xaa, 0x89, 0x5d, 0xff, 0x1c, 0xef, 0x1a, 0x1d, 0xe2, 0x91, 0x00, 0x73,
0xa6, 0xea, 0xf9, 0x94, 0x53, 0x78, 0x2f, 0xa6, 0xaa, 0x19, 0x55, 0xf5, 0x4e, 0x7b, 0x6a, 0x44, 0x62, 0xeb, 0x7e, 0x40, 0x39, 0x85, 0x8f, 0xfb, 0x54, 0x3d, 0xa5, 0xea, 0xfe, 0x65, 0x47, 0x17,
0x55, 0x05, 0x55, 0x4d, 0xa8, 0xeb, 0x5b, 0x3d, 0x8b, 0xf7, 0x83, 0xae, 0x6a, 0x50, 0x47, 0xeb, 0x54, 0x5d, 0x52, 0xf5, 0x98, 0xba, 0xb1, 0xd3, 0x71, 0xf8, 0x79, 0xd8, 0xd6, 0x2d, 0xda, 0x35,
0xd1, 0x1e, 0xd5, 0x84, 0x42, 0x37, 0x38, 0x11, 0x5f, 0xe2, 0x43, 0xfc, 0x8a, 0x95, 0xd7, 0xdb, 0x3a, 0xb4, 0x43, 0x0d, 0xa9, 0xd0, 0x0e, 0xcf, 0xe4, 0x97, 0xfc, 0x90, 0xbf, 0xfa, 0xca, 0x1b,
0x53, 0x93, 0xd2, 0x7c, 0xc2, 0x68, 0xe0, 0x1b, 0x64, 0x34, 0x9b, 0xf5, 0xb7, 0xa6, 0x73, 0x02, 0xcd, 0x89, 0x49, 0x19, 0x01, 0x61, 0x34, 0x0c, 0x2c, 0x32, 0x9c, 0xcd, 0xc6, 0xf6, 0x64, 0xce,
0xf7, 0x8c, 0xf8, 0xcc, 0xa2, 0x2e, 0x31, 0xc7, 0x68, 0xf7, 0xa7, 0xd3, 0xce, 0xc6, 0x8e, 0xbc, 0xd5, 0x48, 0xee, 0x53, 0x76, 0x60, 0x46, 0x97, 0x70, 0x3c, 0x8e, 0xb3, 0x33, 0x9e, 0x13, 0x84,
0xbe, 0x35, 0x19, 0xed, 0x07, 0x2e, 0xb7, 0x9c, 0xf1, 0x9c, 0x76, 0xae, 0x87, 0x33, 0xa3, 0x4f, 0x1e, 0x77, 0xba, 0xa3, 0x09, 0xed, 0x4d, 0x87, 0x33, 0xeb, 0x9c, 0x74, 0xf1, 0x08, 0x6b, 0x77,
0x1c, 0x3c, 0xc6, 0xda, 0x9e, 0xcc, 0x0a, 0xb8, 0x65, 0x6b, 0x96, 0xcb, 0x19, 0xf7, 0x47, 0x29, 0x3c, 0x2b, 0xe4, 0x8e, 0x6b, 0x38, 0x1e, 0x67, 0x3c, 0x18, 0xa6, 0x34, 0xbe, 0xcf, 0x81, 0xe2,
0xad, 0xef, 0x0b, 0xa0, 0xbc, 0xeb, 0x53, 0x77, 0x8f, 0x76, 0xe1, 0x31, 0xa8, 0x38, 0x84, 0x63, 0x7e, 0x40, 0xbd, 0x03, 0xda, 0x86, 0x2f, 0x40, 0x49, 0xa4, 0x6f, 0x63, 0x8e, 0xab, 0xda, 0xa6,
0x13, 0x73, 0x5c, 0x57, 0x36, 0x94, 0xcd, 0x5a, 0x7b, 0x53, 0x9d, 0x5a, 0x29, 0xf5, 0x6c, 0x5b, 0xb6, 0x55, 0x69, 0x6e, 0xe9, 0x13, 0xcb, 0xa4, 0x5f, 0xed, 0xea, 0xcf, 0xdb, 0x17, 0xc4, 0xe2,
0x7d, 0xdc, 0x7d, 0x46, 0x0c, 0x7e, 0x40, 0x38, 0xd6, 0xe1, 0xc5, 0xa0, 0x39, 0x17, 0x0e, 0x9a, 0x47, 0x84, 0x63, 0x13, 0xde, 0xf4, 0xea, 0x73, 0x51, 0xaf, 0x0e, 0xd2, 0x18, 0x4a, 0xd4, 0xe0,
0x20, 0x8b, 0xa1, 0x54, 0x0d, 0x1e, 0x83, 0x79, 0xe6, 0x11, 0xa3, 0x5e, 0x10, 0xaa, 0x6f, 0xab, 0x0b, 0x30, 0xcf, 0x7c, 0x62, 0x55, 0x73, 0x52, 0xf5, 0x7d, 0xfd, 0xde, 0xc5, 0xd7, 0x55, 0x6e,
0x37, 0xae, 0xbf, 0x2a, 0x73, 0xeb, 0x78, 0xc4, 0xd0, 0xef, 0xc8, 0x3d, 0xe6, 0xa3, 0x2f, 0x24, 0x2d, 0x9f, 0x58, 0xe6, 0xa2, 0xda, 0x63, 0x5e, 0x7c, 0x21, 0xa9, 0x08, 0xbf, 0x04, 0x05, 0xc6,
0x14, 0xe1, 0x17, 0xa0, 0xc4, 0x38, 0xe6, 0x01, 0xab, 0x17, 0x85, 0xf6, 0x83, 0x5b, 0x68, 0x0b, 0x31, 0x0f, 0x59, 0x35, 0x2f, 0xb5, 0x9f, 0x3c, 0x40, 0x5b, 0xf2, 0xcd, 0x65, 0xa5, 0x5e, 0xe8,
0xbe, 0xbe, 0x24, 0xd5, 0x4b, 0xf1, 0x37, 0x92, 0xba, 0xad, 0x5f, 0x14, 0x50, 0x93, 0xc8, 0x7d, 0x7f, 0x23, 0xa5, 0xdb, 0xf8, 0x59, 0x03, 0x15, 0x85, 0x3c, 0x74, 0x18, 0x87, 0x2f, 0x47, 0x6e,
0x8b, 0x71, 0xf8, 0xd9, 0xd8, 0x2d, 0x69, 0xd7, 0xdc, 0x52, 0xce, 0x41, 0x6a, 0x44, 0x17, 0x97, 0x69, 0x7b, 0xda, 0x9e, 0x02, 0x2b, 0xee, 0x4a, 0x70, 0xe5, 0x4d, 0xad, 0xaa, 0x7d, 0x4a, 0x71,
0xb5, 0x22, 0xb7, 0xaa, 0x24, 0x91, 0xdc, 0x55, 0x7d, 0x0c, 0x16, 0x2c, 0x4e, 0x1c, 0x56, 0x2f, 0x24, 0x73, 0x4f, 0x9f, 0x83, 0x05, 0x87, 0x93, 0x2e, 0xab, 0xe6, 0x36, 0xf3, 0x5b, 0x95, 0x66,
0x6c, 0x14, 0x37, 0x6b, 0xed, 0xf6, 0xec, 0xe7, 0xd1, 0x17, 0xa5, 0xfc, 0xc2, 0x87, 0x91, 0x10, 0x73, 0xf6, 0xc3, 0x98, 0x4b, 0x4a, 0x7e, 0xe1, 0x53, 0x21, 0x84, 0xfa, 0x7a, 0x8d, 0x6f, 0xf2,
0x8a, 0xf5, 0x5a, 0xdf, 0x14, 0xd3, 0x73, 0x44, 0xf7, 0x07, 0xef, 0x83, 0x4a, 0x64, 0x23, 0x33, 0xc9, 0x21, 0xc4, 0xe5, 0xc1, 0x6d, 0x50, 0x12, 0x1e, 0xb2, 0x43, 0x97, 0xc8, 0x43, 0x94, 0xd3,
0xb0, 0x89, 0x38, 0x47, 0x35, 0x4b, 0xab, 0x23, 0xe3, 0x28, 0x45, 0xc0, 0x27, 0xe0, 0x2e, 0xe3, 0xb4, 0x5a, 0x2a, 0x8e, 0x12, 0x04, 0x3c, 0x05, 0x8f, 0x18, 0xc7, 0x01, 0x77, 0xbc, 0xce, 0xc7,
0xd8, 0xe7, 0x96, 0xdb, 0x7b, 0x9f, 0x60, 0xd3, 0xb6, 0x5c, 0xd2, 0x21, 0x06, 0x75, 0x4d, 0x26, 0x04, 0xdb, 0xae, 0xe3, 0x91, 0x16, 0xb1, 0xa8, 0x67, 0x33, 0x59, 0xd1, 0xbc, 0xf9, 0x76, 0xd4,
0x8a, 0x5a, 0xd4, 0x5f, 0x0d, 0x07, 0xcd, 0xbb, 0x9d, 0xc9, 0x10, 0x34, 0x8d, 0x0b, 0x9f, 0x82, 0xab, 0x3f, 0x6a, 0x8d, 0x87, 0xa0, 0x49, 0x5c, 0xf8, 0x0a, 0xac, 0x59, 0xd4, 0xb3, 0xc2, 0x20,
0x55, 0x83, 0xba, 0x46, 0xe0, 0xfb, 0xc4, 0x35, 0xce, 0x0f, 0xa9, 0x6d, 0x19, 0xe7, 0xa2, 0x92, 0x20, 0x9e, 0x75, 0x7d, 0x4c, 0x5d, 0xc7, 0xba, 0x96, 0x65, 0x2c, 0x9b, 0xba, 0xca, 0x66, 0x6d,
0x55, 0x5d, 0x95, 0xd9, 0xac, 0xee, 0x8e, 0x02, 0xae, 0x26, 0x05, 0xd1, 0xb8, 0x10, 0x7c, 0x0d, 0x7f, 0x18, 0x70, 0x37, 0x2e, 0x88, 0x46, 0x85, 0xe0, 0x3b, 0xa0, 0xc8, 0x42, 0xe6, 0x13, 0xcf,
0x94, 0x59, 0xc0, 0x3c, 0xe2, 0x9a, 0xf5, 0xf9, 0x0d, 0x65, 0xb3, 0xa2, 0xd7, 0xc2, 0x41, 0xb3, 0xae, 0xce, 0x6f, 0x6a, 0x5b, 0x25, 0xb3, 0x12, 0xf5, 0xea, 0xc5, 0x56, 0x3f, 0x84, 0xe2, 0x35,
0xdc, 0x89, 0x43, 0x28, 0x59, 0x83, 0x5f, 0x82, 0xda, 0x33, 0xda, 0x3d, 0x22, 0x8e, 0x67, 0x63, 0xf8, 0x15, 0xa8, 0x5c, 0xd0, 0xf6, 0x09, 0xe9, 0xfa, 0x2e, 0xe6, 0xa4, 0xba, 0x20, 0x2b, 0xfa,
0x4e, 0xea, 0x0b, 0xa2, 0xa8, 0x0f, 0x67, 0xb8, 0xf8, 0xbd, 0x8c, 0x2d, 0x8c, 0xfa, 0x92, 0x4c, 0x74, 0x86, 0x8b, 0x3f, 0x48, 0xd9, 0xd2, 0xa5, 0xff, 0x53, 0xa9, 0x57, 0x32, 0x0b, 0x28, 0xbb,
0xbd, 0x96, 0x5b, 0x40, 0xf9, 0x3d, 0x5a, 0xbf, 0x2b, 0x60, 0x71, 0xc8, 0x7e, 0xf0, 0x09, 0x28, 0x47, 0xe3, 0x37, 0x0d, 0x2c, 0x0d, 0x78, 0x0f, 0x9e, 0x82, 0x02, 0xb6, 0xb8, 0x73, 0x25, 0x8a,
0x61, 0x83, 0x5b, 0x67, 0x51, 0x31, 0xa2, 0xc2, 0x6f, 0xdd, 0xe4, 0xe9, 0x21, 0x72, 0x42, 0xa2, 0x21, 0x0a, 0xbf, 0x73, 0x9f, 0x77, 0x87, 0xc8, 0x19, 0x11, 0x07, 0x26, 0xa9, 0x75, 0x9f, 0x49,
0x03, 0x93, 0xcc, 0xbd, 0x8f, 0x84, 0x08, 0x92, 0x62, 0xd0, 0x01, 0x2b, 0x36, 0x66, 0x3c, 0xa9, 0x11, 0xa4, 0xc4, 0xe0, 0x05, 0x58, 0x75, 0x31, 0xe3, 0x71, 0x45, 0x4f, 0x9c, 0x2e, 0x91, 0x77,
0xe8, 0x91, 0xe5, 0x10, 0x71, 0x17, 0xb5, 0xf6, 0x9b, 0x37, 0x74, 0x6d, 0x44, 0xd1, 0x5f, 0x0e, 0x31, 0xf5, 0x61, 0xa7, 0x96, 0x15, 0x78, 0xf3, 0xff, 0x51, 0xaf, 0xbe, 0x7a, 0x38, 0xa4, 0x82,
0x07, 0xcd, 0x95, 0xfd, 0x11, 0x21, 0x34, 0x26, 0xdd, 0xfa, 0xae, 0x00, 0x8a, 0x2f, 0xb6, 0x95, 0x46, 0x74, 0x1b, 0xdf, 0xe5, 0x40, 0xfe, 0xcd, 0x36, 0x91, 0x93, 0x81, 0x26, 0xd2, 0x9c, 0xad,
0x1c, 0x0d, 0xb5, 0x92, 0xf6, 0x6c, 0x55, 0x9a, 0xda, 0x46, 0x9e, 0x8e, 0xb4, 0x91, 0x9d, 0x19, 0x44, 0x13, 0x1b, 0xc8, 0xab, 0xa1, 0x06, 0xb2, 0x37, 0xa3, 0xee, 0xf4, 0xe6, 0xf1, 0x4b, 0x1e,
0x75, 0xaf, 0x6f, 0x21, 0xbf, 0x15, 0xc1, 0x9d, 0x3d, 0xda, 0xdd, 0xa5, 0xae, 0x69, 0x71, 0x8b, 0x2c, 0x1e, 0xd0, 0xf6, 0x3e, 0xf5, 0x6c, 0x87, 0x3b, 0xd4, 0x83, 0x7b, 0x60, 0x9e, 0x5f, 0xfb,
0xba, 0x70, 0x07, 0xcc, 0xf3, 0x73, 0x2f, 0x79, 0x77, 0x1b, 0x49, 0x42, 0x47, 0xe7, 0x1e, 0xb9, 0xf1, 0xa3, 0xdb, 0x8c, 0x13, 0x3a, 0xb9, 0xf6, 0xc9, 0x5d, 0xaf, 0xbe, 0x9a, 0xc5, 0x8a, 0x18,
0x1a, 0x34, 0x57, 0xf2, 0xd8, 0x28, 0x86, 0x04, 0x1a, 0x7e, 0x94, 0x26, 0x59, 0x10, 0xbc, 0xf7, 0x92, 0x68, 0xf8, 0x59, 0x92, 0x64, 0x4e, 0xf2, 0x3e, 0x1a, 0xdc, 0xee, 0xae, 0x57, 0x9f, 0x3a,
0x86, 0xb7, 0xbb, 0x1a, 0x34, 0xaf, 0x9d, 0x49, 0x6a, 0xaa, 0x39, 0x9c, 0x1e, 0xec, 0x83, 0xc5, 0xc1, 0xf4, 0x44, 0x73, 0x30, 0x3d, 0x48, 0xc0, 0x92, 0x28, 0xe4, 0x71, 0x40, 0xdb, 0x7d, 0x77,
0xa8, 0x90, 0x87, 0x3e, 0xed, 0xc6, 0x06, 0x29, 0xce, 0x6e, 0x90, 0x35, 0x99, 0xcb, 0xe2, 0x7e, 0xe4, 0x67, 0x74, 0xc7, 0xba, 0x4a, 0x64, 0xe9, 0x30, 0x2b, 0x83, 0x06, 0x55, 0x21, 0x07, 0x50,
0x5e, 0x09, 0x0d, 0x0b, 0xc3, 0xaf, 0x00, 0x8c, 0x02, 0x47, 0x3e, 0x76, 0x59, 0x7c, 0xba, 0x5b, 0x04, 0x4e, 0x02, 0xec, 0xb1, 0xfe, 0xd1, 0x1e, 0xe2, 0xc4, 0x0d, 0xb5, 0x17, 0x3c, 0x1c, 0xd1,
0xfa, 0x71, 0x5d, 0x6e, 0x07, 0xf7, 0xc7, 0xe4, 0xd0, 0x84, 0x2d, 0xe0, 0xeb, 0xa0, 0xe4, 0x13, 0x42, 0x63, 0xf4, 0xe1, 0xbb, 0xa0, 0x10, 0x10, 0xcc, 0xa8, 0x27, 0x1f, 0x75, 0x39, 0xad, 0x11,
0xcc, 0xa8, 0x2b, 0x5e, 0x77, 0x35, 0xab, 0x14, 0x12, 0x51, 0x24, 0x57, 0xe1, 0x3d, 0x50, 0x76, 0x92, 0x51, 0xa4, 0x56, 0xe1, 0x63, 0x50, 0xec, 0x12, 0xc6, 0x70, 0x87, 0x54, 0x0b, 0x12, 0xb8,
0x08, 0x63, 0xb8, 0x47, 0xea, 0x25, 0x01, 0x5c, 0x96, 0xc0, 0xf2, 0x41, 0x1c, 0x46, 0xc9, 0x7a, 0xa2, 0x80, 0xc5, 0xa3, 0x7e, 0x18, 0xc5, 0xeb, 0x8d, 0x1f, 0x35, 0x50, 0xfc, 0x37, 0xe6, 0x40,
0xeb, 0x27, 0x05, 0x94, 0xff, 0xa3, 0x99, 0xd0, 0x19, 0x9e, 0x09, 0xea, 0x6c, 0xe6, 0x9c, 0x32, 0x6b, 0x70, 0x0e, 0xe8, 0xb3, 0x79, 0x72, 0xc2, 0x0c, 0xf8, 0x21, 0x2f, 0x93, 0x97, 0xfd, 0x7f,
0x0f, 0x7e, 0x28, 0x8a, 0xfc, 0xc5, 0x2c, 0xd8, 0x06, 0x35, 0x0f, 0xfb, 0xd8, 0xb6, 0x89, 0x6d, 0x17, 0x54, 0x7c, 0x1c, 0x60, 0xd7, 0x25, 0xae, 0xc3, 0xba, 0x32, 0xff, 0x05, 0x73, 0x45, 0x74,
0x31, 0x47, 0x1c, 0x61, 0x41, 0x5f, 0x8e, 0x3a, 0xd8, 0x61, 0x16, 0x46, 0x79, 0x4c, 0x44, 0x31, 0xad, 0xe3, 0x34, 0x8c, 0xb2, 0x18, 0x41, 0xb1, 0x68, 0xd7, 0x77, 0x89, 0xb8, 0xe0, 0xbe, 0x11,
0xa8, 0xe3, 0xd9, 0x24, 0xba, 0xe3, 0xd8, 0x91, 0x92, 0xb2, 0x9b, 0x85, 0x51, 0x1e, 0x03, 0x1f, 0x15, 0x65, 0x3f, 0x0d, 0xa3, 0x2c, 0x06, 0x3e, 0x07, 0xeb, 0xfd, 0x4e, 0x34, 0x3c, 0x35, 0xf2,
0x83, 0xb5, 0xb8, 0x2b, 0x8d, 0x4e, 0x90, 0xa2, 0x98, 0x20, 0xaf, 0x84, 0x83, 0xe6, 0xda, 0xa3, 0x72, 0x6a, 0xbc, 0x15, 0xf5, 0xea, 0xeb, 0xcf, 0xc6, 0x01, 0xd0, 0x78, 0x1e, 0xfc, 0x02, 0x94,
0x49, 0x00, 0x34, 0x99, 0x07, 0x3f, 0x07, 0x15, 0x46, 0x6c, 0x62, 0x70, 0xea, 0x4b, 0x13, 0xed, 0x18, 0x71, 0x89, 0xc5, 0x69, 0xa0, 0xec, 0xb3, 0x7b, 0xaf, 0x3b, 0xc7, 0x6d, 0xe2, 0xb6, 0x14,
0xdc, 0xf4, 0xda, 0x71, 0x97, 0xd8, 0x1d, 0xc9, 0xd5, 0xef, 0x88, 0xa1, 0x27, 0xbf, 0x50, 0xaa, 0xd1, 0x5c, 0x94, 0x53, 0x4e, 0x7d, 0xa1, 0x44, 0x10, 0x3e, 0x05, 0xcb, 0x5d, 0xec, 0x85, 0x38,
0x09, 0x1f, 0x82, 0x25, 0x07, 0xbb, 0x01, 0x4e, 0x91, 0xc2, 0x3d, 0x15, 0x1d, 0x86, 0x83, 0xe6, 0x41, 0x4a, 0xdf, 0x94, 0x4c, 0x18, 0xf5, 0xea, 0xcb, 0x47, 0x03, 0x2b, 0x68, 0x08, 0x29, 0x12,
0xd2, 0xc1, 0xd0, 0x0a, 0x1a, 0x41, 0xc2, 0x4f, 0x41, 0x85, 0x27, 0x13, 0xa5, 0x24, 0x72, 0xfb, 0xe3, 0xf1, 0x08, 0x29, 0xc8, 0xc4, 0xfe, 0xa6, 0x85, 0x1f, 0x53, 0x7b, 0x60, 0x6a, 0x24, 0x6e,
0x87, 0x8e, 0x7e, 0x48, 0xcd, 0xa1, 0x21, 0x92, 0x1a, 0x22, 0x9d, 0x20, 0xa9, 0x60, 0xeb, 0xc7, 0x48, 0x46, 0x46, 0x22, 0x28, 0x0a, 0x57, 0x4e, 0x67, 0xc5, 0x25, 0x00, 0x56, 0xfc, 0x9c, 0x99,
0x22, 0xa8, 0x66, 0xa3, 0xe3, 0x14, 0x00, 0x23, 0x79, 0xda, 0x4c, 0x8e, 0x8f, 0x77, 0x66, 0xf3, 0x9a, 0x17, 0x1f, 0xcc, 0x66, 0x90, 0xa4, 0x1d, 0xa4, 0x1d, 0x37, 0x09, 0x31, 0x94, 0x91, 0x87,
0x48, 0xda, 0x1a, 0xb2, 0xee, 0x9b, 0x86, 0x18, 0xca, 0xc9, 0xc3, 0x63, 0x50, 0x15, 0xc3, 0x5c, 0xa7, 0xa0, 0x2c, 0xa7, 0xb7, 0x7c, 0xb0, 0xb9, 0x19, 0x1f, 0xec, 0x52, 0xd4, 0xab, 0x97, 0x5b,
0xbc, 0xdc, 0xc2, 0xec, 0x2f, 0x77, 0x31, 0x1c, 0x34, 0xab, 0x9d, 0x44, 0x01, 0x65, 0x62, 0xb0, 0x31, 0x1d, 0xa5, 0x4a, 0xd0, 0x06, 0xcb, 0xa9, 0x4f, 0x1e, 0xd4, 0x78, 0x64, 0x51, 0xf6, 0x07,
0x07, 0x96, 0x32, 0xb7, 0xdc, 0xb6, 0x0f, 0x89, 0xd2, 0xec, 0x0e, 0xc9, 0xa0, 0x11, 0xd9, 0xa8, 0x34, 0xd0, 0x90, 0xa6, 0x68, 0x00, 0x6a, 0xaa, 0xce, 0x4b, 0xb3, 0x4e, 0x1a, 0x93, 0x06, 0x28,
0x19, 0xc8, 0x51, 0x3b, 0x2f, 0x5c, 0x3b, 0x6d, 0x76, 0x6a, 0xa0, 0xca, 0x02, 0xc3, 0x20, 0xc4, 0xb3, 0xd0, 0xb2, 0x08, 0xb1, 0x89, 0x2d, 0x6b, 0xbe, 0x60, 0xae, 0x29, 0x68, 0xb9, 0x15, 0x2f,
0x24, 0xa6, 0xa8, 0xfc, 0x82, 0xbe, 0x2a, 0xa1, 0xd5, 0x4e, 0xb2, 0x80, 0x32, 0x4c, 0x24, 0x7c, 0xa0, 0x14, 0x23, 0x84, 0xcf, 0xb0, 0xe3, 0x12, 0x5b, 0xd6, 0x3a, 0x23, 0xfc, 0x89, 0x8c, 0x22,
0x82, 0x2d, 0x9b, 0x98, 0xa2, 0xe2, 0x39, 0xe1, 0x0f, 0x44, 0x14, 0xc9, 0xd5, 0xd6, 0xaf, 0x0a, 0xb5, 0xda, 0xf8, 0x55, 0x03, 0xd9, 0x7f, 0x01, 0x6f, 0x70, 0x36, 0x9e, 0x67, 0xfc, 0x97, 0xfb,
0xc8, 0xff, 0x35, 0x78, 0x81, 0xd3, 0xb2, 0x9f, 0x73, 0x61, 0xe1, 0x5f, 0xff, 0xaf, 0xb9, 0xce, 0xc7, 0x7f, 0x61, 0xa6, 0x99, 0xf1, 0x27, 0x0d, 0xac, 0x0c, 0xe1, 0xff, 0x6b, 0x33, 0xdf, 0x7c,
0x92, 0x3f, 0x2b, 0x60, 0x79, 0x04, 0xff, 0x7f, 0xfb, 0x17, 0xa0, 0xbf, 0x71, 0x71, 0xd9, 0x98, 0xef, 0xe6, 0xb6, 0x36, 0xf7, 0xfa, 0xb6, 0x36, 0xf7, 0xfb, 0x6d, 0x6d, 0xee, 0xeb, 0xa8, 0xa6,
0x7b, 0x7e, 0xd9, 0x98, 0xfb, 0xe3, 0xb2, 0x31, 0xf7, 0x75, 0xd8, 0x50, 0x2e, 0xc2, 0x86, 0xf2, 0xdd, 0x44, 0x35, 0xed, 0x75, 0x54, 0xd3, 0xfe, 0x88, 0x6a, 0xda, 0xb7, 0x7f, 0xd6, 0xe6, 0x5e,
0x3c, 0x6c, 0x28, 0x7f, 0x86, 0x0d, 0xe5, 0xdb, 0xbf, 0x1a, 0x73, 0x9f, 0x54, 0x12, 0x9d, 0xbf, 0x96, 0x62, 0x9d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x1c, 0xb0, 0x5a, 0xe4, 0x0e, 0x00,
0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0x47, 0xe8, 0xb0, 0xff, 0x0e, 0x00, 0x00, 0x00,
} }

18
pkg/apis/batch/v2alpha1/generated.proto
View File

@ -22,8 +22,8 @@ syntax = 'proto2';
package k8s.io.kubernetes.pkg.apis.batch.v2alpha1; package k8s.io.kubernetes.pkg.apis.batch.v2alpha1;
import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
import "k8s.io/kubernetes/pkg/api/unversioned/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/meta/v1/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto";
import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
@ -54,7 +54,7 @@ message CronJobList {
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is the list of CronJob. // Items is the list of CronJob.
repeated CronJob items = 2; repeated CronJob items = 2;
@ -92,7 +92,7 @@ message CronJobStatus {
// LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // LastScheduleTime keeps information of when was the last time the job was successfully scheduled.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScheduleTime = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScheduleTime = 4;
} }
// Job represents the configuration of a single job. // Job represents the configuration of a single job.
@ -123,11 +123,11 @@ message JobCondition {
// Last time the condition was checked. // Last time the condition was checked.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3;
// Last time the condition transit from one status to another. // Last time the condition transit from one status to another.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4;
// (brief) reason for the condition's last transition. // (brief) reason for the condition's last transition.
// +optional // +optional
@ -143,7 +143,7 @@ message JobList {
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1;
// Items is the list of Job. // Items is the list of Job.
repeated Job items = 2; repeated Job items = 2;
@ -177,7 +177,7 @@ message JobSpec {
// Normally, the system sets this field for you. // Normally, the system sets this field for you.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4;
// ManualSelector controls generation of pod labels and pod selectors. // ManualSelector controls generation of pod labels and pod selectors.
// Leave `manualSelector` unset unless you are certain what you are doing. // Leave `manualSelector` unset unless you are certain what you are doing.
@ -209,13 +209,13 @@ message JobStatus {
// It is not guaranteed to be set in happens-before order across separate operations. // It is not guaranteed to be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2;
// CompletionTime represents time when the job was completed. It is not guaranteed to // CompletionTime represents time when the job was completed. It is not guaranteed to
// be set in happens-before order across separate operations. // be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3;
// Active is the number of actively running pods. // Active is the number of actively running pods.
// +optional // +optional

5
pkg/apis/batch/v2alpha1/register.go
View File

@ -29,6 +29,11 @@ const GroupName = "batch"
// 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: "v2alpha1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2alpha1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
var ( var (
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs)
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme

38
pkg/apis/batch/v2alpha1/types.generated.go
View File

@ -26,8 +26,8 @@ import (
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg4_resource "k8s.io/client-go/pkg/api/resource" pkg4_resource "k8s.io/client-go/pkg/api/resource"
pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned"
pkg2_v1 "k8s.io/client-go/pkg/api/v1" pkg2_v1 "k8s.io/client-go/pkg/api/v1"
pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1"
pkg3_types "k8s.io/client-go/pkg/types" pkg3_types "k8s.io/client-go/pkg/types"
pkg5_intstr "k8s.io/client-go/pkg/util/intstr" pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
"reflect" "reflect"
@ -66,8 +66,8 @@ func init() {
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg4_resource.Quantity var v0 pkg4_resource.Quantity
var v1 pkg1_unversioned.TypeMeta var v1 pkg2_v1.ObjectMeta
var v2 pkg2_v1.ObjectMeta var v2 pkg1_v1.TypeMeta
var v3 pkg3_types.UID var v3 pkg3_types.UID
var v4 pkg5_intstr.IntOrString var v4 pkg5_intstr.IntOrString
var v5 time.Time var v5 time.Time
@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv53 := &x.ListMeta yyv53 := &x.ListMeta
yym54 := z.DecBinary() yym54 := z.DecBinary()
@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv60 := &x.ListMeta yyv60 := &x.ListMeta
yym61 := z.DecBinary() yym61 := z.DecBinary()
@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym144 := z.DecBinary() yym144 := z.DecBinary()
_ = yym144 _ = yym144
@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.Selector == nil { if x.Selector == nil {
x.Selector = new(pkg1_unversioned.LabelSelector) x.Selector = new(pkg1_v1.LabelSelector)
} }
yym156 := z.DecBinary() yym156 := z.DecBinary()
_ = yym156 _ = yym156
@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.StartTime == nil { if x.StartTime == nil {
x.StartTime = new(pkg1_unversioned.Time) x.StartTime = new(pkg1_v1.Time)
} }
yym186 := z.DecBinary() yym186 := z.DecBinary()
_ = yym186 _ = yym186
@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.CompletionTime == nil { if x.CompletionTime == nil {
x.CompletionTime = new(pkg1_unversioned.Time) x.CompletionTime = new(pkg1_v1.Time)
} }
yym188 := z.DecBinary() yym188 := z.DecBinary()
_ = yym188 _ = yym188
@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.StartTime == nil { if x.StartTime == nil {
x.StartTime = new(pkg1_unversioned.Time) x.StartTime = new(pkg1_v1.Time)
} }
yym196 := z.DecBinary() yym196 := z.DecBinary()
_ = yym196 _ = yym196
@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.CompletionTime == nil { if x.CompletionTime == nil {
x.CompletionTime = new(pkg1_unversioned.Time) x.CompletionTime = new(pkg1_v1.Time)
} }
yym198 := z.DecBinary() yym198 := z.DecBinary()
_ = yym198 _ = yym198
@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "lastProbeTime": case "lastProbeTime":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastProbeTime = pkg1_unversioned.Time{} x.LastProbeTime = pkg1_v1.Time{}
} else { } else {
yyv231 := &x.LastProbeTime yyv231 := &x.LastProbeTime
yym232 := z.DecBinary() yym232 := z.DecBinary()
@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "lastTransitionTime": case "lastTransitionTime":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastTransitionTime = pkg1_unversioned.Time{} x.LastTransitionTime = pkg1_v1.Time{}
} else { } else {
yyv233 := &x.LastTransitionTime yyv233 := &x.LastTransitionTime
yym234 := z.DecBinary() yym234 := z.DecBinary()
@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastProbeTime = pkg1_unversioned.Time{} x.LastProbeTime = pkg1_v1.Time{}
} else { } else {
yyv240 := &x.LastProbeTime yyv240 := &x.LastProbeTime
yym241 := z.DecBinary() yym241 := z.DecBinary()
@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.LastTransitionTime = pkg1_unversioned.Time{} x.LastTransitionTime = pkg1_v1.Time{}
} else { } else {
yyv242 := &x.LastTransitionTime yyv242 := &x.LastTransitionTime
yym243 := z.DecBinary() yym243 := z.DecBinary()
@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv298 := &x.ListMeta yyv298 := &x.ListMeta
yym299 := z.DecBinary() yym299 := z.DecBinary()
@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ListMeta = pkg1_unversioned.ListMeta{} x.ListMeta = pkg1_v1.ListMeta{}
} else { } else {
yyv305 := &x.ListMeta yyv305 := &x.ListMeta
yym306 := z.DecBinary() yym306 := z.DecBinary()
@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.LastScheduleTime == nil { if x.LastScheduleTime == nil {
x.LastScheduleTime = new(pkg1_unversioned.Time) x.LastScheduleTime = new(pkg1_v1.Time)
} }
yym362 := z.DecBinary() yym362 := z.DecBinary()
_ = yym362 _ = yym362
@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
} else { } else {
if x.LastScheduleTime == nil { if x.LastScheduleTime == nil {
x.LastScheduleTime = new(pkg1_unversioned.Time) x.LastScheduleTime = new(pkg1_v1.Time)
} }
yym367 := z.DecBinary() yym367 := z.DecBinary()
_ = yym367 _ = yym367

28
pkg/apis/batch/v2alpha1/types.go
View File

@ -17,15 +17,15 @@ limitations under the License.
package v2alpha1 package v2alpha1
import ( import (
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
) )
// +genclient=true // +genclient=true
// Job represents the configuration of a single job. // Job represents the configuration of a single job.
type Job struct { type Job struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -44,11 +44,11 @@ type Job struct {
// JobList is a collection of jobs. // JobList is a collection of jobs.
type JobList struct { type JobList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is the list of Job. // Items is the list of Job.
Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -56,7 +56,7 @@ type JobList struct {
// JobTemplate describes a template for creating copies of a predefined pod. // JobTemplate describes a template for creating copies of a predefined pod.
type JobTemplate struct { type JobTemplate struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -110,7 +110,7 @@ type JobSpec struct {
// Normally, the system sets this field for you. // Normally, the system sets this field for you.
// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
// +optional // +optional
Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"`
// ManualSelector controls generation of pod labels and pod selectors. // ManualSelector controls generation of pod labels and pod selectors.
// Leave `manualSelector` unset unless you are certain what you are doing. // Leave `manualSelector` unset unless you are certain what you are doing.
@ -143,13 +143,13 @@ type JobStatus struct {
// It is not guaranteed to be set in happens-before order across separate operations. // It is not guaranteed to be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"`
// CompletionTime represents time when the job was completed. It is not guaranteed to // CompletionTime represents time when the job was completed. It is not guaranteed to
// be set in happens-before order across separate operations. // be set in happens-before order across separate operations.
// It is represented in RFC3339 form and is in UTC. // It is represented in RFC3339 form and is in UTC.
// +optional // +optional
CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"`
// Active is the number of actively running pods. // Active is the number of actively running pods.
// +optional // +optional
@ -182,10 +182,10 @@ type JobCondition struct {
Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"`
// Last time the condition was checked. // Last time the condition was checked.
// +optional // +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"`
// Last time the condition transit from one status to another. // Last time the condition transit from one status to another.
// +optional // +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"`
// (brief) reason for the condition's last transition. // (brief) reason for the condition's last transition.
// +optional // +optional
Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"`
@ -198,7 +198,7 @@ type JobCondition struct {
// CronJob represents the configuration of a single cron job. // CronJob represents the configuration of a single cron job.
type CronJob struct { type CronJob struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard object's metadata. // Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
@ -217,11 +217,11 @@ type CronJob struct {
// CronJobList is a collection of cron jobs. // CronJobList is a collection of cron jobs.
type CronJobList struct { type CronJobList struct {
unversioned.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// Standard list metadata // Standard list metadata
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional // +optional
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is the list of CronJob. // Items is the list of CronJob.
Items []CronJob `json:"items" protobuf:"bytes,2,rep,name=items"` Items []CronJob `json:"items" protobuf:"bytes,2,rep,name=items"`
@ -278,5 +278,5 @@ type CronJobStatus struct {
// LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // LastScheduleTime keeps information of when was the last time the job was successfully scheduled.
// +optional // +optional
LastScheduleTime *unversioned.Time `json:"lastScheduleTime,omitempty" protobuf:"bytes,4,opt,name=lastScheduleTime"` LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty" protobuf:"bytes,4,opt,name=lastScheduleTime"`
} }

28
pkg/apis/batch/v2alpha1/zz_generated.conversion.go
View File

@ -22,9 +22,9 @@ package v2alpha1
import ( import (
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
unversioned "k8s.io/client-go/pkg/api/unversioned" api_v1 "k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/client-go/pkg/api/v1"
batch "k8s.io/client-go/pkg/apis/batch" batch "k8s.io/client-go/pkg/apis/batch"
v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
unsafe "unsafe" unsafe "unsafe"
@ -171,7 +171,7 @@ func Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec, ou
func autoConvert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error { func autoConvert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error {
out.Active = *(*[]api.ObjectReference)(unsafe.Pointer(&in.Active)) out.Active = *(*[]api.ObjectReference)(unsafe.Pointer(&in.Active))
out.LastScheduleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScheduleTime)) out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime))
return nil return nil
} }
@ -180,8 +180,8 @@ func Convert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, ou
} }
func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *CronJobStatus, s conversion.Scope) error { func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *CronJobStatus, s conversion.Scope) error {
out.Active = *(*[]v1.ObjectReference)(unsafe.Pointer(&in.Active)) out.Active = *(*[]api_v1.ObjectReference)(unsafe.Pointer(&in.Active))
out.LastScheduleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScheduleTime)) out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime))
return nil return nil
} }
@ -241,7 +241,7 @@ func Convert_v2alpha1_JobCondition_To_batch_JobCondition(in *JobCondition, out *
func autoConvert_batch_JobCondition_To_v2alpha1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error { func autoConvert_batch_JobCondition_To_v2alpha1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error {
out.Type = JobConditionType(in.Type) out.Type = JobConditionType(in.Type)
out.Status = v1.ConditionStatus(in.Status) out.Status = api_v1.ConditionStatus(in.Status)
out.LastProbeTime = in.LastProbeTime out.LastProbeTime = in.LastProbeTime
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
@ -297,9 +297,9 @@ func autoConvert_v2alpha1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSp
out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism))
out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.Completions = (*int32)(unsafe.Pointer(in.Completions))
out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector))
out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector))
if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
@ -309,9 +309,9 @@ func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSp
out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism))
out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.Completions = (*int32)(unsafe.Pointer(in.Completions))
out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector))
out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector))
if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
@ -319,8 +319,8 @@ func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSp
func autoConvert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { func autoConvert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error {
out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions))
out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime))
out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime))
out.Active = in.Active out.Active = in.Active
out.Succeeded = in.Succeeded out.Succeeded = in.Succeeded
out.Failed = in.Failed out.Failed = in.Failed
@ -333,8 +333,8 @@ func Convert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.Job
func autoConvert_batch_JobStatus_To_v2alpha1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { func autoConvert_batch_JobStatus_To_v2alpha1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error {
out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions))
out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime))
out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime))
out.Active = in.Active out.Active = in.Active
out.Succeeded = in.Succeeded out.Succeeded = in.Succeeded
out.Failed = in.Failed out.Failed = in.Failed

12
pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go
View File

@ -21,8 +21,8 @@ limitations under the License.
package v2alpha1 package v2alpha1
import ( import (
unversioned "k8s.io/client-go/pkg/api/unversioned"
v1 "k8s.io/client-go/pkg/api/v1" v1 "k8s.io/client-go/pkg/api/v1"
meta_v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
reflect "reflect" reflect "reflect"
@ -131,7 +131,7 @@ func DeepCopy_v2alpha1_CronJobStatus(in interface{}, out interface{}, c *convers
} }
if in.LastScheduleTime != nil { if in.LastScheduleTime != nil {
in, out := &in.LastScheduleTime, &out.LastScheduleTime in, out := &in.LastScheduleTime, &out.LastScheduleTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.LastScheduleTime = nil out.LastScheduleTime = nil
@ -220,8 +220,8 @@ func DeepCopy_v2alpha1_JobSpec(in interface{}, out interface{}, c *conversion.Cl
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(meta_v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {
@ -258,14 +258,14 @@ func DeepCopy_v2alpha1_JobStatus(in interface{}, out interface{}, c *conversion.
} }
if in.StartTime != nil { if in.StartTime != nil {
in, out := &in.StartTime, &out.StartTime in, out := &in.StartTime, &out.StartTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.StartTime = nil out.StartTime = nil
} }
if in.CompletionTime != nil { if in.CompletionTime != nil {
in, out := &in.CompletionTime, &out.CompletionTime in, out := &in.CompletionTime, &out.CompletionTime
*out = new(unversioned.Time) *out = new(meta_v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.CompletionTime = nil out.CompletionTime = nil

12
pkg/apis/batch/zz_generated.deepcopy.go
View File

@ -22,7 +22,7 @@ package batch
import ( import (
api "k8s.io/client-go/pkg/api" api "k8s.io/client-go/pkg/api"
unversioned "k8s.io/client-go/pkg/api/unversioned" v1 "k8s.io/client-go/pkg/apis/meta/v1"
conversion "k8s.io/client-go/pkg/conversion" conversion "k8s.io/client-go/pkg/conversion"
runtime "k8s.io/client-go/pkg/runtime" runtime "k8s.io/client-go/pkg/runtime"
reflect "reflect" reflect "reflect"
@ -131,7 +131,7 @@ func DeepCopy_batch_CronJobStatus(in interface{}, out interface{}, c *conversion
} }
if in.LastScheduleTime != nil { if in.LastScheduleTime != nil {
in, out := &in.LastScheduleTime, &out.LastScheduleTime in, out := &in.LastScheduleTime, &out.LastScheduleTime
*out = new(unversioned.Time) *out = new(v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.LastScheduleTime = nil out.LastScheduleTime = nil
@ -220,8 +220,8 @@ func DeepCopy_batch_JobSpec(in interface{}, out interface{}, c *conversion.Clone
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(unversioned.LabelSelector) *out = new(v1.LabelSelector)
if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil {
return err return err
} }
} else { } else {
@ -258,14 +258,14 @@ func DeepCopy_batch_JobStatus(in interface{}, out interface{}, c *conversion.Clo
} }
if in.StartTime != nil { if in.StartTime != nil {
in, out := &in.StartTime, &out.StartTime in, out := &in.StartTime, &out.StartTime
*out = new(unversioned.Time) *out = new(v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.StartTime = nil out.StartTime = nil
} }
if in.CompletionTime != nil { if in.CompletionTime != nil {
in, out := &in.CompletionTime, &out.CompletionTime in, out := &in.CompletionTime, &out.CompletionTime
*out = new(unversioned.Time) *out = new(v1.Time)
**out = (*in).DeepCopy() **out = (*in).DeepCopy()
} else { } else {
out.CompletionTime = nil out.CompletionTime = nil

14
pkg/apis/certificates/OWNERS Executable file
View File

@ -0,0 +1,14 @@
reviewers:
- thockin
- lavalamp
- smarterclayton
- deads2k
- caesarxuchao
- liggitt
- sttts
- timothysc
- dims
- errordeveloper
- mbohlool
- david-mcmahon
- jianhuiz

Some files were not shown because too many files have changed in this diff Show More