Skip to content
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

Testing insecure Ft1 broker #2251

Merged
merged 9 commits into from
Nov 9, 2023
Merged

Testing insecure Ft1 broker #2251

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fa187a3
Deploying insecure Ft1 broker -test-
luiscast84 Nov 9, 2023
6cb29d4
Merge branch 'microsoft:1417-feature-br' into 1417-feature-br
luiscast84 Nov 9, 2023
955a3e3
removed show template
luiscast84 Nov 9, 2023
e0ffb7f
Reverted Az Cli non-interactive deployment
luiscast84 Nov 9, 2023
ec14144
Reverted custom location fix
luiscast84 Nov 9, 2023
49c70bc
test
luiscast84 Nov 9, 2023
ea8bc61
added namespaces back
luiscast84 Nov 9, 2023
c52408e
Test
luiscast84 Nov 9, 2023
0583c63
Merge branch 'microsoft:1417-feature-br' into 1417-feature-br
luiscast84 Nov 9, 2023
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
2 changes: 0 additions & 2 deletions azure_arc_k8s_jumpstart/1417_feature/bicep/artifacts/PowerShell/Ft1Config.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
"Microsoft.HybridCompute",
"Microsoft.GuestConfiguration",
"Microsoft.HybridConnectivity",
"Microsoft.Symphony",
"Microsoft.Bluefin",
"Microsoft.DeviceRegistry",
"Microsoft.EventGrid",
"Microsoft.ExtendedLocation"
Expand Down
8 changes: 4 additions & 4 deletions azure_arc_k8s_jumpstart/1417_feature/bicep/artifacts/PowerShell/LogonScript.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,8 @@ catch {
Write-Host "`n"
Write-Host "[$(Get-Date -Format t)] INFO: Installing the Azure IoT Ops CLI extension" -ForegroundColor Gray
Write-Host "`n"
az extension add --source ([System.Net.HttpWebRequest]::Create('https://aka.ms/aziotopscli-latest').GetResponse().ResponseUri.AbsoluteUri) -y

#az extension add --source ([System.Net.HttpWebRequest]::Create('https://aka.ms/aziotopscli-latest').GetResponse().ResponseUri.AbsoluteUri) -y
az extension add --source https://azedgecli.blob.core.windows.net/drop/azure_iot_ops-0.0.5a8.dev2-py3-none-any.whl
##############################################################
# Deploy FT1
##############################################################
Expand All @@ -375,7 +375,7 @@ Write-Host "[$(Get-Date -Format t)] INFO: Deploying ft1 to the cluster" -Foregro
Write-Host "`n"

$keyVaultId = (az keyvault list -g $resourceGroup --resource-type vault --query "[0].id" -o tsv)
az iot ops init --cluster $arcClusterName -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientID --sp-object-id $spnObjectId --sp-secret $spnClientSecret --location eastus2euap --cluster-location $location
az iot ops init --cluster $arcClusterName -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientID --sp-object-id $spnObjectId --sp-secret $spnClientSecret --location eastus2euap --cluster-location $location --mq-service-type loadBalancer --mq-insecure true --show-template true

Write-Host "[$(Get-Date -Format t)] INFO: Preparing Event Grid Role Assignment" -ForegroundColor Gray
$extensionPrincipalId = (az k8s-extension show --cluster-name $arcClusterName --name "mq" --resource-group $resourceGroup --cluster-type "connectedClusters" --output json | ConvertFrom-Json).identity.principalId
Expand Down Expand Up @@ -404,7 +404,7 @@ Start-Sleep -Seconds 60
## Adding MQTT load balancer
#kubectl create namespace arc
$mqconfigfile = "$Ft1ToolsDir\mq_loadBalancer.yml"
$mqListenerService = "mq-1883-listener"
$mqListenerService = "aio-mq-dmqtt-frontend"
Write-Host "[$(Get-Date -Format t)] INFO: Configuring the MQ Event Grid bridge" -ForegroundColor Gray
$eventGridHostName = (az eventgrid namespace list --resource-group $resourceGroup --query "[0].topicSpacesConfiguration.hostname" -o tsv)
(Get-Content -Path $mqconfigfile) -replace 'eventGridPlaceholder', $eventGridHostName | Set-Content -Path $mqconfigfile
Expand Down
20 changes: 0 additions & 20 deletions azure_arc_k8s_jumpstart/1417_feature/bicep/artifacts/Settings/mq_loadBalancer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
apiVersion: mq.iotoperations.azure.com/v1beta1
kind: BrokerListener
metadata:
name: "mq-1883-listener"
namespace: azure-iot-operations
spec:
serviceType: loadBalancer
brokerRef: "broker"
authenticationEnabled: false
authorizationEnabled: false
serviceName: mq-1883-listener
port: 1883
---
apiVersion: mq.iotoperations.azure.com/v1beta1
kind: MqttBridgeTopicMap
metadata:
name: my-topic-map
Expand Down Expand Up @@ -45,10 +32,3 @@ spec:
authentication:
systemAssignedManagedIdentity:
audience: https://eventgrid.azure.net
localBrokerConnection:
endpoint: aio-mq-dmqtt-frontend:8883
tls:
tlsEnabled: true
trustedCaCertificateConfigMap: aio-ca-trust-bundle-test-only
authentication:
kubernetes: {}