Skip to content

Commit

Permalink
Merge pull request openshift#3174 from muraee/fix-azure-nodes-not-joi…
Browse files Browse the repository at this point in the history
…ning

HOSTEDCP-1283: Fixed Azure nodes not joining
  • Loading branch information
openshift-merge-bot[bot] authored Nov 8, 2023
2 parents 3645954 + 79ede30 commit 7fb56f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cmd/infra/azure/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@ func (o *CreateInfraOptions) Run(ctx context.Context, l logr.Logger) (*CreateInf

// TODO: Extract this from the release image or require a parameter
// Extraction is done like this:
// docker run --rm -it --entrypoint cat quay.io/openshift-release-dev/ocp-release:4.10.0-rc.0-x86_64 release-manifests/0000_50_installer_coreos-bootimages.yaml |yaml2json |jq .data.stream -r|jq '.architectures.x86_64["rhel-coreos-extensions"]["azure-disk"].url'
sourceURL := "https://rhcos.blob.core.windows.net/imagebucket/rhcos-49.84.202110081407-0-azure.x86_64.vhd"
// podman run --rm -it --entrypoint cat quay.io/openshift-release-dev/ocp-release:4.14.1-x86_64 release-manifests/0000_50_installer_coreos-bootimages.yaml |yq .data.stream -r|yq '.architectures.x86_64["rhel-coreos-extensions"]["azure-disk"].url'
sourceURL := "https://rhcos.blob.core.windows.net/imagebucket/rhcos-414.92.202310170514-0-azure.x86_64.vhd"
blobName := "rhcos.x86_64.vhd"

// Explicitly check this, Azure API makes inferring the problem from the error message extremely hard
Expand Down
4 changes: 3 additions & 1 deletion hypershift-operator/controllers/nodepool/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ func azureMachineTemplateSpec(hcluster *hyperv1.HostedCluster, nodePool *hyperv1
StorageAccountType: nodePool.Spec.Platform.Azure.DiskStorageAccountType,
},
},
SubnetName: hcluster.Spec.Platform.Azure.SubnetName,
NetworkInterfaces: []capiazure.NetworkInterface{{
SubnetName: hcluster.Spec.Platform.Azure.SubnetName,
}},
Identity: capiazure.VMIdentityUserAssigned,
UserAssignedIdentities: []capiazure.UserAssignedIdentity{{ProviderID: hcluster.Spec.Platform.Azure.MachineIdentityID}},
SSHPublicKey: sshKey,
Expand Down

0 comments on commit 7fb56f7

Please sign in to comment.