Skip to content

Commit 7231eea

Browse files
committed
Fixed few review comments
1 parent 84fc90b commit 7231eea

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
- Improve Ansible logs in the Operator container for Ansible-based Operators. ([#2321](https://github.com/operator-framework/operator-sdk/pull/2321))
1010

1111
### Changed
12-
- Changed to go 1.13 way of handling errors. ([#2355](https://github.com/operator-framework/operator-sdk/pull/2355))
12+
- Wrapped relevant errors per Go 1.13 error handling. ([#2355](https://github.com/operator-framework/operator-sdk/pull/2355))
1313
- Replace usage of `github.com/operator-framework/operator-sdk/pkg/restmapper.DynamicRESTMapper` with `sigs.k8s.io/controller-runtime/pkg/client/apiutil.DynamicRESTMapper`. ([#2309](https://github.com/operator-framework/operator-sdk/pull/2309))
1414
- Upgraded Helm operator packages and base image from Helm v2 to Helm v3. Cluster state for pre-existing CRs using Helm v2-based operators will be automatically migrated to Helm v3's new release storage format, and existing releases may be upgraded due to changes in Helm v3's label injection. ([#2080](https://github.com/operator-framework/operator-sdk/pull/2080))
1515
- Fail `operator-sdk olm-catalog gen-csv` if it is not run from a project's root, which the command already assumes is the case. ([#2322](https://github.com/operator-framework/operator-sdk/pull/2322))

cmd/operator-sdk/new/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ func doHelmScaffold() error {
353353
}
354354

355355
if err := scaffold.UpdateRoleForResource(resource, cfg.AbsProjectPath); err != nil {
356-
return fmt.Errorf("failed to update the RBAC manifest for resource (%v, %w): %w", resource.APIVersion, resource.Kind, err)
356+
return fmt.Errorf("failed to update the RBAC manifest for resource (%v, %v): %w", resource.APIVersion, resource.Kind, err)
357357
}
358358
return nil
359359
}

internal/scorecard/scorecard.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ func initConfig() error {
180180
}
181181
log.Info("Using config file: ", viper.ConfigFileUsed())
182182
} else {
183-
//TODO: What to change here
184183
return fmt.Errorf("could not read config file: %v\nSee %s for more information about the scorecard config file", err, configDocLink())
185184
}
186185
return nil

pkg/ansible/watches/watches.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (w *Watch) UnmarshalYAML(unmarshal func(interface{}) error) error {
120120
}
121121
err = verifyGVK(gvk)
122122
if err != nil {
123-
return fmt.Errorf("invalid GVK: %v: %w", gvk.String(), err)
123+
return fmt.Errorf("invalid GVK: %s: %w", gvk, err)
124124
}
125125

126126
// Rewrite values to struct being unmarshalled

0 commit comments

Comments
 (0)