Skip to content

Update default Azure image to use image galleries #1076

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 14, 2022
Merged

Update default Azure image to use image galleries #1076

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkg/webhooks/machine_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ var (
return fmt.Sprintf("%s-rg", clusterID)
}
defaultAzureImageResourceID = func(clusterID string) string {
return fmt.Sprintf("/resourceGroups/%s/providers/Microsoft.Compute/images/%s", clusterID+"-rg", clusterID)
// image gallery names cannot have dashes
galleryName := strings.Replace(clusterID, "-", "_", -1)

return fmt.Sprintf("/resourceGroups/%s/providers/Microsoft.Compute/galleries/gallery_%s/images/%s/versions/%s", clusterID+"-rg", galleryName, clusterID, azureRHCOSVersion)
}
defaultAzureManagedIdentiy = func(clusterID string) string {
return fmt.Sprintf("%s-identity", clusterID)
Expand Down Expand Up @@ -132,6 +135,7 @@ const (
azureCachingTypeNone = "None"
azureCachingTypeReadOnly = "ReadOnly"
azureCachingTypeReadWrite = "ReadWrite"
azureRHCOSVersion = "latest" // The installer only sets up one version but its name may vary, using latest will pull it no matter the name.

// GCP Defaults
defaultGCPMachineType = "n1-standard-4"
Expand Down