cmd/operator-sdk/scorecard: change source of truth for bundle metadata #3450
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
do-not-merge/work-in-progress
estroz
force-pushed
the
refactor/scorecard-labels
branch
2 times, most recently
from
3931825 to
671ebcf
Compare
estroz
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
openshift-ci-robot
requested review from
jmccormick2001,
joelanford and
varshaprasad96
estroz
force-pushed
the
refactor/scorecard-labels
branch
from
671ebcf to
d798aa0
Compare
estroz
commented
Jul 17, 2020
| labels, err := reg.Labels(ctx, registryimage.SimpleReference(image)) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error reading image %s labels: %v", image, err) | ||
| func findBundleMetadata(fs afero.Fs, bundleRoot string) (Labels, string, error) { |
There was a problem hiding this comment.
This function in particular needs the most scrutiny.
estroz
force-pushed
the
refactor/scorecard-labels
branch
from
d798aa0 to
39aa250
Compare
jmccormick2001
approved these changes
Jul 17, 2020
estroz
force-pushed
the
refactor/scorecard-labels
branch
from
39aa250 to
fb9dda6
Compare
|
@jmccormick2001 now the error from |
openshift-ci-robot
added
the
needs-rebase
estroz
force-pushed
the
refactor/scorecard-labels
branch
from
fb9dda6 to
25b01a5
Compare
openshift-ci-robot
removed
the
needs-rebase
…ch use image labels as the source of truth for bundle metadata if a bundle image is supplied to `scorecard`. The SDK should consider the metadata directory to contain sources of truth for bundle metadata; image labels are informative only. cmd/operator-sdk/scorecard: always use on-disk metadata images/scorecard-test/cmd/test: look up metadata using FindBundleMetadata internal/registry: rewrite metadata lookup functions as FindBundleMetadata, which recursively searches for a file matching the annotations.yaml spec then returns that metadata and its path internal/scorecard: remove 'labels' directory functionality, which is no longer needed now that metadata is always looked up recursively
estroz
force-pushed
the
refactor/scorecard-labels
branch
from
25b01a5 to
5d443a1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of the change:
FindBundleMetadataFindBundleMetadata, which recursively searches for a file matching theannotations.yamlspec then returns that metadata and its pathMotivation for the change: This commit reverts some changes made in #3062, which use image labels as the source of truth for bundle metadata if a bundle image is supplied to
scorecard. The SDK should consider the metadata directory to contain sources of truth for bundle metadata; image labels are informative only.Checklist
If the pull request includes user-facing changes, extra documentation is required:
changelog/fragments(seechangelog/fragments/00-template.yaml)website/content/en/docs