Ag manufacturing -> main

.gitignore

@@ -53,3 +53,4 @@ terraform.rc
 
 *.out
 .VSCodeCounter/*
+azure_jumpstart_ag/manufacturing/bicep/main.*.parameters.json

azure_jumpstart_ag/retail/artifacts/L1Files/ScalableCluster.json → azure_jumpstart_ag/artifacts/L1Files/ScalableCluster.json

@@ -4,7 +4,7 @@
   "DeploymentType": "ScalableCluster",
   "Init": {
     "ServiceIPRangeStart": "ServiceIPRangeStart-null",
-    "ServiceIPRangeSize": 1000
+    "ServiceIPRangeSize": 15
   },
   "Arc": {
     "ClusterName": "ClusterName-null",
@@ -37,7 +37,7 @@
         "Mtu": 0
       },
       "LinuxNode": {
-        "CpuCount": 4,
+        "CpuCount": 6,
         "MemoryInMB": 24576,
         "DataSizeInGB": 80,
         "LogSizeInGB": 5,

azure_jumpstart_ag/artifacts/L1Files/config.json

@@ -0,0 +1,6 @@
+{
+    "hydra.highAvailability.disk.storageClass": "default",
+    "hydra.acstorController.enabled": false,
+    "hydra.highAvailability.disk.storageClass": "local-path",
+    "hydra.cachedStorageSize": "20Gi"
+}

azure_jumpstart_ag/artifacts/PowerShell/AgConfig-manufacturing.psd1

@@ -0,0 +1,231 @@
+@{
+    # This is the PowerShell datafile used to provide configuration information for the Agora environment. Product keys and password are not encrypted and will be available on host during installation.
+
+    # Directory paths
+    AgDirectories           = @{
+        AgDir             = "C:\Ag"
+        AgPowerShellDir   = "C:\Ag\PowerShell"
+        AgLogsDir         = "C:\Ag\Logs"
+        AgVMDir           = "C:\Ag\Virtual Machines"
+        AgIconDir         = "C:\Ag\Icons"
+        AgToolsDir        = "C:\Tools"
+        AgTempDir         = "C:\Temp"
+        AgVHDXDir         = "V:\VMs"
+        AgConfigMapDir    = "C:\Ag\ConfigMaps"
+        AgL1Files         = "C:\Ag\L1Files"
+        AgAppsRepo        = "C:\Ag\AppsRepo"
+        AgMonitoringDir   = "C:\Ag\Monitoring"
+        AgAdxDashboards   = "C:\Ag\AdxDashboards"
+        AgDataEmulator    = "C:\Ag\DataEmulator"
+    }
+
+    # Required URLs
+    URLs                    = @{
+        chocoInstallScript      = 'https://chocolatey.org/install.ps1'
+        wslUbuntu               = 'https://aka.ms/wslubuntu'
+        wslStoreStorage         = 'https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi'
+        docker                  = 'https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe'
+        githubAPI               = 'https://api.github.com'
+        grafana                 = 'https://api.github.com/repos/grafana/grafana/releases/latest'
+        azurePortal             = 'https://portal.azure.com'
+        aksEEk3s                = 'https://aka.ms/aks-edge/k3s-msi'
+        nginx                   = 'https://kubernetes.github.io/ingress-nginx'
+        prometheus              = 'https://prometheus-community.github.io/helm-charts'
+        vcLibs                  = 'https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx'
+        windowsTerminal         = 'https://api.github.com/repos/microsoft/terminal/releases/latest'
+        aksEEReleases           = 'https://api.github.com/repos/Azure/AKS-Edge/releases'
+        mqttExplorerReleases    = 'https://api.github.com/repos/thomasnordquist/MQTT-Explorer/releases/latest'
+    }
+
+    # Azure required registered resource providers
+    AzureProviders          = @(
+        "Microsoft.Kubernetes",
+        "Microsoft.KubernetesConfiguration",
+        "Microsoft.HybridCompute",
+        "Microsoft.GuestConfiguration",
+        "Microsoft.HybridConnectivity",
+        "Microsoft.DeviceRegistry",
+        "Microsoft.EventGrid"
+    )
+
+    # Az CLI required extensions
+    AzCLIExtensions         = @(
+        'k8s-extension',
+        'k8s-configuration',
+        'eventgrid',
+        'customlocation',
+        'kusto',
+        'storage-preview'
+        'azure-iot-ops'
+    )
+
+    # PowerShell modules
+    PowerShellModules       = @(
+        'Az.ConnectedKubernetes',
+        'Az.KubernetesConfiguration',
+        'Az.Kusto',
+        'Az.EventGrid',
+        'Az.Storage',
+        'Az.EventHub'
+    )
+
+    # Chocolatey packages list
+    ChocolateyPackagesList  = @(
+        'az.powershell',
+        'bicep',
+        'kubernetes-cli',
+        'vcredist140',
+        'microsoft-edge',
+        'azcopy10',
+        'vscode',
+        'git',
+        '7zip',
+        'kubectx',
+        'putty.install',
+        'kubernetes-helm',
+        'dotnet-sdk',
+        'zoomit',
+        'openssl.light',
+        'mqtt-explorer',
+        'gh',
+        'python'
+    )
+
+    # Pip packages list
+    PipPackagesList     = @(
+        'paho-mqtt'
+    )
+
+    # VSCode extensions
+    VSCodeExtensions        = @(
+        'ms-vscode-remote.remote-containers',
+        'ms-vscode-remote.remote-wsl',
+        'ms-vscode.powershell',
+        'redhat.vscode-yaml',
+        'ZainChen.json',
+        'esbenp.prettier-vscode',
+        'ms-kubernetes-tools.vscode-kubernetes-tools',
+        'mindaro.mindaro',
+        'github.vscode-pull-request-github'
+    )
+
+    # Git branches
+    GitBranches             = @(
+        'production',
+        'staging',
+        'canary' ,
+        'main'
+    )
+
+    # VHDX blob url
+    ProdVHDBlobURL          = 'https://jsvhds.blob.core.windows.net/agora/base/prod-w11iot/AGBase.vhdx'
+    PreProdVHDBlobURL       = 'https://jsvhds.blob.core.windows.net/agora/base/preprod-w11iot/AGBase.vhdx'
+
+    # L1 virtual machine configuration
+    HostVMDrive             = "V"                                   # This value controls the drive letter where the nested virtual
+    L1VMMemory              = 32GB                                  # This value controls the amount of RAM for each AKS Edge Essentials host virtual machine
+    L1VMNumVCPU             = 8                                     # This value controls the number of vCPUs to assign to each AKS Edge Essentials host virtual machine.
+    InternalSwitch          = "InternalSwitch"                      # This value controls the Hyper-V internal switch name used by L0 Azure virtual machine.
+    L1Username              = "Administrator"                       # This value controls the Admin credential username for the L1 Hyper-V virtual machines that run on the Agora-Client.
+    L1Password              = 'Agora123!!'                          # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client.
+    L1DefaultGateway        = "172.20.1.1"                          # This value controls the default gateway IP address used by each L1 Hyper-V virtual machines that run on the Agora-Client.
+    L1SwitchName            = "AKS-Int"                             # This value controls the Hyper-V internal switch name used by each L1 Hyper-V virtual machines that run on the Agora-Client.
+    L1NatSubnetPrefix       = "172.20.1.0/24"                       # This value controls the network subnet used by each L1 Hyper-V virtual machines that run on the Agora-Client.
+
+    # NAT Configuration
+    natHostSubnet           = "192.168.128.0/24"
+    natHostVMSwitchName     = "InternalNAT"
+    natConfigure            = $true
+    natSubnet               = "192.168.46.0/24"                      # This value is the subnet is the NAT router will use to route to  AzSMGMT to access the Internet. It can be any /24 subnet and is only used for routing.
+    natDNS                  = "%staging-natDNS%"                     # Do not change - can be configured by passing the optional natDNS parameter to the ARM deployment.
+
+    # AKS Edge Essentials variables
+    SiteConfig              = @{
+        Detroit = @{
+            ArcClusterName         = "Ag-ArcK8s-Detroit"
+            NetIPAddress           = "172.20.1.2"
+            DefaultGateway         = "172.20.1.1"
+            PrefixLength           = "24"
+            DNSClientServerAddress = "168.63.129.16"
+            ServiceIPRangeStart    = "172.20.1.31"
+            ServiceIPRangeSize     = "10"
+            ControlPlaneEndpointIp = "172.20.1.21"
+            LinuxNodeIp4Address    = "172.20.1.11"
+            Subnet                 = "172.20.1.0/24"
+            FriendlyName           = "Detroit"
+            IsProduction           = $true
+            Type                   = "AKSEE"
+            Branch                 = "main"
+            HelmSetValue           = "alertmanager.enabled=false,grafana.enabled=false,prometheus.service.type=LoadBalancer"
+            HelmService            = "service/prometheus-kube-prometheus-prometheus"
+            GrafanaDataSource      = "detroit"
+            HelmValuesFile         = "prometheus-additional-scrape-config.yaml"
+            clusterLogSize         = "1024"
+            AKSEEReleaseUseLatest  = $true                            # If set to true, the latest AKSEE release will be used. If set to false, the n-1 version will be used
+        }
+        Monterrey = @{
+            ArcClusterName         = "Ag-ArcK8s-Monterrey"
+            NetIPAddress           = "172.20.1.3"
+            DefaultGateway         = "172.20.1.1"
+            PrefixLength           = "24"
+            DNSClientServerAddress = "168.63.129.16"
+            ServiceIPRangeStart    = "172.20.1.71"
+            ServiceIPRangeSize     = "10"
+            ControlPlaneEndpointIp = "172.20.1.61"
+            LinuxNodeIp4Address    = "172.20.1.51"
+            Subnet                 = "172.20.1.0/24"
+            FriendlyName           = "Monterrey"
+            IsProduction           = $true
+            Type                   = "AKSEE"
+            Branch                 = "main"
+            HelmSetValue           = "alertmanager.enabled=false,grafana.enabled=false,prometheus.service.type=LoadBalancer"
+            HelmService            = "service/prometheus-kube-prometheus-prometheus"
+            GrafanaDataSource      = "monterrey"
+            HelmValuesFile         = "prometheus-additional-scrape-config.yaml"
+            clusterLogSize         = "1024"
+            AKSEEReleaseUseLatest  = $true                            # If set to true, the latest AKSEE release will be used. If set to false, the n-1 version will be used
+        }
+    }
+
+    # Universal resource tag and resource types
+    TagName                 = 'Project'
+    TagValue                = 'Jumpstart_Agora'
+    ArcServerResourceType   = 'Microsoft.HybridCompute/machines'
+    ArcK8sResourceType      = 'Microsoft.Kubernetes/connectedClusters'
+    AksResourceType         = 'Microsoft.ContainerService/managedClusters'
+
+
+    # Observability variables
+    Monitoring              = @{
+        AdminUser  = "admin"
+        User       = "Contoso Operator"
+        Email      = "operator@contoso.com"
+        Namespace  = "observability"
+        ProdURL    = "http://localhost:3000"
+        Dashboards = @{
+            "grafana.com" = @() # Dashboards from https://grafana.com/grafana/dashboards
+            "custom"      = @('node-exporter-full','cluster-global') # Dashboards from https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_ag/artifacts/monitoring
+        }
+    }
+
+    Namespaces              = @(
+        "observability"
+        "images-cache"
+    )
+
+    AppConfig = @{
+        inferencing_deployment = @{
+            GitOpsConfigName = "contoso-motors"
+            KustomizationName = "contoso-motors"
+            KustomizationPath="./contoso_manufacturing/operations"
+            Namespace = "contoso-motors"
+            Order = 1
+        }
+    }
+
+    # Microsoft Edge startup settings variables
+    EdgeSettingRegistryPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Edge'
+    EdgeSettingValueTrue    = '00000001'
+    EdgeSettingValueFalse   = '00000000'
+
+}