Skip to content

Commit e654954

Browse files
committed
Merge branch 'fix-verified-version-deployment' of github.com:open-component-model/ocm-controller into fix-verified-version-deployment
2 parents 6d5dced + 7a22e62 commit e654954

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

pkg/ocm/fakes/fakes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func (m *MockFetcher) GetLatestComponentVersionWasNotCalled() bool {
150150
return len(m.getLatestComponentVersionCalledWith) == 0
151151
}
152152

153-
func (m *MockFetcher) ListComponentVersions(ctx context.Context, logger logr.Logger, octx ocm.Context, obj *v1alpha1.ComponentVersion) ([]ocmctrl.Version, error) {
153+
func (m *MockFetcher) ListComponentVersions(_ context.Context, _ logr.Logger, _ ocm.Context, obj *v1alpha1.ComponentVersion) ([]ocmctrl.Version, error) {
154154
m.listComponentVersionsCalledWith = append(m.listComponentVersionsCalledWith, []any{obj})
155155
return m.listComponentVersionsVersions, m.listComponentVersionsErr
156156
}

pkg/ocm/ocm.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ func (c *Client) GetLatestValidComponentVersion(
447447

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

0 commit comments

Comments
 (0)