From b420871a118cd87595ceac9bec33a4e8e95c4021 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 31 Mar 2015 09:30:56 -0700 Subject: [PATCH] fixes from testing --- pkg/api/validation/validation.go | 1 + pkg/kubectl/describe.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index ee9f4ff28c0..5cfa3bad549 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -865,6 +865,7 @@ func ValidateServiceUpdate(oldService, service *api.Service) errs.ValidationErro allErrs = append(allErrs, errs.NewFieldInvalid("spec.portalIP", service.Spec.PortalIP, "field is immutable")) } + allErrs = append(allErrs, ValidateService(service)...) return allErrs } diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index 97907af03d4..449b440cf29 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -340,7 +340,7 @@ func describeService(service *api.Service, endpoints *api.Endpoints, events *api if name == "" { name = "" } - fmt.Fprintf(out, "Port:\t%s\t%d/%s\n", sp.Name, sp.Port, sp.Protocol) + fmt.Fprintf(out, "Port:\t%s\t%d/%s\n", name, sp.Port, sp.Protocol) } fmt.Fprintf(out, "Endpoints:\t%s\n", formatEndpoints(endpoints)) fmt.Fprintf(out, "Session Affinity:\t%s\n", service.Spec.SessionAffinity)