From 8a07eea1a21a65e1150d6a504c801e928807af4d Mon Sep 17 00:00:00 2001 From: Daisy Guo Date: Wed, 14 Oct 2020 17:14:29 +0800 Subject: [PATCH] refactor code base --- .../service/configuration_edit_flags.go | 44 ------------------- pkg/util/corev1_helper.go | 2 +- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/pkg/kn/commands/service/configuration_edit_flags.go b/pkg/kn/commands/service/configuration_edit_flags.go index 647a5040c8..1d4ff44757 100644 --- a/pkg/kn/commands/service/configuration_edit_flags.go +++ b/pkg/kn/commands/service/configuration_edit_flags.go @@ -245,50 +245,6 @@ func (p *ConfigurationEditFlags) Apply( fmt.Fprintf(cmd.OutOrStdout(), "\nWARNING: flags --requests-cpu / --requests-memory are deprecated and going to be removed in future release, please use --request instead.\n\n") } - limitsResources, err := p.computeResources(p.PodSpecFlags.LimitsFlags) - if err != nil { - return err - } - requestsResources, err := p.computeResources(p.PodSpecFlags.RequestsFlags) - if err != nil { - return err - } - err = servinglib.UpdateResourcesDeprecated(template, requestsResources, limitsResources) - if err != nil { - return err - } - - requestsToRemove, limitsToRemove, err := p.PodSpecFlags.Resources.Validate() - if err != nil { - return err - } - - err = servinglib.UpdateResources(template, p.PodSpecFlags.Resources.ResourceRequirements, requestsToRemove, limitsToRemove) - if err != nil { - return err - } - - if cmd.Flags().Changed("cmd") { - err = servinglib.UpdateContainerCommand(template, p.PodSpecFlags.Command) - if err != nil { - return err - } - } - - if cmd.Flags().Changed("arg") { - err = servinglib.UpdateContainerArg(template, p.PodSpecFlags.Arg) - if err != nil { - return err - } - } - - if cmd.Flags().Changed("port") { - err = servinglib.UpdateContainerPort(template, p.PodSpecFlags.Port) - if err != nil { - return err - } - } - // Deprecated "min-scale" in 0.19, updated to "scale-min" if cmd.Flags().Changed("scale-min") || cmd.Flags().Changed("min-scale") { err = servinglib.UpdateMinScale(template, p.MinScale) diff --git a/pkg/util/corev1_helper.go b/pkg/util/corev1_helper.go index 9c4cca36d7..22f23f2df2 100644 --- a/pkg/util/corev1_helper.go +++ b/pkg/util/corev1_helper.go @@ -68,7 +68,7 @@ func GenerateVolumeName(path string) string { // the name must start with an alphanumeric character if !unicode.IsLetter(rune(vname[0])) && !unicode.IsNumber(rune(vname[0])) { - vname = fmt.Sprintf("k-%s", vname) + vname = "k-" + vname } // contain at most 63 characters