From cbd13b599d8088bfd96a99fcd918775b2f23897d Mon Sep 17 00:00:00 2001 From: Sam Ghods Date: Thu, 6 Nov 2014 12:55:27 -0800 Subject: [PATCH] Fix two compilation errors when running go build ./... --- contrib/srvexpand/srvexpand.go | 8 ++++---- pkg/api/v1beta3/register.go | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/contrib/srvexpand/srvexpand.go b/contrib/srvexpand/srvexpand.go index a842961a396..dbb2dc3d69f 100644 --- a/contrib/srvexpand/srvexpand.go +++ b/contrib/srvexpand/srvexpand.go @@ -133,7 +133,7 @@ func generateService(name string, portSpec string) { svc := []v1beta3.Service{{ TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "Service"}, - Metadata: v1beta3.ObjectMeta{ + ObjectMeta: v1beta3.ObjectMeta{ Name: name, Labels: map[string]string{ "service": name, @@ -167,7 +167,7 @@ func generatePodTemplate(sname string, cname string, podSpec v1beta3.PodSpec) { name := fmt.Sprintf("%s-%s", sname, cname) pt := []v1beta3.PodTemplate{{ TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "PodTemplate"}, - Metadata: v1beta3.ObjectMeta{ + ObjectMeta: v1beta3.ObjectMeta{ Name: name, Labels: map[string]string{ "service": sname, @@ -175,7 +175,7 @@ func generatePodTemplate(sname string, cname string, podSpec v1beta3.PodSpec) { }, }, Spec: v1beta3.PodTemplateSpec{ - Metadata: v1beta3.ObjectMeta{ + ObjectMeta: v1beta3.ObjectMeta{ Labels: map[string]string{ "service": sname, "track": cname, @@ -199,7 +199,7 @@ func generateReplicationController(sname string, cname string, replicas int) { name := fmt.Sprintf("%s-%s", sname, cname) rc := []v1beta3.ReplicationController{{ TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "ReplicationController"}, - Metadata: v1beta3.ObjectMeta{ + ObjectMeta: v1beta3.ObjectMeta{ Name: name, Labels: map[string]string{ "service": sname, diff --git a/pkg/api/v1beta3/register.go b/pkg/api/v1beta3/register.go index c5dbecb512d..db6c3957f04 100644 --- a/pkg/api/v1beta3/register.go +++ b/pkg/api/v1beta3/register.go @@ -46,7 +46,6 @@ func init() { &OperationList{}, &Event{}, &EventList{}, - &ContainerManifestList{}, ) } @@ -70,4 +69,3 @@ func (*Operation) IsAnAPIObject() {} func (*OperationList) IsAnAPIObject() {} func (*Event) IsAnAPIObject() {} func (*EventList) IsAnAPIObject() {} -func (*ContainerManifestList) IsAnAPIObject() {}