mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #2213 from ghodss/fix_build_errors
Fix two compilation errors when running go build ./...
This commit is contained in:
commit
5590adb2aa
@ -133,7 +133,7 @@ func generateService(name string, portSpec string) {
|
|||||||
|
|
||||||
svc := []v1beta3.Service{{
|
svc := []v1beta3.Service{{
|
||||||
TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "Service"},
|
TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "Service"},
|
||||||
Metadata: v1beta3.ObjectMeta{
|
ObjectMeta: v1beta3.ObjectMeta{
|
||||||
Name: name,
|
Name: name,
|
||||||
Labels: map[string]string{
|
Labels: map[string]string{
|
||||||
"service": name,
|
"service": name,
|
||||||
@ -167,7 +167,7 @@ func generatePodTemplate(sname string, cname string, podSpec v1beta3.PodSpec) {
|
|||||||
name := fmt.Sprintf("%s-%s", sname, cname)
|
name := fmt.Sprintf("%s-%s", sname, cname)
|
||||||
pt := []v1beta3.PodTemplate{{
|
pt := []v1beta3.PodTemplate{{
|
||||||
TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "PodTemplate"},
|
TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "PodTemplate"},
|
||||||
Metadata: v1beta3.ObjectMeta{
|
ObjectMeta: v1beta3.ObjectMeta{
|
||||||
Name: name,
|
Name: name,
|
||||||
Labels: map[string]string{
|
Labels: map[string]string{
|
||||||
"service": sname,
|
"service": sname,
|
||||||
@ -175,7 +175,7 @@ func generatePodTemplate(sname string, cname string, podSpec v1beta3.PodSpec) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
Spec: v1beta3.PodTemplateSpec{
|
Spec: v1beta3.PodTemplateSpec{
|
||||||
Metadata: v1beta3.ObjectMeta{
|
ObjectMeta: v1beta3.ObjectMeta{
|
||||||
Labels: map[string]string{
|
Labels: map[string]string{
|
||||||
"service": sname,
|
"service": sname,
|
||||||
"track": cname,
|
"track": cname,
|
||||||
@ -199,7 +199,7 @@ func generateReplicationController(sname string, cname string, replicas int) {
|
|||||||
name := fmt.Sprintf("%s-%s", sname, cname)
|
name := fmt.Sprintf("%s-%s", sname, cname)
|
||||||
rc := []v1beta3.ReplicationController{{
|
rc := []v1beta3.ReplicationController{{
|
||||||
TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "ReplicationController"},
|
TypeMeta: v1beta3.TypeMeta{APIVersion: "v1beta3", Kind: "ReplicationController"},
|
||||||
Metadata: v1beta3.ObjectMeta{
|
ObjectMeta: v1beta3.ObjectMeta{
|
||||||
Name: name,
|
Name: name,
|
||||||
Labels: map[string]string{
|
Labels: map[string]string{
|
||||||
"service": sname,
|
"service": sname,
|
||||||
|
@ -46,7 +46,6 @@ func init() {
|
|||||||
&OperationList{},
|
&OperationList{},
|
||||||
&Event{},
|
&Event{},
|
||||||
&EventList{},
|
&EventList{},
|
||||||
&ContainerManifestList{},
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,4 +69,3 @@ func (*Operation) IsAnAPIObject() {}
|
|||||||
func (*OperationList) IsAnAPIObject() {}
|
func (*OperationList) IsAnAPIObject() {}
|
||||||
func (*Event) IsAnAPIObject() {}
|
func (*Event) IsAnAPIObject() {}
|
||||||
func (*EventList) IsAnAPIObject() {}
|
func (*EventList) IsAnAPIObject() {}
|
||||||
func (*ContainerManifestList) IsAnAPIObject() {}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user