Skip to content

Commit

Permalink
cleaned up after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Petersen committed Oct 7, 2020
1 parent 7ebe011 commit 0bc3b80
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 192 deletions.
35 changes: 1 addition & 34 deletions docs/cmd/kn_service_create.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,41 +86,8 @@ kn service create NAME --image IMAGE
--requests-cpu string DEPRECATED: please use --request instead. The requested CPU (e.g., 250m).
--requests-memory string DEPRECATED: please use --request instead. The requested memory (e.g., 64Mi).
--revision-name string The revision name to set. Must start with the service name and a dash as a prefix. Empty revision name will result in the server generating a name for the revision. Accepts golang templates, allowing {{.Service}} for the service name, {{.Generation}} for the generation, and {{.Random [n]}} for n random consonants. (default "{{.Service}}-{{.Random 5}}-{{.Generation}}")
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
--scale string Minimum and maximum number of replicas. (default "1")
=======
=======
>>>>>>> 94a12104... Fixed issues related to reviews and cleaned up some of the logic
<<<<<<< HEAD
--scale int Minimum and maximum number of replicas.
--scale-init int Initial number of replicas with which a service starts. Can be 0 or a positive integer.
=======
--scale string Minimum and maximum number of replicas. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> Added range options to --scale
<<<<<<< HEAD
>>>>>>> 5fe3da0e... Added range options to --scale
=======
=======
--scale string Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> Fixed issues related to reviews and cleaned up some of the logic
>>>>>>> 94a12104... Fixed issues related to reviews and cleaned up some of the logic
=======
--scale string Minimum and maximum number of replicas. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> 2d7c206c... Ran build to update docs/created a helper script
=======
--scale string Minimum and maximum number of replicas. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> 29dc3a98... Added range options to --scale
=======
--scale string Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> 49c7a26a... Fixed issues related to reviews and cleaned up some of the logic
=======
--scale string Minimum and maximum number of replicas. (default "1")
>>>>>>> 7f05b8c4... Ran build to update docs/created a helper script
--scale string Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 or
--scale-max int Maximum number of replicas.
--scale-min int Minimum number of replicas.
--service-account string Service account name to set. An empty argument ("") clears the service account. The referenced service account must exist in the service's namespace.
Expand Down
35 changes: 1 addition & 34 deletions docs/cmd/kn_service_update.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,41 +69,8 @@ kn service update NAME
--requests-cpu string DEPRECATED: please use --request instead. The requested CPU (e.g., 250m).
--requests-memory string DEPRECATED: please use --request instead. The requested memory (e.g., 64Mi).
--revision-name string The revision name to set. Must start with the service name and a dash as a prefix. Empty revision name will result in the server generating a name for the revision. Accepts golang templates, allowing {{.Service}} for the service name, {{.Generation}} for the generation, and {{.Random [n]}} for n random consonants. (default "{{.Service}}-{{.Random 5}}-{{.Generation}}")
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
--scale string Minimum and maximum number of replicas. (default "1")
=======
=======
>>>>>>> 94a12104... Fixed issues related to reviews and cleaned up some of the logic
<<<<<<< HEAD
--scale int Minimum and maximum number of replicas.
--scale-init int Initial number of replicas with which a service starts. Can be 0 or a positive integer.
=======
--scale string Minimum and maximum number of replicas. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> Added range options to --scale
<<<<<<< HEAD
>>>>>>> 5fe3da0e... Added range options to --scale
=======
=======
--scale string Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> Fixed issues related to reviews and cleaned up some of the logic
>>>>>>> 94a12104... Fixed issues related to reviews and cleaned up some of the logic
=======
--scale string Minimum and maximum number of replicas. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> 2d7c206c... Ran build to update docs/created a helper script
=======
--scale string Minimum and maximum number of replicas. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> 29dc3a98... Added range options to --scale
=======
--scale string Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 or --scale 1..5 or --scale 1.. or --scale ..5.
>>>>>>> 49c7a26a... Fixed issues related to reviews and cleaned up some of the logic
=======
--scale string Minimum and maximum number of replicas. (default "1")
>>>>>>> 7f05b8c4... Ran build to update docs/created a helper script
--scale string Set the Minimum and Maximum number of replicas. You can use this flag to set both to a single value, or set a range with min/max values, or set either min or max values without specifying the other. Example: --scale 5 or
--scale-max int Maximum number of replicas.
--scale-min int Minimum number of replicas.
--service-account string Service account name to set. An empty argument ("") clears the service account. The referenced service account must exist in the service's namespace.
Expand Down
120 changes: 0 additions & 120 deletions pkg/kn/commands/service/configuration_edit_flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,7 @@ func (p *ConfigurationEditFlags) addSharedFlags(command *cobra.Command) {
command.Flags().MarkHidden("max-scale")
p.markFlagMakesRevision("max-scale")

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
command.Flags().StringVar(&p.Scale, "scale", "1", "Minimum and maximum number of replicas. (e.g., 1..5)")
=======
command.Flags().StringVar(&p.Scale, "scale", "", "Minimum and maximum number of replicas.")
>>>>>>> 29dc3a98... Added range options to --scale
=======
command.Flags().StringVar(&p.Scale, "scale", "1", "Minimum and maximum number of replicas.")
>>>>>>> 49c7a26a... Fixed issues related to reviews and cleaned up some of the logic
=======
command.Flags().StringVar(&p.Scale, "scale", "1", "Minimum and maximum number of replicas. (e.g., 1..5)")
>>>>>>> 3050e558... Updated wording and scaleconversion
p.markFlagMakesRevision("scale")

command.Flags().IntVar(&p.MinScale, "scale-min", 0, "Minimum number of replicas.")
Expand Down Expand Up @@ -352,71 +340,18 @@ func (p *ConfigurationEditFlags) Apply(
} else if cmd.Flags().Changed("scale-min") {
return fmt.Errorf("only --scale or --scale-min can be specified")
} else {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
scaleMin, scaleMax, err := p.scaleConversion(p.Scale)
if err != nil {
return err
}
=======
scaleMin, scaleMax, err := p.ScaleConversion(p.Scale)
<<<<<<< HEAD
>>>>>>> f9e53d51... Updated helper function/cleaned it up and resolved failing tests
=======
=======
scaleMin, scaleMax, err := p.scaleConversion(p.Scale)
>>>>>>> 3050e558... Updated wording and scaleconversion
if err != nil {
return err
}
>>>>>>> 29514e26... Added checks for non ".." values and added more tests
err = servinglib.UpdateMaxScale(template, scaleMax)
if err != nil {
return err
}
err = servinglib.UpdateMinScale(template, scaleMin)
if err != nil {
return err
<<<<<<< HEAD
=======
if !strings.Contains(p.Scale, "..") {
scaleMin, _ := strconv.Atoi(p.Scale)
scaleMax := scaleMin
err = servinglib.UpdateMaxScale(template, scaleMax)
if err != nil {
return err
}
err = servinglib.UpdateMinScale(template, scaleMin)
if err != nil {
return err
}
} else {
scaleParts := strings.Split(p.Scale, "..")
scaleMin, _ := strconv.Atoi(scaleParts[0])
scaleMax, _ := strconv.Atoi(scaleParts[1])
if scaleMax > 0 {
err = servinglib.UpdateMaxScale(template, scaleMax)
if err != nil {
return err
}
}
if scaleMin > 0 {
err = servinglib.UpdateMinScale(template, scaleMin)
if err != nil {
return err
}
}
>>>>>>> 49c7a26a... Fixed issues related to reviews and cleaned up some of the logic
}

=======
p.ScaleConversion(template, p.Scale)
>>>>>>> 7f05b8c4... Ran build to update docs/created a helper script
=======
}
>>>>>>> f9e53d51... Updated helper function/cleaned it up and resolved failing tests
}
}

