Skip to content

Commit aaf537b

Browse files
committed
merge dev
2 parents c051293 + 253eb81 commit aaf537b

File tree

138 files changed

+92152
-72424
lines changed

Some content is hidden

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

138 files changed

+92152
-72424
lines changed

build_scripts/windows/scripts/build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if "%ARCH%"=="x86" (
3030
echo Please set ARCH to "x86" or "x64"
3131
goto ERROR
3232
)
33-
set PYTHON_VERSION=3.13.7
33+
set PYTHON_VERSION=3.13.9
3434

3535
set WIX_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/msi/wix310-binaries-mirror.zip"
3636
set PYTHON_DOWNLOAD_URL="https://www.python.org/ftp/python/%PYTHON_VERSION%/python-%PYTHON_VERSION%-embed-%PYTHON_ARCH%.zip"

scripts/release/debian/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set -exv
1515
ls -Rl /mnt/artifacts
1616

1717
WORKDIR=`cd $(dirname $0); cd ../../../; pwd`
18-
PYTHON_VERSION="3.13.7"
18+
PYTHON_VERSION="3.13.9"
1919
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2020

2121
# Update APT packages

src/azure-cli-core/azure/cli/core/breaking_change.py

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

1616
logger = get_logger()
1717

18-
NEXT_BREAKING_CHANGE_RELEASE = '2.79.0'
18+
NEXT_BREAKING_CHANGE_RELEASE = '2.80.0'
1919
NEXT_BREAKING_CHANGE_DATE = 'Nov 2025'
2020
DEFAULT_BREAKING_CHANGE_TAG = '[Breaking Change]'
2121

src/azure-cli/azure/cli/command_modules/acr/_archive_utils.py

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,21 @@ def _pack_source_code(source_location, tar_file_path, docker_file_path, docker_f
6666
original_docker_file_name = os.path.basename(docker_file_path.replace("\\", os.sep))
6767
ignore_list, ignore_list_size = _load_dockerignore_file(source_location, original_docker_file_name)
6868
common_vcs_ignore_list = {'.git', '.gitignore', '.bzr', 'bzrignore', '.hg', '.hgignore', '.svn'}
69+
# Directories that should be completely excluded (no recursive descent) for performance reasons.
70+
# These typically contain large numbers of files that are not needed for container build context.
71+
build_ignore_dirs = {'.venv'}
6972

7073
def _ignore_check(tarinfo, parent_ignored, parent_matching_rule_index):
71-
# ignore common vcs dir or file
72-
if tarinfo.name in common_vcs_ignore_list:
74+
# Ignore common VCS dirs/files by basename so nested instances are handled.
75+
if os.path.basename(tarinfo.name) in common_vcs_ignore_list:
7376
logger.warning("Excluding '%s' based on default ignore rules", tarinfo.name)
7477
return True, parent_matching_rule_index
7578

79+
# Exclude performance-heavy directories entirely (no traversal) regardless of .dockerignore.
80+
if tarinfo.isdir() and os.path.basename(tarinfo.name) in build_ignore_dirs:
81+
logger.warning("Excluding '%s' directory for performance", os.path.basename(tarinfo.name))
82+
return True, parent_matching_rule_index
83+
7684
if ignore_list is None:
7785
# if .dockerignore doesn't exists, inherit from parent
7886
# eg, it will ignore the files under .git folder.
@@ -100,7 +108,8 @@ def _ignore_check(tarinfo, parent_ignored, parent_matching_rule_index):
100108
arcname="",
101109
parent_ignored=False,
102110
parent_matching_rule_index=ignore_list_size,
103-
ignore_check=_ignore_check)
111+
ignore_check=_ignore_check,
112+
build_ignore_dirs=build_ignore_dirs)
104113

105114
# Add the Dockerfile if it's specified.
106115
# In the case of run, there will be no Dockerfile.
@@ -182,7 +191,8 @@ def _load_dockerignore_file(source_location, original_docker_file_name):
182191
return ignore_list, len(ignore_list)
183192

184193

185-
def _archive_file_recursively(tar, name, arcname, parent_ignored, parent_matching_rule_index, ignore_check):
194+
def _archive_file_recursively(tar, name, arcname, parent_ignored, parent_matching_rule_index,
195+
ignore_check, build_ignore_dirs):
186196
# create a TarInfo object from the file
187197
tarinfo = tar.gettarinfo(name, arcname)
188198

