Skip to content

Commit 360dd80

Browse files
authored
Merge branch 'main' into copilot/fix-app-configuration-validation
2 parents 4226065 + cb363c7 commit 360dd80

364 files changed

Lines changed: 18265 additions & 7086 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

eng/automation/api-specs.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ offazurespringboot:
110110
service: springappdiscovery
111111
operationalinsights:
112112
service: loganalytics
113+
operationalinsights/Microsoft.OperationalInsights/OperationalInsights:
114+
service: loganalytics
113115
oracle:
114116
service: oracledatabase
115117
paloaltonetworks:

eng/common/scripts/stress-testing/deploy-stress-tests.ps1

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,30 @@ param(
4242

4343
. $PSScriptRoot/stress-test-deployment-lib.ps1
4444

45+
# If there are local changes to values.yaml it's almost certain that the user
46+
# is an admin and has provisioned a new stress cluster but not published a
47+
# new addons chart with the new infra config values. In these cases we should
48+
# just fail, as deploying without the local addons override causes misleading
49+
# errors in the cluster with pods not able to mount storage accounts using the
50+
# old values.yaml reference from the published stress-test-addons helm chart.
51+
if (!$LocalAddonsPath) {
52+
try {
53+
$repoRoot = git -C $PSScriptRoot rev-parse --show-toplevel 2>$null
54+
} catch {
55+
$repoRoot = $null
56+
}
57+
58+
if ($repoRoot -and (Split-Path $repoRoot -Leaf) -eq "azure-sdk-tools") {
59+
$valuesFile = Join-Path $repoRoot "tools/stress-cluster/cluster/kubernetes/stress-test-addons/values.yaml"
60+
if (Test-Path $valuesFile) {
61+
$valuesStatus = git -C $repoRoot status --porcelain -- $valuesFile
62+
if ($valuesStatus) {
63+
$localAddonsDir = Split-Path $valuesFile -Parent
64+
throw "Detected changes to '$valuesFile' without -LocalAddonsPath. Re-run with '-LocalAddonsPath $localAddonsDir' to apply local addon values."
65+
}
66+
}
67+
}
68+
}
69+
4570
CheckDependencies
4671
DeployStressTests @PSBoundParameters

eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,21 @@ function DeployStressTests(
122122
if ($clusterGroup -or $subscription) {
123123
Write-Warning "Overriding cluster group and subscription with defaults for 'pg' environment."
124124
}
125-
$clusterGroup = 'rg-stress-cluster-pg'
125+
$clusterGroup = 'SSS3PT_rg-stress-cluster-pg'
126126
$subscription = 'Azure SDK Test Resources - TME'
127127
$tenant = '70a036f6-8e4d-4615-bad6-149c02e7720d'
128128
} elseif ($environment -eq 'prod') {
129129
if ($clusterGroup -or $subscription) {
130130
Write-Warning "Overriding cluster group and subscription with defaults for 'prod' environment."
131131
}
132-
$clusterGroup = 'rg-stress-cluster-prod'
132+
$clusterGroup = 'SSS3PT_rg-stress-cluster-prod'
133133
$subscription = 'Azure SDK Test Resources - TME'
134134
$tenant = '70a036f6-8e4d-4615-bad6-149c02e7720d'
135135
} elseif ($environment -eq 'storage') {
136136
if ($clusterGroup -or $subscription) {
137137
Write-Warning "Overriding cluster group and subscription with defaults for 'storage' environment."
138138
}
139-
$clusterGroup = 'rg-stress-cluster-storage'
139+
$clusterGroup = 'SSS3PT_rg-stress-cluster-storage'
140140
$subscription = 'Azure SDK Test Resources - TME'
141141
$tenant = '72f988bf-86f1-41af-91ab-2d7cd011db47'
142142
} elseif (!$clusterGroup -or !$subscription -or $tenant) {

eng/versioning/version_client.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;6.1.0;6.2.0-be
271271
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;6.1.0;6.2.0-beta.1
272272
com.azure.spring:spring-cloud-azure-testcontainers;6.1.0;6.2.0-beta.1
273273
com.azure:azure-spring-data-cosmos;6.1.0;6.2.0-beta.1
274-
com.azure.resourcemanager:azure-resourcemanager;2.57.0;2.58.0-beta.1
274+
com.azure.resourcemanager:azure-resourcemanager;2.58.0;2.59.0-beta.1
275275
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.51.0;2.52.0-beta.1
276276
com.azure.resourcemanager:azure-resourcemanager-appservice;2.54.1;2.55.0-beta.1
277277
com.azure.resourcemanager:azure-resourcemanager-authorization;2.53.6;2.54.0-beta.1
@@ -307,7 +307,7 @@ com.azure.resourcemanager:azure-resourcemanager-relay;1.0.0;1.1.0-beta.1
307307
com.azure.resourcemanager:azure-resourcemanager-costmanagement;1.0.0;1.1.0-beta.1
308308
com.azure.resourcemanager:azure-resourcemanager-recoveryservices;1.5.0;1.6.0
309309
com.azure.resourcemanager:azure-resourcemanager-kusto;1.2.0;1.3.0-beta.1
310-
com.azure.resourcemanager:azure-resourcemanager-loganalytics;1.1.0;1.2.0-beta.1
310+
com.azure.resourcemanager:azure-resourcemanager-loganalytics;2.0.0;2.1.0-beta.1
311311
com.azure.resourcemanager:azure-resourcemanager-eventgrid;1.2.0;1.3.0-beta.2
312312
com.azure.resourcemanager:azure-resourcemanager-healthbot;1.1.0;1.2.0-beta.1
313313
com.azure.resourcemanager:azure-resourcemanager-confluent;1.2.0;1.3.0-beta.1
@@ -433,7 +433,7 @@ com.azure.resourcemanager:azure-resourcemanager-recoveryservicessiterecovery;1.3
433433
com.azure.resourcemanager:azure-resourcemanager-billingbenefits;1.0.0-beta.2;1.0.0-beta.3
434434
com.azure.resourcemanager:azure-resourcemanager-providerhub;2.0.0;2.1.0-beta.1
435435
com.azure.resourcemanager:azure-resourcemanager-reservations;1.0.0;1.1.0-beta.1
436-
com.azure.resourcemanager:azure-resourcemanager-containerservicefleet;1.2.0;1.3.0-beta.2
436+
com.azure.resourcemanager:azure-resourcemanager-containerservicefleet;1.2.0;1.3.0-beta.3
437437
com.azure.resourcemanager:azure-resourcemanager-storagemover;1.4.0;1.5.0-beta.1
438438
com.azure.resourcemanager:azure-resourcemanager-graphservices;1.1.0;1.2.0-beta.1
439439
com.azure.resourcemanager:azure-resourcemanager-voiceservices;1.1.0;1.2.0-beta.1

sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>com.azure.resourcemanager</groupId>
100100
<artifactId>azure-resourcemanager-loganalytics</artifactId>
101-
<version>1.1.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-loganalytics;dependency} -->
101+
<version>2.0.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-loganalytics;dependency} -->
102102
<scope>test</scope>
103103
</dependency>
104104
<dependency>

