From 7550c146dc283589e7e9f2fd0fec327174a8ba33 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Thu, 23 Oct 2014 16:55:58 -0400 Subject: [PATCH] Replace struct initializers for TypeMeta with ObjectMeta --- pkg/apiserver/operation.go | 2 +- pkg/kubecfg/kubecfg.go | 12 +++++++----- pkg/kubelet/server.go | 10 +++++----- pkg/master/master.go | 2 +- pkg/proxy/config/etcd.go | 2 +- pkg/registry/minion/rest.go | 2 +- pkg/registry/registrytest/minion.go | 2 +- pkg/service/endpoints_controller.go | 2 +- plugin/pkg/scheduler/scheduler.go | 6 +++--- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/pkg/apiserver/operation.go b/pkg/apiserver/operation.go index f1183038662..dcb27864225 100644 --- a/pkg/apiserver/operation.go +++ b/pkg/apiserver/operation.go @@ -125,7 +125,7 @@ func (ops *Operations) List() *api.ServerOpList { sort.StringSlice(ids).Sort() ol := &api.ServerOpList{} for _, id := range ids { - ol.Items = append(ol.Items, api.ServerOp{TypeMeta: api.TypeMeta{Name: id}}) + ol.Items = append(ol.Items, api.ServerOp{ObjectMeta: api.ObjectMeta{Name: id}}) } return ol } diff --git a/pkg/kubecfg/kubecfg.go b/pkg/kubecfg/kubecfg.go index 3d2843c294b..885f7756c4c 100644 --- a/pkg/kubecfg/kubecfg.go +++ b/pkg/kubecfg/kubecfg.go @@ -245,7 +245,7 @@ func RunController(ctx api.Context, image, name string, replicas int, client cli return err } controller := &api.ReplicationController{ - TypeMeta: api.TypeMeta{ + ObjectMeta: api.ObjectMeta{ Name: name, }, DesiredState: api.ReplicationControllerState{ @@ -299,11 +299,13 @@ func RunController(ctx api.Context, image, name string, replicas int, client cli func createService(ctx api.Context, name string, port int, client client.Interface) (*api.Service, error) { svc := &api.Service{ - TypeMeta: api.TypeMeta{Name: name}, - Port: port, - Labels: map[string]string{ - "simpleService": name, + ObjectMeta: api.ObjectMeta{ + Name: name, + Labels: map[string]string{ + "simpleService": name, + }, }, + Port: port, Selector: map[string]string{ "simpleService": name, }, diff --git a/pkg/kubelet/server.go b/pkg/kubelet/server.go index 238bbe1f254..c0e4822436b 100644 --- a/pkg/kubelet/server.go +++ b/pkg/kubelet/server.go @@ -204,7 +204,7 @@ func (s *Server) handleContainerLogs(w http.ResponseWriter, req *http.Request) { tail := uriValues.Get("tail") podFullName := GetPodFullName(&api.BoundPod{ - TypeMeta: api.TypeMeta{ + ObjectMeta: api.ObjectMeta{ Name: podID, Namespace: podNamespace, Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"}, @@ -248,7 +248,7 @@ func (s *Server) handlePodInfo(w http.ResponseWriter, req *http.Request) { } // TODO: backwards compatibility with existing API, needs API change podFullName := GetPodFullName(&api.BoundPod{ - TypeMeta: api.TypeMeta{ + ObjectMeta: api.ObjectMeta{ Name: podID, Namespace: podNamespace, Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"}, @@ -323,7 +323,7 @@ func (s *Server) handleRun(w http.ResponseWriter, req *http.Request) { return } podFullName := GetPodFullName(&api.BoundPod{ - TypeMeta: api.TypeMeta{ + ObjectMeta: api.ObjectMeta{ Name: podID, Namespace: podNamespace, Annotations: map[string]string{ConfigSourceAnnotationKey: "etcd"}, @@ -373,7 +373,7 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) { case 3: // Backward compatibility without uuid information podFullName := GetPodFullName(&api.BoundPod{ - TypeMeta: api.TypeMeta{ + ObjectMeta: api.ObjectMeta{ Name: components[1], // TODO: I am broken Namespace: api.NamespaceDefault, @@ -383,7 +383,7 @@ func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) { stats, err = s.host.GetContainerInfo(podFullName, "", components[2], &query) case 4: podFullName := GetPodFullName(&api.BoundPod{ - TypeMeta: api.TypeMeta{ + ObjectMeta: api.ObjectMeta{ Name: components[1], // TODO: I am broken Namespace: "", diff --git a/pkg/master/master.go b/pkg/master/master.go index 538e8341acc..bc708fdbc1e 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -125,7 +125,7 @@ func (m *Master) init(c *Config) { } else { for _, minionID := range c.Minions { m.minionRegistry.CreateMinion(nil, &api.Minion{ - TypeMeta: api.TypeMeta{Name: minionID}, + ObjectMeta: api.ObjectMeta{Name: minionID}, NodeResources: c.NodeResources, }) } diff --git a/pkg/proxy/config/etcd.go b/pkg/proxy/config/etcd.go index 13d69cb5809..1d536ed5a46 100644 --- a/pkg/proxy/config/etcd.go +++ b/pkg/proxy/config/etcd.go @@ -243,7 +243,7 @@ func (s ConfigSourceEtcd) ProcessChange(response *etcd.Response) { parts := strings.Split(response.Node.Key[1:], "/") if len(parts) == 4 { glog.V(4).Infof("Deleting service: %s", parts[3]) - serviceUpdate := ServiceUpdate{Op: REMOVE, Services: []api.Service{{TypeMeta: api.TypeMeta{Name: parts[3]}}}} + serviceUpdate := ServiceUpdate{Op: REMOVE, Services: []api.Service{{ObjectMeta: api.ObjectMeta{Name: parts[3]}}}} s.serviceChannel <- serviceUpdate return } diff --git a/pkg/registry/minion/rest.go b/pkg/registry/minion/rest.go index 01b7f17783b..ed1bbf48b07 100644 --- a/pkg/registry/minion/rest.go +++ b/pkg/registry/minion/rest.go @@ -106,7 +106,7 @@ func (rs *REST) Update(ctx api.Context, minion runtime.Object) (<-chan runtime.O } func (rs *REST) toApiMinion(name string) *api.Minion { - return &api.Minion{TypeMeta: api.TypeMeta{Name: name}} + return &api.Minion{ObjectMeta: api.ObjectMeta{Name: name}} } // ResourceLocation returns a URL to which one can send traffic for the specified minion. diff --git a/pkg/registry/registrytest/minion.go b/pkg/registry/registrytest/minion.go index d0ccf3b13d6..b7439e656f5 100644 --- a/pkg/registry/registrytest/minion.go +++ b/pkg/registry/registrytest/minion.go @@ -77,7 +77,7 @@ func (r *MinionRegistry) DeleteMinion(ctx api.Context, minionID string) error { var newList []api.Minion for _, node := range r.Minions.Items { if node.Name != minionID { - newList = append(newList, api.Minion{TypeMeta: api.TypeMeta{Name: node.Name}}) + newList = append(newList, api.Minion{ObjectMeta: api.ObjectMeta{Name: node.Name}}) } } r.Minions.Items = newList diff --git a/pkg/service/endpoints_controller.go b/pkg/service/endpoints_controller.go index 349af44618d..ee908bda782 100644 --- a/pkg/service/endpoints_controller.go +++ b/pkg/service/endpoints_controller.go @@ -76,7 +76,7 @@ func (e *EndpointController) SyncServiceEndpoints() error { if err != nil { if errors.IsNotFound(err) { currentEndpoints = &api.Endpoints{ - TypeMeta: api.TypeMeta{ + ObjectMeta: api.ObjectMeta{ Name: service.Name, }, } diff --git a/plugin/pkg/scheduler/scheduler.go b/plugin/pkg/scheduler/scheduler.go index a1fe15a354b..2828145d981 100644 --- a/plugin/pkg/scheduler/scheduler.go +++ b/plugin/pkg/scheduler/scheduler.go @@ -73,9 +73,9 @@ func (s *Scheduler) scheduleOne() { return } b := &api.Binding{ - TypeMeta: api.TypeMeta{Namespace: pod.Namespace}, - PodID: pod.Name, - Host: dest, + ObjectMeta: api.ObjectMeta{Namespace: pod.Namespace}, + PodID: pod.Name, + Host: dest, } if err := s.config.Binder.Bind(b); err != nil { record.Eventf(pod, "", string(api.PodWaiting), "failedScheduling", "Binding rejected: %v", err)