-
Notifications
You must be signed in to change notification settings - Fork 175
mantle/platform/azure: Add support for Azure Shared Image Gallery (SIG) and other enhancements #4109
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
Open
marmijo
wants to merge
5
commits into
coreos:main
Choose a base branch
from
marmijo:azure-gen2-images
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
mantle/platform/azure: Add support for Azure Shared Image Gallery (SIG) and other enhancements #4109
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4640421
platform/azure: support additional data disks
marmijo 02a2b62
azure: add --azure-hyper-v-generation flag
marmijo 89055d7
ore/azure: add options to create and delete Shared Image Gallery Images
marmijo 43d99cc
mantle/kola: add InstanceType to PlatformOptions for external tests
marmijo 702cf8a
azure: only build and run Hyper-V Gen2 images
marmijo 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
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 |
---|---|---|
@@ -0,0 +1,95 @@ | ||
// Copyright 2025 Red Hat | ||
// Copyright 2018 CoreOS, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package azure | ||
|
||
import ( | ||
"encoding/json" | ||
"fmt" | ||
"os" | ||
|
||
"github.com/spf13/cobra" | ||
) | ||
|
||
var ( | ||
cmdCreateGalleryImage = &cobra.Command{ | ||
Use: "create-gallery-image", | ||
Short: "Create Azure Gallery image", | ||
Long: "Create Azure Gallery image from a blob url", | ||
RunE: runCreateGalleryImage, | ||
Aliases: []string{"create-gallery-image-arm"}, | ||
|
||
SilenceUsage: true, | ||
} | ||
|
||
galleryImageName string | ||
galleryName string | ||
) | ||
|
||
func init() { | ||
sv := cmdCreateGalleryImage.Flags().StringVar | ||
|
||
sv(&galleryImageName, "gallery-image-name", "", "gallery image name") | ||
sv(&galleryName, "gallery-name", "kola", "gallery name") | ||
sv(&blobUrl, "image-blob", "", "source blob url") | ||
sv(&resourceGroup, "resource-group", "kola", "resource group name") | ||
|
||
Azure.AddCommand(cmdCreateGalleryImage) | ||
} | ||
|
||
func runCreateGalleryImage(cmd *cobra.Command, args []string) error { | ||
if blobUrl == "" { | ||
fmt.Fprintf(os.Stderr, "must supply --image-blob\n") | ||
os.Exit(1) | ||
} | ||
|
||
if err := api.SetupClients(); err != nil { | ||
fmt.Fprintf(os.Stderr, "setting up clients: %v\n", err) | ||
os.Exit(1) | ||
} | ||
|
||
img, err := api.CreateImage(galleryImageName, resourceGroup, blobUrl) | ||
if err != nil { | ||
fmt.Fprintf(os.Stderr, "Couldn't create Azure image: %v\n", err) | ||
os.Exit(1) | ||
} | ||
if img.ID == nil { | ||
fmt.Fprintf(os.Stderr, "received nil image\n") | ||
os.Exit(1) | ||
} | ||
sourceImageId := *img.ID | ||
|
||
galleryImage, err := api.CreateGalleryImage(galleryImageName, galleryName, resourceGroup, sourceImageId) | ||
if err != nil { | ||
fmt.Fprintf(os.Stderr, "Couldn't create Azure Shared Image Gallery image: %v\n", err) | ||
os.Exit(1) | ||
} | ||
if galleryImage.ID == nil { | ||
fmt.Fprintf(os.Stderr, "received nil gallery image\n") | ||
os.Exit(1) | ||
} | ||
err = json.NewEncoder(os.Stdout).Encode(&struct { | ||
ID *string | ||
Location *string | ||
}{ | ||
ID: galleryImage.ID, | ||
Location: galleryImage.Location, | ||
}) | ||
if err != nil { | ||
fmt.Fprintf(os.Stderr, "Couldn't encode result: %v\n", err) | ||
os.Exit(1) | ||
} | ||
return nil | ||
} |
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 |
---|---|---|
@@ -0,0 +1,70 @@ | ||
// Copyright 2025 Red Hat | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package azure | ||
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/spf13/cobra" | ||
) | ||
|
||
var ( | ||
cmdDeleteGalleryImage = &cobra.Command{ | ||
Use: "delete-gallery-image", | ||
Short: "Delete Azure Gallery image", | ||
Long: "Remove a Shared Image Gallery image from Azure.", | ||
RunE: runDeleteGalleryImage, | ||
Aliases: []string{"delete-gallery-image-arm"}, | ||
|
||
SilenceUsage: true, | ||
} | ||
|
||
deleteGallery bool | ||
) | ||
|
||
func init() { | ||
sv := cmdDeleteGalleryImage.Flags().StringVar | ||
bv := cmdDeleteGalleryImage.Flags().BoolVar | ||
|
||
sv(&imageName, "gallery-image-name", "", "gallery image name") | ||
sv(&resourceGroup, "resource-group", "kola", "resource group name") | ||
sv(&galleryName, "gallery-name", "kola", "gallery name") | ||
bv(&deleteGallery, "delete-entire-gallery", false, "delete entire gallery") | ||
|
||
Azure.AddCommand(cmdDeleteGalleryImage) | ||
} | ||
|
||
func runDeleteGalleryImage(cmd *cobra.Command, args []string) error { | ||
if err := api.SetupClients(); err != nil { | ||
return fmt.Errorf("setting up clients: %v\n", err) | ||
} | ||
|
||
if deleteGallery { | ||
err := api.DeleteGallery(galleryName, resourceGroup) | ||
if err != nil { | ||
return fmt.Errorf("Couldn't delete gallery: %v\n", err) | ||
} | ||
plog.Printf("Gallery %q in resource group %q removed", galleryName, resourceGroup) | ||
return nil | ||
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. seems like it's worth a 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. done! |
||
} | ||
|
||
err := api.DeleteGalleryImage(imageName, resourceGroup, galleryName) | ||
if err != nil { | ||
return fmt.Errorf("Couldn't delete gallery image: %v\n", err) | ||
} | ||
|
||
plog.Printf("Image %q in gallery %q in resource group %q removed", imageName, galleryName, resourceGroup) | ||
return nil | ||
} |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is having the alias useful or confusing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The alias matches the format of the existing commands (create-image, delete-image, etc), so I copied it here.