sdk/batch/azure-compute-batch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>com.azure.resourcemanager</groupId>
8787
<artifactId>azure-resourcemanager</artifactId>
88-
<version>2.57.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
88+
<version>2.58.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>

sdk/boms/spring-cloud-azure-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>com.azure.resourcemanager</groupId>
6262
<artifactId>azure-resourcemanager</artifactId>
63-
<version>2.57.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
63+
<version>2.58.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
6464
</dependency>
6565

6666
<!-- Spring Cloud Azure -->

sdk/containerservicefleet/azure-resourcemanager-containerservicefleet/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Release History
22

3+
## 1.3.0-beta.3 (Unreleased)
4+
5+
### Features Added
6+
7+
### Breaking Changes
8+
9+
### Bugs Fixed
10+
11+
### Other Changes
12+
313
## 1.3.0-beta.2 (2025-12-03)
414

515
- Azure Resource Manager Container Service Fleet client library for Java. This package contains Microsoft Azure SDK for Container Service Fleet Management SDK. Azure Kubernetes Fleet Manager api client. Package api-version 2025-08-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

sdk/containerservicefleet/azure-resourcemanager-containerservicefleet/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>com.azure.resourcemanager</groupId>
1616
<artifactId>azure-resourcemanager-containerservicefleet</artifactId>
17-
<version>1.3.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservicefleet;current} -->
17+
<version>1.3.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservicefleet;current} -->
1818
<packaging>jar</packaging>
1919

2020
<name>Microsoft Azure SDK for Container Service Fleet Management</name>

sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>com.azure.resourcemanager</groupId>
7575
<artifactId>azure-resourcemanager</artifactId>
76-
<version>2.57.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
76+
<version>2.58.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
7777
<scope>test</scope>
7878
</dependency>
7979
<dependency>

0 commit comments

Comments
 (0)