-
Notifications
You must be signed in to change notification settings - Fork 1.5k
OpenStack: support "file" scheme for custom os image urls #3273
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.
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
Merged
openshift-merge-robot
merged 2 commits into
openshift:master
from
Fedosin:file_locations
Mar 27, 2020
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,8 @@ package openstack | |
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/url" | ||
| "path/filepath" | ||
|
|
||
| "github.com/gophercloud/gophercloud" | ||
| "github.com/gophercloud/gophercloud/openstack" | ||
|
|
@@ -60,11 +62,27 @@ func TFVars(masterConfig *v1alpha1.OpenstackProviderSpec, cloud string, external | |
| cfg.BaseImageName = imageName | ||
| if isURL { | ||
| // Valid URL -> use baseImage as a URL that will be used to create new Glance image with name "<infraID>-rhcos". | ||
| localFilePath, err := cache.DownloadImageFile(baseImage) | ||
| var localFilePath string | ||
|
|
||
| url, err := url.Parse(baseImage) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // We support 'http(s)' and 'file' schemes. If the scheme is http(s), then we will upload a file from that | ||
| // location. Otherwise will take local file path from the URL. | ||
| switch url.Scheme { | ||
| case "http", "https": | ||
| localFilePath, err = cache.DownloadImageFile(baseImage) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| case "file": | ||
| localFilePath = filepath.FromSlash(url.Path) | ||
| default: | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Personally I would have liked it to be part of validation of the install-config.yaml But this is fine too. /approve |
||
| return nil, errors.Errorf("Unsupported URL scheme: '%v'", url.Scheme) | ||
| } | ||
|
|
||
| err = uploadBaseImage(cloud, localFilePath, imageName, infraID) | ||
| if err != nil { | ||
| return nil, err | ||
|
|
||
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.