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

Jump to bottom

Fix for setting initial parameter value for consistent $null check #67

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Fix for setting initial parameter value for consistent $null check #67

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion deployment/deploy-az-demo-bootstrapper.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Invoke-WebRequest -Uri "$baseLocation/deployment/bicep/modules/vnetpeering.bicep
Invoke-WebRequest -Uri "$baseLocation/deployment/bicep/modules/loganalytics.bicep" -OutFile "./bicep/modules/loganalytics.bicep"

# Deploy 3 core infrastructure layers i.e. L4, L3, L2, replicating 3 levels of Purdue network topology.
$l4LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ApplicationName ($ApplicationName + "L4") -VnetAddressPrefix "172.16.0.0/16" -SubnetAddressPrefix "172.16.0.0/18" -SetupArc $true -Location $Location -SetupObservability $SetupObservability
$l4LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ParentConfig $null -ApplicationName ($ApplicationName + "L4") -VnetAddressPrefix "172.16.0.0/16" -SubnetAddressPrefix "172.16.0.0/18" -SetupArc $true -Location $Location -SetupObservability $SetupObservability
$l3LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ParentConfig $l4LevelCoreInfra -ApplicationName ($ApplicationName + "L3") -VnetAddressPrefix "172.18.0.0/16" -SubnetAddressPrefix "172.18.0.0/18" -SetupArc $true -Location $Location -SetupObservability $SetupObservability
$l2LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ParentConfig $l3LevelCoreInfra -ApplicationName ($ApplicationName + "L2") -VnetAddressPrefix "172.20.0.0/16" -SubnetAddressPrefix "172.20.0.0/18" -SetupArc $true -Location $Location -SetupObservability $SetupObservability

Expand Down
11 changes: 6 additions & 5 deletions deployment/deploy-az-dev-bootstrapper.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $Location = Get-AzShortRegion($Location)

# 1. Deploy core infrastructure (AKS clusters, VNET)

$l4LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ApplicationName ($ApplicationName + "L4") -VnetAddressPrefix "172.16.0.0/16" -SubnetAddressPrefix "172.16.0.0/18" -SetupArc $SetupArc -Location $Location -SetupObservability $SetupObservability
$l4LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ParentConfig $null -ApplicationName ($ApplicationName + "L4") -VnetAddressPrefix "172.16.0.0/16" -SubnetAddressPrefix "172.16.0.0/18" -SetupArc $SetupArc -Location $Location -SetupObservability $SetupObservability
$l3LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ParentConfig $l4LevelCoreInfra -ApplicationName ($ApplicationName + "L3") -VnetAddressPrefix "172.18.0.0/16" -SubnetAddressPrefix "172.18.0.0/18" -SetupArc $SetupArc -Location $Location -SetupObservability $SetupObservability
$l2LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ParentConfig $l3LevelCoreInfra -ApplicationName ($ApplicationName + "L2") -VnetAddressPrefix "172.20.0.0/16" -SubnetAddressPrefix "172.20.0.0/18" -SetupArc $SetupArc -Location $Location -SetupObservability $SetupObservability

Expand Down Expand Up @@ -64,7 +64,7 @@ $l4AppConfig = ./deploy-dev-app-l4.ps1 -ApplicationName $ApplicationName `

# # --- Deploying just a single layer: comment above block and uncomment below:

# $l4LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ApplicationName ($ApplicationName + "L4") -VnetAddressPrefix "172.16.0.0/16" -SubnetAddressPrefix "172.16.0.0/18" -SetupArc $false -Location $Location $SetupObservability
# $l4LevelCoreInfra = ./deploy-core-infrastructure.ps1 -ParentConfig $null -ApplicationName ($ApplicationName + "L4") -VnetAddressPrefix "172.16.0.0/16" -SubnetAddressPrefix "172.16.0.0/18" -SetupArc $false -Location $Location $SetupObservability

# ./deploy-core-platform.ps1 -AksClusterName $l4LevelCoreInfra.AksClusterName `
# -AksClusterResourceGroupName $l4LevelCoreInfra.AksClusterResourceGroupName `
Expand All @@ -74,14 +74,16 @@ $l4AppConfig = ./deploy-dev-app-l4.ps1 -ApplicationName $ApplicationName `
# -AksClusterResourceGroupName $l4LevelCoreInfra.AksClusterResourceGroupName `
# -AksClusterName $l4LevelCoreInfra.AksClusterName `
# -AksServicePrincipalName ($ApplicationName + "L4") `
# -Location $Location -SetupObservability $SetupObservability
# -Location $Location -SetupObservability $SetupObservability `
# -SamplingRate $samplingRate

# # when deploying L2 workload on single cluster in L4, passing in parameters pointing to L4 is intentional
# ./deploy-dev-app-l2.ps1 -ApplicationName $ApplicationName `
# -AksClusterName $l4LevelCoreInfra.AksClusterName `
# -AksClusterResourceGroupName $l4LevelCoreInfra.AksClusterResourceGroupName `
# -AksServicePrincipalName ($ApplicationName + "L4") `
# -L4AppConfig $l4AppConfig -SetupObservability $SetupObservability
# -L4AppConfig $l4AppConfig -SetupObservability $SetupObservability `
# -SamplingRate $samplingRate
# #----------------

$runningTime = New-TimeSpan -Start $startTime
Expand All @@ -90,4 +92,3 @@ Write-Title("Running time bootstrapper: " + $runningTime.ToString())
Write-Title("Distributed Edge Accelerator is now deployed in Azure Resource Groups $ApplicationName + L2 to L4 and $ApplicationName-App.")
Write-Title("Please use the Event Hub instance in the Resource Group $ApplicationName-App to view the OPC UA and Simulated Sensor telemetry.")
Write-Title("Your kubectl current context is now set to the AKS cluster '$(kubectl config current-context)'.")

Loading