diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-26 10:13:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 10:13:08 -0400 |
| commit | 18da5b0bf6d83e31a3db534068af367816349cf0 (patch) | |
| tree | 2afeb5517d178f0708923982f9330bced93dc709 /pkg/machine/fcos_amd64.go | |
| parent | 54e0afffe7dd8e5ab7daa75de2f06331cd78dd48 (diff) | |
| parent | 3f22e529644aad8e4b763564c9ef98a3cbdae4fc (diff) | |
| download | podman-18da5b0bf6d83e31a3db534068af367816349cf0.tar.gz podman-18da5b0bf6d83e31a3db534068af367816349cf0.tar.bz2 podman-18da5b0bf6d83e31a3db534068af367816349cf0.zip | |
Merge pull request #11208 from ashley-cui/streams
[NO TESTS NEEDED] Allow setting of machine stream and image path from containers.conf
Diffstat (limited to 'pkg/machine/fcos_amd64.go')
| -rw-r--r-- | pkg/machine/fcos_amd64.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkg/machine/fcos_amd64.go b/pkg/machine/fcos_amd64.go index 36676405a..4e2e86d3e 100644 --- a/pkg/machine/fcos_amd64.go +++ b/pkg/machine/fcos_amd64.go @@ -8,16 +8,26 @@ import ( "github.com/coreos/stream-metadata-go/fedoracoreos" "github.com/coreos/stream-metadata-go/stream" + "github.com/pkg/errors" "github.com/sirupsen/logrus" ) // This should get Exported and stay put as it will apply to all fcos downloads // getFCOS parses fedoraCoreOS's stream and returns the image download URL and the release version -func getFCOSDownload() (*fcosDownloadInfo, error) { +func getFCOSDownload(imageStream string) (*fcosDownloadInfo, error) { var ( fcosstable stream.Stream + streamType string ) - streamurl := fedoracoreos.GetStreamURL(fedoracoreos.StreamNext) + switch imageStream { + case "testing", "": + streamType = fedoracoreos.StreamNext + case "stable": + streamType = fedoracoreos.StreamStable + default: + return nil, errors.Errorf("invalid stream %s: valid streams are `testing` and `stable`", imageStream) + } + streamurl := fedoracoreos.GetStreamURL(streamType) resp, err := http.Get(streamurl.String()) if err != nil { return nil, err |