Skip to content

Commit 4d2dcc6

Browse files
bindsibindsi
authored
bringing back commented code (#26)
* bringing back commented code Signed-off-by: Marcel Bindseil <[email protected]> * fixed merge conflicts Signed-off-by: Marcel Bindseil <[email protected]> --------- Signed-off-by: Marcel Bindseil <[email protected]>
1 parent 654458f commit 4d2dcc6

File tree

1 file changed

+60
-60
lines changed

1 file changed

+60
-60
lines changed

‎.github/workflows/build-vm.yaml

+60-60
Original file line numberDiff line numberDiff line change
@@ -102,71 +102,71 @@ jobs:
102102
uses: azure/login@v1
103103
with:
104104
creds: '{"clientId":"${{ secrets.AZURE_SP_CLIENT_ID }}","clientSecret":"${{ secrets.AZURE_SP_CLIENT_SECRET }}","subscriptionId":"${{ secrets.AZURE_SUBSCRIPTION_ID }}","tenantId":"${{ secrets.AZURE_TENANT_ID }}"}'
105-
# - name: Validate parameters
106-
# run: |
107-
# echo "Checking if VM already exists..."
108-
# vm=$(az vm show -n $vmName -g $resourceGroup 2>/dev/null | jq -r .name)
109-
# if [ -n "$vm" ]; then
110-
# echo "Error: VM $vmName in RG $resourceGroup already exists. Please delete existing VM or re-run with different name."
111-
# exit 1
112-
# fi
113-
# echo "VM parameters are valid..."
114-
# - name: Wait for Image to be created
115-
# run: |
116-
# echo "Wait for image to be created..."
117-
# az sig image-version wait --created --resource-group $galleryResourceGroup \
118-
# --gallery-name $galleryName --gallery-image-definition $imageDefinitionName \
119-
# --gallery-image-version $imageVersion
120-
# - name: Create VM
121-
# run: |
122-
# subscriptionId=$(az account show --query id -o tsv)
105+
- name: Validate parameters
106+
run: |
107+
echo "Checking if VM already exists..."
108+
vm=$(az vm show -n $vmName -g $resourceGroup 2>/dev/null | jq -r .name)
109+
if [ -n "$vm" ]; then
110+
echo "Error: VM $vmName in RG $resourceGroup already exists. Please delete existing VM or re-run with different name."
111+
exit 1
112+
fi
113+
echo "VM parameters are valid..."
114+
- name: Wait for Image to be created
115+
run: |
116+
echo "Wait for image to be created..."
117+
az sig image-version wait --created --resource-group $galleryResourceGroup \
118+
--gallery-name $galleryName --gallery-image-definition $imageDefinitionName \
119+
--gallery-image-version $imageVersion
120+
- name: Create VM
121+
run: |
122+
subscriptionId=$(az account show --query id -o tsv)
123123
124-
# if [ !$(az group exists -n $resourceGroup) ]; then
125-
# echo "Creating RG $resourceGroup..."
126-
# az group create -n $resourceGroup -l $location
127-
# fi
124+
if [ !$(az group exists -n $resourceGroup) ]; then
125+
echo "Creating RG $resourceGroup..."
126+
az group create -n $resourceGroup -l $location
127+
fi
128128
129-
# imgDef="/subscriptions/$subscriptionId/resourceGroups/$galleryResourceGroup/providers/Microsoft.Compute/galleries/$galleryName/images/$imageDefinitionName/versions/$imageVersion"
129+
imgDef="/subscriptions/$subscriptionId/resourceGroups/$galleryResourceGroup/providers/Microsoft.Compute/galleries/$galleryName/images/$imageDefinitionName/versions/$imageVersion"
130130
131-
# echo "Checking identity exists?..."
132-
# identity=$(az identity list --query "[?name=='$vmIdentityName'&&resourceGroup=='$resourceGroup'].id" -o tsv)
131+
echo "Checking identity exists?..."
132+
identity=$(az identity list --query "[?name=='$vmIdentityName'&&resourceGroup=='$resourceGroup'].id" -o tsv)
133133
134-
# if [ -z $identity ]; then
135-
# echo "Creating identity $vmIdentityName..."
136-
# identity="$(az identity create --name $vmIdentityName -g $resourceGroup --query id -o tsv)"
137-
# else
138-
# echo "Identity ($vmIdentityName) already exists"
139-
# fi
134+
if [ -z $identity ]; then
135+
echo "Creating identity $vmIdentityName..."
136+
identity="$(az identity create --name $vmIdentityName -g $resourceGroup --query id -o tsv)"
137+
else
138+
echo "Identity ($vmIdentityName) already exists"
139+
fi
140140
141-
# echo "Fetching principalId..."
142-
# principalId="$(az identity show --name $vmIdentityName -g $resourceGroup --query principalId -o tsv)"
141+
echo "Fetching principalId..."
142+
principalId="$(az identity show --name $vmIdentityName -g $resourceGroup --query principalId -o tsv)"
143143
144-
# echo "Creating role assignment for $vmIdentityName (principalId: $principalId)..."
145-
# az role assignment create --assignee-object-id $principalId --assignee-principal-type ServicePrincipal --role "Owner" --scope /subscriptions/$subscriptionId
146-
# az role assignment create --assignee-object-id $principalId --assignee-principal-type ServicePrincipal --role "Owner" --scope /subscriptions/$subscriptionId/resourceGroups/$resourceGroup
144+
echo "Creating role assignment for $vmIdentityName (principalId: $principalId)..."
145+
az role assignment create --assignee-object-id $principalId --assignee-principal-type ServicePrincipal --role "Owner" --scope /subscriptions/$subscriptionId
146+
az role assignment create --assignee-object-id $principalId --assignee-principal-type ServicePrincipal --role "Owner" --scope /subscriptions/$subscriptionId/resourceGroups/$resourceGroup
147147
148-
# echo "Creating VM..."
149-
# az vm create \
150-
# --resource-group $resourceGroup \
151-
# --name $vmName \
152-
# --image $imgDef \
153-
# --size $vmSize \
154-
# --security-type TrustedLaunch \
155-
# --enable-secure-boot true \
156-
# --enable-vtpm true \
157-
# --admin-username $adminUsername \
158-
# --admin-password $adminPassword \
159-
# --assign-identity $identity
148+
echo "Creating VM..."
149+
az vm create \
150+
--resource-group $resourceGroup \
151+
--name $vmName \
152+
--image $imgDef \
153+
--size $vmSize \
154+
--security-type TrustedLaunch \
155+
--enable-secure-boot true \
156+
--enable-vtpm true \
157+
--admin-username $adminUsername \
158+
--admin-password $adminPassword \
159+
--assign-identity $identity
160160
161-
# - name: Install provider extensions
162-
# run: |
163-
# az provider register -n "Microsoft.ExtendedLocation"
164-
# az provider register -n "Microsoft.Kubernetes";
165-
# az provider register -n "Microsoft.KubernetesConfiguration";
166-
# az provider register -n "Microsoft.IoTOperations";
167-
# az provider register -n "Microsoft.DeviceRegistry";
168-
# az provider register -n "Microsoft.Insights";
169-
# az provider register -n "Microsoft.AlertsManagement";
161+
- name: Install provider extensions
162+
run: |
163+
az provider register -n "Microsoft.ExtendedLocation"
164+
az provider register -n "Microsoft.Kubernetes";
165+
az provider register -n "Microsoft.KubernetesConfiguration";
166+
az provider register -n "Microsoft.IoTOperations";
167+
az provider register -n "Microsoft.DeviceRegistry";
168+
az provider register -n "Microsoft.Insights";
169+
az provider register -n "Microsoft.AlertsManagement";
170170
171171
- name: Install AIO
172172
run: |
@@ -192,10 +192,10 @@ jobs:
192192
Remove-Item -LiteralPath C:\\Windows\\System32\\config\\systemprofile\\.azure\\AzureArcCharts -Recurse -Force; \
193193
az connectedk8s enable-features --debug -n $clusterName -g $resourceGroup --kube-config C:\\Scripts\\config --custom-locations-oid \"\"${{ secrets.CUSTOM_LOCATIONS_OBJECT_ID }}\"\" --features cluster-connect custom-locations; \
194194
\$env:KUBECONFIG='C:\\Scripts\\config'; \
195-
saId=\"\"\$(az storage account create -n $saName -g $resourceGroup --enable-hierarchical-namespace -o tsv --query id)\"\"; \
196-
srId=\"\"\$(az iot ops schema registry create -n $srName -g $resourceGroup --registry-namespace $srName --sa-resource-id \"\"$saId\"\" -o tsv --query id)\"\"; \
195+
saId=\$(az storage account create -n $saName -g $resourceGroup --enable-hierarchical-namespace -o tsv --query id); \
196+
srId=\$(az iot ops schema registry create -n $srName -g $resourceGroup --registry-namespace $srName --sa-resource-id \"\"\$saId\"\" -o tsv --query id); \
197197
az iot ops init --no-progress --debug --cluster $clusterName -g $resourceGroup; \
198-
az iot ops create -n $clusterName --cluster $clusterName -g $resourceGroup --sr-resource-id \"\"$srId\"\" --kubernetes-distro K3s; \
198+
az iot ops create -n $clusterName --cluster $clusterName -g $resourceGroup --sr-resource-id \"\"\$srId\"\" --kubernetes-distro K3s; \
199199
\"}"
200200
else
201201
az vm extension set \

0 commit comments

Comments
 (0)