Expand Down Expand Up @@ -580,65 +515,14 @@ func (p *ConfigurationEditFlags) AnyMutation(cmd *cobra.Command) bool {
return false
}

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
func (p *ConfigurationEditFlags) scaleConversion(scale string) (scaleMin int, scaleMax int, err error) {
if len(scale) <= 2 {
if !strings.Contains(scale, "..") {
scaleMin, err = strconv.Atoi(scale)
if err != nil {
return 0, 0, err
}
scaleMax = scaleMin
}
} else if strings.Contains(scale, "..") {
scaleParts := strings.Split(scale, "..")
if scaleParts[0] != "" {
scaleMin, err = strconv.Atoi(scaleParts[0])
if err != nil {
return 0, 0, err
}
}
if scaleParts[1] != "" {
scaleMax, err = strconv.Atoi(scaleParts[1])
if err != nil {
return 0, 0, err
}
}
} else {
return 0, 0, errors.New("Scale must be of the format x..y or x")
}
return scaleMin, scaleMax, err
=======
func (p *ConfigurationEditFlags) ScaleConversion(template *servingv1.RevisionTemplateSpec, scale string) {
var scaleMin, scaleMax int
var err error

=======
func (p *ConfigurationEditFlags) ScaleConversion(scale string) (scaleMin int, scaleMax int, err error) {
<<<<<<< HEAD
>>>>>>> f9e53d51... Updated helper function/cleaned it up and resolved failing tests
if !strings.Contains(scale, "..") {
scaleMin, err = strconv.Atoi(scale)
if err != nil {
return 0, 0, err
=======
=======
=======
// Helper function for figuring out scale
>>>>>>> a8d3ddf8... Added comment about the helper function
func (p *ConfigurationEditFlags) scaleConversion(scale string) (scaleMin int, scaleMax int, err error) {
>>>>>>> 3050e558... Updated wording and scaleconversion
if len(scale) <= 2 {
if !strings.Contains(scale, "..") {
scaleMin, err = strconv.Atoi(scale)
if err != nil {
return 0, 0, err
}
scaleMax = scaleMin
>>>>>>> 29514e26... Added checks for non ".." values and added more tests
}
} else if strings.Contains(scale, "..") {
scaleParts := strings.Split(scale, "..")
Expand All @@ -657,9 +541,5 @@ func (p *ConfigurationEditFlags) scaleConversion(scale string) (scaleMin int, sc
} else {
return 0, 0, errors.New("Scale must be of the format x..y or x")
}
<<<<<<< HEAD
>>>>>>> 7f05b8c4... Ran build to update docs/created a helper script
=======
return scaleMin, scaleMax, err
>>>>>>> f9e53d51... Updated helper function/cleaned it up and resolved failing tests
}
4 changes: 0 additions & 4 deletions pkg/kn/commands/service/update_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,10 +582,6 @@ func TestServiceUpdateScaleRangeOnlyMaxWrongSeparator(t *testing.T) {
if !strings.Contains(err.Error(), expectedErrMsg) {
t.Errorf("Invalid error output, expected: %s, got : '%s'", expectedErrMsg, err)
}
<<<<<<< HEAD
=======

>>>>>>> 29514e26... Added checks for non ".." values and added more tests
}

func TestServiceUpdateEnv(t *testing.T) {
Expand Down

0 comments on commit 0bc3b80

Please sign in to comment.