Generalize manifest copy #209
Merged
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
Allow arbitrary files to be copied from the manifest directory, not just those that have the .yaml file extension.
openshift-ci-robot
added
size/XS
njhale
approved these changes
Mar 6, 2020
Comment on lines
+347
to
348
| fileContent += fmt.Sprintf("COPY %s %s\n", relativeManifestDirectory, "/manifests/") | ||
| fileContent += fmt.Sprintf("COPY %s %s%s\n", filepath.Join(relativeMetadataDirectory, AnnotationsFile), "/metadata/", AnnotationsFile) |
There was a problem hiding this comment.
Potential Followup:
I think we want the destination directories for manifests and metadata to be parameterized and fed the same arguments as the labels above, for consistency.
| @@ -208,7 +208,7 @@ func TestGenerateDockerfileFunc(t *testing.T) { | |||
| "LABEL operators.operatorframework.io.bundle.package.v1=test4\n"+ | |||
| "LABEL operators.operatorframework.io.bundle.channels.v1=test5\n"+ | |||
| "LABEL operators.operatorframework.io.bundle.channel.default.v1=test5\n\n"+ | |||
| "COPY test2/*.yaml /manifests/\n"+ | |||
| "COPY test2 /manifests/\n"+ | |||
| "COPY metadata/annotations.yaml /metadata/annotations.yaml\n", MetadataDir) | |||
There was a problem hiding this comment.
nit: I think this should be formatted so that the metadata directory always matches the label.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kevinrizza, njhale The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
Allow arbitrary files to be copied from the manifest directory, not just
those that have the .yaml file extension.
Description of the change:
Motivation for the change:
Reviewer Checklist
/docs