*: sed s/flatcar-linux/flatcar #372
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
tormath1
force-pushed
the
tormath1/flatcar
branch
from
902476e
to
d06566f
Compare
tormath1
force-pushed
the
tormath1/flatcar
branch
from
d06566f
to
87f64df
Compare
pothos
reviewed
Sep 14, 2022
cmd/cork/create.go
Outdated
| @@ -115,7 +115,7 @@ func init() { | |||
| creationFlags.StringVar(&sdkUrlPath, | |||
| "sdk-url-path", "sdk", "SDK URL path") | |||
| creationFlags.StringVar(&sdkURL, | |||
| "sdk-url", "mirror.release.flatcar-linux.net", "SDK URL (supported schema: gs, https)") | |||
| "sdk-url", "mirror.release.flatcar.net", "SDK URL (supported schema: gs, https)") | |||
There was a problem hiding this comment.
Suggested change
| "sdk-url", "mirror.release.flatcar.net", "SDK URL (supported schema: gs, https)") | |
| "sdk-url", "mirror.release.flatcar-linux.net", "SDK URL (supported schema: gs, https)") |
There was a problem hiding this comment.
(To prevent this you could first replace the large bulk of github.com/flatcar-linux and then look for any remaining flatcar-linux references)
pothos
reviewed
Sep 14, 2022
| @@ -45,7 +45,7 @@ func init() { | |||
| cmdCreateDevice.Flags().StringVar(&options.InstallerImageBaseURL, "installer-image-base-url", "", "installer image base URL, non-https (default board-dependent, e.g. \"http://stable.release.flatcar-linux.net/amd64-usr/current\")") | |||
| cmdCreateDevice.Flags().StringVar(&options.InstallerImageKernelURL, "installer-image-kernel-url", "", "EquinixMetal installer image kernel URL, (default installer-image-base-url/flatcar_production_pxe.vmlinuz)") | |||
| cmdCreateDevice.Flags().StringVar(&options.InstallerImageCpioURL, "installer-image-cpio-url", "", "EquinixMetal installer image cpio URL, (default installer-image-base-url/flatcar_production_pxe_image.cpio.gz)") | |||
| cmdCreateDevice.Flags().StringVar(&options.ImageURL, "image-url", "", "image base URL (default board-dependent, e.g. \"https://alpha.release.flatcar-linux.net/amd64-usr/current/flatcar_production_packet_image.bin.bz2\")") | |||
| cmdCreateDevice.Flags().StringVar(&options.ImageURL, "image-url", "", "image base URL (default board-dependent, e.g. \"https://alpha.release-linux.flatcar.net/amd64-usr/current/flatcar_production_packet_image.bin.bz2\")") | |||
There was a problem hiding this comment.
Suggested change
| cmdCreateDevice.Flags().StringVar(&options.ImageURL, "image-url", "", "image base URL (default board-dependent, e.g. \"https://alpha.release-linux.flatcar.net/amd64-usr/current/flatcar_production_packet_image.bin.bz2\")") | |
| cmdCreateDevice.Flags().StringVar(&options.ImageURL, "image-url", "", "image base URL (default board-dependent, e.g. \"https://alpha.release.flatcar-linux.net/amd64-usr/current/flatcar_production_packet_image.bin.bz2\")") |
same
There was a problem hiding this comment.
Ah I messed up.
It should be:
https://alpha.release.flatcar-linux.net
I appended -linux to release instead of flatcar. 😑
There was a problem hiding this comment.
Oh, right, updated the suggestion
pothos
reviewed
Sep 14, 2022
cmd/plume/containerlinux.go
Outdated
| @@ -324,7 +324,7 @@ func (cs channelSpec) SourceURL() string { | |||
| baseURL = cs.BasePrivateURL | |||
| } | |||
| if gceJSONKeyFile == "none" { | |||
| baseURL = strings.Replace(baseURL, "gs://", "https://bucket.release.flatcar-linux.net/", 1) | |||
| baseURL = strings.Replace(baseURL, "gs://", "https://bucket.release-linux.flatcar.net/", 1) | |||
There was a problem hiding this comment.
Suggested change
| baseURL = strings.Replace(baseURL, "gs://", "https://bucket.release-linux.flatcar.net/", 1) | |
| baseURL = strings.Replace(baseURL, "gs://", "https://bucket.release.flatcar-linux.net/", 1) |
pothos
reviewed
Sep 14, 2022
cmd/ore/do/create-image.go
Outdated
| @@ -35,7 +35,7 @@ func init() { | |||
| DO.AddCommand(cmdCreateImage) | |||
| cmdCreateImage.Flags().StringVar(&options.Region, "region", "sfo2", "region slug") | |||
| cmdCreateImage.Flags().StringVarP(&imageName, "name", "n", "", "image name") | |||
| cmdCreateImage.Flags().StringVarP(&imageURL, "url", "u", "", "image source URL (e.g. \"https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_digitalocean_image.bin.bz2\"") | |||
| cmdCreateImage.Flags().StringVarP(&imageURL, "url", "u", "", "image source URL (e.g. \"https://stable.release-linux.flatcar.net/amd64-usr/current/flatcar_production_digitalocean_image.bin.bz2\"") | |||
There was a problem hiding this comment.
Suggested change
| cmdCreateImage.Flags().StringVarP(&imageURL, "url", "u", "", "image source URL (e.g. \"https://stable.release-linux.flatcar.net/amd64-usr/current/flatcar_production_digitalocean_image.bin.bz2\"") | |
| cmdCreateImage.Flags().StringVarP(&imageURL, "url", "u", "", "image source URL (e.g. \"https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_digitalocean_image.bin.bz2\"") |
There was a problem hiding this comment.
Ok, should be good now - I grepped on release-linux, sorry for the confusion :D
tormath1
force-pushed
the
tormath1/flatcar
branch
from
87f64df
to
6d7aa9f
Compare
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
tormath1
force-pushed
the
tormath1/flatcar
branch
from
6d7aa9f
to
613994e
Compare
pothos
approved these changes
Sep 14, 2022
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.
Signed-off-by: Mathieu Tortuyaux mtortuyaux@microsoft.com
TODO: