diff --git a/hack/machineset.sh b/hack/machineset.sh index 20b2b17b60..5cc585ec81 100755 --- a/hack/machineset.sh +++ b/hack/machineset.sh @@ -169,8 +169,6 @@ get_azure_ms() { case "$winver" in "2019") sku="2019-datacenter-smalldisk" - # TODO: remove when VM SSH issue is patched in Azure cloud - release="17763.6293.240905" ;; "2025") sku="2025-datacenter-smalldisk" diff --git a/test/e2e/providers/azure/azure.go b/test/e2e/providers/azure/azure.go index e9317c41bf..89e834dda9 100644 --- a/test/e2e/providers/azure/azure.go +++ b/test/e2e/providers/azure/azure.go @@ -47,10 +47,6 @@ func New(clientset *clusterinfo.OpenShift, infraStatus *config.InfrastructureSta // newAzureMachineProviderSpec returns an AzureMachineProviderSpec generated from the inputs, or an error func (p *Provider) newAzureMachineProviderSpec(location, zone, vmSize, publicLoadBalancer string, windowsServerVersion windows.ServerVersion) (*mapi.AzureMachineProviderSpec, error) { imageVersion := defaultImageVersion - if windowsServerVersion == windows.Server2019 { - // TODO: remove when VM SSH issue is patched in Azure cloud - imageVersion = "17763.6293.240905" - } return &mapi.AzureMachineProviderSpec{ TypeMeta: meta.TypeMeta{ APIVersion: "azureproviderconfig.openshift.io/v1beta1",