kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10690 from bharath-123/task/remove-unused-param 

Remove unused instanceGroup parameter from setClusterFields
This commit is contained in:
Kubernetes Prow Robot 2021-02-04 01:04:29 -08:00 committed by GitHub
parent 1885ccee17 515fbf1c1c
commit 75df2e5cf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/create_cluster.go
View File

@ -504,7 +504,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
cluster.Spec.MasterPublicName = c.MasterPublicName cluster.Spec.MasterPublicName = c.MasterPublicName
} }
if err := commands.SetClusterFields(c.Overrides, cluster, instanceGroups); err != nil { if err := commands.SetClusterFields(c.Overrides, cluster); err != nil {
return err return err
} }

4
pkg/commands/set_cluster.go
View File

@ -61,7 +61,7 @@ func RunSetCluster(ctx context.Context, f *util.Factory, cmd *cobra.Command, out
return err return err
} }
if err := SetClusterFields(options.Fields, cluster, instanceGroups); err != nil { if err := SetClusterFields(options.Fields, cluster); err != nil {
return err return err
} }
@ -73,7 +73,7 @@ func RunSetCluster(ctx context.Context, f *util.Factory, cmd *cobra.Command, out
} }
// SetClusterFields sets field values in the cluster // SetClusterFields sets field values in the cluster
func SetClusterFields(fields []string, cluster *api.Cluster, instanceGroups []*api.InstanceGroup) error { func SetClusterFields(fields []string, cluster *api.Cluster) error {
for _, field := range fields { for _, field := range fields {
kv := strings.SplitN(field, "=", 2) kv := strings.SplitN(field, "=", 2)
if len(kv) != 2 { if len(kv) != 2 {

8
pkg/commands/set_cluster_test.go
View File

@ -29,7 +29,7 @@ func TestSetClusterBadInput(t *testing.T) {
"bad-set-input", "bad-set-input",
} }
err := SetClusterFields(fields, &kops.Cluster{}, []*kops.InstanceGroup{}) err := SetClusterFields(fields, &kops.Cluster{})
if err == nil { if err == nil {
t.Errorf("expected a field parsing error, but received none") t.Errorf("expected a field parsing error, but received none")
} }
@ -310,10 +310,9 @@ func TestSetClusterFields(t *testing.T) {
} }
for _, g := range grid { for _, g := range grid {
var igs []*kops.InstanceGroup
c := g.Input c := g.Input
err := SetClusterFields(g.Fields, &c, igs) err := SetClusterFields(g.Fields, &c)
if err != nil { if err != nil {
t.Errorf("unexpected error from setClusterFields %v: %v", g.Fields, err) t.Errorf("unexpected error from setClusterFields %v: %v", g.Fields, err)
continue continue
@ -362,10 +361,9 @@ func TestSetCiliumFields(t *testing.T) {
} }
for _, g := range grid { for _, g := range grid {
var igs []*kops.InstanceGroup
c := g.Input c := g.Input
err := SetClusterFields(g.Fields, &c, igs) err := SetClusterFields(g.Fields, &c)
if err != nil { if err != nil {
t.Errorf("unexpected error from setClusterFields %v: %v", g.Fields, err) t.Errorf("unexpected error from setClusterFields %v: %v", g.Fields, err)
continue continue