Skip to content

Commit

Permalink
Merge pull request open-cluster-management-io#44 from itdove/typo_res…
Browse files Browse the repository at this point in the history
…ouce

Typo in ApplyCustomResouce(s)
  • Loading branch information
openshift-merge-robot authored Jul 9, 2021
2 parents 664568e + a62450d commit 2347693
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pkg/cmd/init/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func (o *Options) run() error {
}
}

out, err = applier.ApplyCustomResouces(reader, o.values, o.ClusteradmFlags.DryRun, "", "init/clustermanager.cr.yaml")
out, err = applier.ApplyCustomResources(reader, o.values, o.ClusteradmFlags.DryRun, "", "init/clustermanager.cr.yaml")
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/join/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (o *Options) run() error {
}
}

out, err = applier.ApplyCustomResouces(reader, o.values, o.ClusteradmFlags.DryRun, "", "join/klusterlets.cr.yaml")
out, err = applier.ApplyCustomResources(reader, o.values, o.ClusteradmFlags.DryRun, "", "join/klusterlets.cr.yaml")
if err != nil {
return err
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/helpers/apply/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@ func (a *Applier) ApplyDirectly(
return output, nil
}

//ApplyCustomResouces applies custom resources
func (a *Applier) ApplyCustomResouces(
//ApplyCustomResources applies custom resources
func (a *Applier) ApplyCustomResources(
reader asset.ScenarioReader,
values interface{},
dryRun bool,
headerFile string,
files ...string) ([]string, error) {
output := make([]string, 0)
for _, name := range files {
asset, err := a.ApplyCustomResouce(reader, values, dryRun, headerFile, name)
asset, err := a.ApplyCustomResource(reader, values, dryRun, headerFile, name)
if err != nil {
if IsEmptyAsset(err) {
continue
Expand All @@ -143,8 +143,8 @@ func (a *Applier) ApplyCustomResouces(
return output, nil
}

//ApplyCustomResouces applies custom resources
func (a *Applier) ApplyCustomResouce(
//ApplyCustomResource applies a custom resource
func (a *Applier) ApplyCustomResource(
reader asset.ScenarioReader,
values interface{},
dryRun bool,
Expand Down

0 comments on commit 2347693

Please sign in to comment.