@@ -201,12 +211,13 @@ def _archive_file_recursively(tar, name, arcname, parent_ignored, parent_matchin
201211
else:
202212
tar.addfile(tarinfo)
203213

204-
# even the dir is ignored, its child items can still be included, so continue to scan
205-
if tarinfo.isdir():
214+
# Even if a dir is ignored by .dockerignore, its children might still be included (Docker semantics),
215+
# so we continue scanning unless it is in our build_ignore_dirs set (performance skip list).
216+
if tarinfo.isdir() and os.path.basename(tarinfo.name) not in build_ignore_dirs:
206217
for f in os.listdir(name):
207218
_archive_file_recursively(tar, os.path.join(name, f), os.path.join(arcname, f),
208219
parent_ignored=ignored, parent_matching_rule_index=matching_rule_index,
209-
ignore_check=ignore_check)
220+
ignore_check=ignore_check, build_ignore_dirs=build_ignore_dirs)
210221

211222

212223
def check_remote_source_code(source_location):

src/azure-cli/azure/cli/command_modules/acs/_consts.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
CONST_PRIVATE_DNS_ZONE_NONE = "none"
9494

9595
# role assignment for kubelet
96-
CONST_MANAGED_IDENTITY_OPERATOR_ROLE = 'Managed Identity Operator'
97-
CONST_MANAGED_IDENTITY_OPERATOR_ROLE_ID = 'f1a07417-d97a-45cb-824c-7a7467783830'
96+
CONST_MANAGED_IDENTITY_OPERATOR_ROLE = "Managed Identity Operator"
97+
CONST_MANAGED_IDENTITY_OPERATOR_ROLE_ID = "f1a07417-d97a-45cb-824c-7a7467783830"
9898

9999
# role assignment for vnet subnet
100100
CONST_NETWORK_CONTRIBUTOR_ROLE_ID = "4d97b98b-1d4f-4787-a291-c67834d212e7"
@@ -134,6 +134,11 @@
134134
CONST_NETWORK_POLICY_CALICO = "calico"
135135
CONST_NETWORK_POLICY_NONE = "none"
136136

137+
# ACNS advanced network policies
138+
CONST_ADVANCED_NETWORKPOLICIES_NONE = "None"
139+
CONST_ADVANCED_NETWORKPOLICIES_FQDN = "FQDN"
140+
CONST_ADVANCED_NETWORKPOLICIES_L7 = "L7"
141+
137142
# network pod ip allocation mode
138143
CONST_NETWORK_POD_IP_ALLOCATION_MODE_DYNAMIC_INDIVIDUAL = "DynamicIndividual"
139144
CONST_NETWORK_POD_IP_ALLOCATION_MODE_STATIC_BLOCK = "StaticBlock"
@@ -190,15 +195,15 @@
190195

191196
# all supported addons
192197
ADDONS = {
193-
'http_application_routing': CONST_HTTP_APPLICATION_ROUTING_ADDON_NAME,
194-
'monitoring': CONST_MONITORING_ADDON_NAME,
195-
'virtual-node': CONST_VIRTUAL_NODE_ADDON_NAME,
196-
'kube-dashboard': CONST_KUBE_DASHBOARD_ADDON_NAME,
197-
'azure-policy': CONST_AZURE_POLICY_ADDON_NAME,
198-
'ingress-appgw': CONST_INGRESS_APPGW_ADDON_NAME,
198+
"http_application_routing": CONST_HTTP_APPLICATION_ROUTING_ADDON_NAME,
199+
"monitoring": CONST_MONITORING_ADDON_NAME,
200+
"virtual-node": CONST_VIRTUAL_NODE_ADDON_NAME,
201+
"kube-dashboard": CONST_KUBE_DASHBOARD_ADDON_NAME,
202+
"azure-policy": CONST_AZURE_POLICY_ADDON_NAME,
203+
"ingress-appgw": CONST_INGRESS_APPGW_ADDON_NAME,
199204
"confcom": CONST_CONFCOM_ADDON_NAME,
200-
'open-service-mesh': CONST_OPEN_SERVICE_MESH_ADDON_NAME,
201-
'azure-keyvault-secrets-provider': CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
205+
"open-service-mesh": CONST_OPEN_SERVICE_MESH_ADDON_NAME,
206+
"azure-keyvault-secrets-provider": CONST_AZURE_KEYVAULT_SECRETS_PROVIDER_ADDON_NAME,
202207
"web_application_routing": CONST_WEB_APPLICATION_ROUTING_KEY_NAME,
203208
}
204209

@@ -249,8 +254,8 @@
249254

250255
# consts for decorator pattern
251256
class DecoratorMode(Enum):
252-
"""Enumerations used to distinguish whether to handle creation or update.
253-
"""
257+
"""Enumerations used to distinguish whether to handle creation or update."""
258+
254259
CREATE = 1
255260
UPDATE = 2
256261

@@ -259,6 +264,7 @@ class AgentPoolDecoratorMode(Enum):
259264
"""Enumerations used to distinguish whether to deal with the default system agentpool in the context of the cluster
260265
or any specific agentpool.
261266
"""
267+
262268
MANAGED_CLUSTER = 1
263269
STANDALONE = 2
264270

0 commit comments

Comments
 (0)