Merge pull request kubernetes#2213 from ghodss/fix_build_errors

Fix two compilation errors when running go build ./...
satnam6502 · Nov 6, 2014 · 5590adb · 5590adb
2 parents ae8c334 + cbd13b5
commit 5590adb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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,15 +167,15 @@ 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,
 				"track":   cname,
 			},
 		},
 		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
@@ -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()     {}