diff --git a/.ado/pipelines/config/configuration.yaml b/.ado/pipelines/config/configuration.yaml index 11c5b34ed..3b783a959 100644 --- a/.ado/pipelines/config/configuration.yaml +++ b/.ado/pipelines/config/configuration.yaml @@ -13,7 +13,7 @@ variables: - name: 'ingressNginxVersion' # nginx ingress controller helm chart version value: '4.7.3' - name: 'certManagerVersion' # cert-manager helm chart version - value: 'v1.13.1' + value: 'v1.13.3' - name: 'dotnetSdkVersion' # dotnet sdk version value: '8.0.100' - name: 'chaosMeshVersion' # chaos-mesh chart version diff --git a/.ado/pipelines/templates/jobs-deploy-workload.yaml b/.ado/pipelines/templates/jobs-deploy-workload.yaml index 937e97270..e2492e02e 100644 --- a/.ado/pipelines/templates/jobs-deploy-workload.yaml +++ b/.ado/pipelines/templates/jobs-deploy-workload.yaml @@ -85,17 +85,17 @@ jobs: # using jobs so they each run in parallel $certificateName = "workload-ingress-secret" # checking if certificate for workload-ingress-secret was issued - if ($(kubectl get certificates $certificateName -n $(workloadNamespace) -o 'jsonpath={..status.conditions[?(@.type==\"Ready\")].status}') -ne "True") + if ($(kubectl get certificates $certificateName -n $(workloadNamespace) -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') -ne "True") { $certReady = $false $retrycount++ - echo "Certificate for $certificateName not ready. Waiting for $sleepSeconds seconds and retrying... $retrycount/$maxretrycount"; + echo "Certificate '$certificateName' (in namespace '$(workloadNamespace)') is not ready. Waiting for $sleepSeconds seconds and retrying... $retrycount/$maxretrycount"; Start-Sleep $sleepSeconds } else { - echo "Certificate $certificateName is ready!" + echo "Certificate '$certificateName' (in namespace '$(workloadNamespace)') is ready!" $certReady = $true break } @@ -103,7 +103,7 @@ jobs: # using jobs so they each run in parallel if(-not $certReady) { - throw "*** Error - Certificate $certificateName was not provisioned in time" + throw "*** Error - Certificate '$certificateName' (in namespace '$(workloadNamespace)') was not provisioned in time" } } diff --git a/src/app/AlwaysOn.BackgroundProcessor/AlwaysOn.BackgroundProcessor.csproj b/src/app/AlwaysOn.BackgroundProcessor/AlwaysOn.BackgroundProcessor.csproj index 4f2889c20..d1284f62e 100644 --- a/src/app/AlwaysOn.BackgroundProcessor/AlwaysOn.BackgroundProcessor.csproj +++ b/src/app/AlwaysOn.BackgroundProcessor/AlwaysOn.BackgroundProcessor.csproj @@ -13,7 +13,7 @@ <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.10.0" /> <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> - <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> + <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" /> </ItemGroup> diff --git a/src/app/AlwaysOn.CatalogService/AlwaysOn.CatalogService.csproj b/src/app/AlwaysOn.CatalogService/AlwaysOn.CatalogService.csproj index d2b4b5968..4520a8c04 100644 --- a/src/app/AlwaysOn.CatalogService/AlwaysOn.CatalogService.csproj +++ b/src/app/AlwaysOn.CatalogService/AlwaysOn.CatalogService.csproj @@ -12,7 +12,7 @@ <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" /> - <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> + <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" /> </ItemGroup> diff --git a/src/app/AlwaysOn.HealthService/AlwaysOn.HealthService.csproj b/src/app/AlwaysOn.HealthService/AlwaysOn.HealthService.csproj index 5f77a9871..ebed65c72 100644 --- a/src/app/AlwaysOn.HealthService/AlwaysOn.HealthService.csproj +++ b/src/app/AlwaysOn.HealthService/AlwaysOn.HealthService.csproj @@ -11,7 +11,7 @@ <PackageReference Include="Azure.Monitor.Query" Version="1.2.0" /> <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" /> - <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" /> + <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" /> </ItemGroup> diff --git a/src/app/AlwaysOn.Shared/AlwaysOn.Shared.csproj b/src/app/AlwaysOn.Shared/AlwaysOn.Shared.csproj index e5e763005..4bd7d4196 100644 --- a/src/app/AlwaysOn.Shared/AlwaysOn.Shared.csproj +++ b/src/app/AlwaysOn.Shared/AlwaysOn.Shared.csproj @@ -10,7 +10,7 @@ <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" /> <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.37.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" /> - <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.0" /> + <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.1" /> </ItemGroup> </Project> diff --git a/src/infra/monitoring/grafana/terraform/globalresources/main.tf b/src/infra/monitoring/grafana/terraform/globalresources/main.tf index af92fdcae..f0bed34ed 100644 --- a/src/infra/monitoring/grafana/terraform/globalresources/main.tf +++ b/src/infra/monitoring/grafana/terraform/globalresources/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } } diff --git a/src/infra/monitoring/grafana/terraform/stamps/main.tf b/src/infra/monitoring/grafana/terraform/stamps/main.tf index a1a63865c..6c13d7ae7 100644 --- a/src/infra/monitoring/grafana/terraform/stamps/main.tf +++ b/src/infra/monitoring/grafana/terraform/stamps/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } } diff --git a/src/infra/workload/globalresources/main.tf b/src/infra/workload/globalresources/main.tf index 972f9661f..b3b4be601 100644 --- a/src/infra/workload/globalresources/main.tf +++ b/src/infra/workload/globalresources/main.tf @@ -2,11 +2,11 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } azapi = { source = "Azure/azapi" - version = "1.11.0" + version = "1.12.0" } } diff --git a/src/infra/workload/releaseunit/main.tf b/src/infra/workload/releaseunit/main.tf index 356a5b948..c814a12e3 100644 --- a/src/infra/workload/releaseunit/main.tf +++ b/src/infra/workload/releaseunit/main.tf @@ -2,11 +2,11 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } azapi = { source = "Azure/azapi" - version = "1.11.0" + version = "1.12.0" } } diff --git a/src/infra/workload/releaseunit/modules/stamp/main.tf b/src/infra/workload/releaseunit/modules/stamp/main.tf index e4efd4b25..5948f5921 100644 --- a/src/infra/workload/releaseunit/modules/stamp/main.tf +++ b/src/infra/workload/releaseunit/modules/stamp/main.tf @@ -2,11 +2,11 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } azapi = { source = "Azure/azapi" - version = "1.11.0" + version = "1.12.0" } } } diff --git a/src/infra/workload/releaseunit/modules/stamp/prometheus.tf b/src/infra/workload/releaseunit/modules/stamp/prometheus.tf index 9e4675e41..37c81fd0e 100644 --- a/src/infra/workload/releaseunit/modules/stamp/prometheus.tf +++ b/src/infra/workload/releaseunit/modules/stamp/prometheus.tf @@ -12,6 +12,8 @@ resource "azurerm_monitor_data_collection_endpoint" "stamp" { kind = "Linux" public_network_access_enabled = true description = "monitor_data_collection_endpoint example" + + tags = var.default_tags } resource "azurerm_monitor_data_collection_rule" "stamp" { @@ -39,6 +41,8 @@ resource "azurerm_monitor_data_collection_rule" "stamp" { name = "MonitoringAccount1" } } + + tags = var.default_tags } resource "azurerm_monitor_data_collection_rule_association" "aks" { @@ -75,6 +79,7 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "prometheusK8sRuleGroup" enabled = true } + tags = var.default_tags } resource "azurerm_monitor_alert_prometheus_rule_group" "prometheusNodeRuleGroup" { @@ -95,4 +100,6 @@ resource "azurerm_monitor_alert_prometheus_rule_group" "prometheusNodeRuleGroup" } enabled = true } + + tags = var.default_tags } diff --git a/src/testing/loadtest-azure/infra/main.tf b/src/testing/loadtest-azure/infra/main.tf index 79c0a96ec..5ef496015 100644 --- a/src/testing/loadtest-azure/infra/main.tf +++ b/src/testing/loadtest-azure/infra/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } } diff --git a/src/testing/loadtest-locust/infra/main.tf b/src/testing/loadtest-locust/infra/main.tf index 47ebe9d1c..45151be24 100644 --- a/src/testing/loadtest-locust/infra/main.tf +++ b/src/testing/loadtest-locust/infra/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } } diff --git a/src/testing/userload-generator/AzureFunctions/GlobalOrchestrator/GlobalOrchestrator.csproj b/src/testing/userload-generator/AzureFunctions/GlobalOrchestrator/GlobalOrchestrator.csproj index 818b694c8..81cc01b67 100644 --- a/src/testing/userload-generator/AzureFunctions/GlobalOrchestrator/GlobalOrchestrator.csproj +++ b/src/testing/userload-generator/AzureFunctions/GlobalOrchestrator/GlobalOrchestrator.csproj @@ -4,7 +4,7 @@ <AzureFunctionsVersion>v4</AzureFunctionsVersion> </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.13.0" /> + <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.13.1" /> <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" /> <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" /> </ItemGroup> diff --git a/src/testing/userload-generator/AzureFunctions/RegionalLoadGenerator/package-lock.json b/src/testing/userload-generator/AzureFunctions/RegionalLoadGenerator/package-lock.json index 14ace8f7b..3ada967ce 100644 --- a/src/testing/userload-generator/AzureFunctions/RegionalLoadGenerator/package-lock.json +++ b/src/testing/userload-generator/AzureFunctions/RegionalLoadGenerator/package-lock.json @@ -49,12 +49,30 @@ "node": ">=16" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dependencies": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" } }, "node_modules/csv-parser": { @@ -79,13 +97,21 @@ "ms": "2.0.0" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/durable-functions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/durable-functions/-/durable-functions-3.0.0.tgz", - "integrity": "sha512-VbmiHqMWcrEtgFPd4htP/ooXNP9H91FCGzNS4ZS19Wdvvc+M5cQFnLGOk7/9DfLp3cLeBXIMEgPaYjZ+Fx7k2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/durable-functions/-/durable-functions-3.0.1.tgz", + "integrity": "sha512-XAlkZ3t8su1lWFjDS9oqC6lGvL+tF6rv8/99OMQhscugn06iKzaZjjI5ZGcSvHQfz4sDmCJ4aagZQ2BCq8Ehdw==", "dependencies": { "@azure/functions": "^4.0.0", - "axios": "^0.21.1", + "axios": "^1.6.1", "debug": "~2.6.9", "lodash": "^4.17.15", "moment": "^2.29.2", @@ -97,9 +123,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", @@ -115,6 +141,19 @@ } } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -138,6 +177,25 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimist": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", @@ -177,12 +235,12 @@ } }, "node_modules/playwright-chromium": { - "version": "1.40.1", - "resolved": "https://registry.npmjs.org/playwright-chromium/-/playwright-chromium-1.40.1.tgz", - "integrity": "sha512-3atylP47OCTBW0siGI7LOEG/XKL/vnrFH8xdr4uaTnqMsc0Xq4gOLk2gGwniPJ76LSc++9ASc0w/nfqtLAmm3A==", + "version": "1.41.1", + "resolved": "https://registry.npmjs.org/playwright-chromium/-/playwright-chromium-1.41.1.tgz", + "integrity": "sha512-Nr1/rnmRB4QzoAQwCors1Qsa9PLSdipsKiI4FZCQjSDzoBVBzoQqfXGtcIEnoAXEEEpzxuCPqjJNQwCVA66tCw==", "hasInstallScript": true, "dependencies": { - "playwright-core": "1.40.1" + "playwright-core": "1.41.1" }, "bin": { "playwright": "cli.js" @@ -191,6 +249,17 @@ "node": ">=16" } }, + "node_modules/playwright-chromium/node_modules/playwright-core": { + "version": "1.41.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.41.1.tgz", + "integrity": "sha512-/KPO5DzXSMlxSX77wy+HihKGOunh3hqndhqeo/nMxfigiKzogn8kfL0ZBDu0L1RKgan5XHCPmn6zXd2NUJgjhg==", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=16" + } + }, "node_modules/playwright-core": { "version": "1.40.1", "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.1.tgz", @@ -202,6 +271,11 @@ "node": ">=16" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/undici": { "version": "5.26.4", "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.4.tgz", diff --git a/src/testing/userload-generator/infra/main.tf b/src/testing/userload-generator/infra/main.tf index 56e2a5d58..7b467dd02 100644 --- a/src/testing/userload-generator/infra/main.tf +++ b/src/testing/userload-generator/infra/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.88.0" + version = "3.90.0" } }