Skip to content

Commit

Permalink
Merge branch 'fix-verified-version-deployment' of github.com:open-com…
Browse files Browse the repository at this point in the history
…ponent-model/ocm-controller into fix-verified-version-deployment
  • Loading branch information
Skarlso committed Jan 16, 2025
2 parents 6d5dced + 7a22e62 commit e654954
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/ocm/fakes/fakes.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (m *MockFetcher) GetLatestComponentVersionWasNotCalled() bool {
return len(m.getLatestComponentVersionCalledWith) == 0
}

func (m *MockFetcher) ListComponentVersions(ctx context.Context, logger logr.Logger, octx ocm.Context, obj *v1alpha1.ComponentVersion) ([]ocmctrl.Version, error) {
func (m *MockFetcher) ListComponentVersions(_ context.Context, _ logr.Logger, _ ocm.Context, obj *v1alpha1.ComponentVersion) ([]ocmctrl.Version, error) {
m.listComponentVersionsCalledWith = append(m.listComponentVersionsCalledWith, []any{obj})
return m.listComponentVersionsVersions, m.listComponentVersionsErr
}
Expand Down
1 change: 0 additions & 1 deletion pkg/ocm/ocm.go
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ func (c *Client) GetLatestValidComponentVersion(

for _, v := range versions {
if valid, _ := constraint.Validate(v.Semver); valid {
// make sure we don't do any lookup if we don't need to
if len(obj.Spec.Verify) > 0 {
if _, err := c.VerifyComponent(ctx, octx, obj, v.Version); err != nil {
logger.Error(err, "ignoring version as it failed verification", "version", v.Version, "component", obj.Spec.Component)
Expand Down

0 comments on commit e654954

Please sign in to comment.