Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generalize manifest copy #209

Merged
merged 1 commit into from Mar 6, 2020
Merged

Generalize manifest copy #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/lib/bundle/generate.go
View file
Open in desktop
Expand Up @@ -344,7 +344,7 @@ func GenerateDockerfile(mediaType, manifests, metadata, copyManifestDir, copyMet
fileContent += fmt.Sprintf("LABEL %s=%s\n\n", ChannelDefaultLabel, chanDefault)

// CONTENT
fileContent += fmt.Sprintf("COPY %s %s\n", filepath.Join(relativeManifestDirectory, "/*.yaml"), "/manifests/")
fileContent += fmt.Sprintf("COPY %s %s\n", relativeManifestDirectory, "/manifests/")
fileContent += fmt.Sprintf("COPY %s %s%s\n", filepath.Join(relativeMetadataDirectory, AnnotationsFile), "/metadata/", AnnotationsFile)
Comment on lines +347 to 348
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


return []byte(fileContent), nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/lib/bundle/generate_test.go
View file
Open in desktop
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I think this should be formatted so that the metadata directory always matches the label.


content, err := GenerateDockerfile("test1", "test2", MetadataDir, "test2/", "metadata/", "./", "test4", "test5", "")
Expand Down