resolve conflict

Author: xmzhao0822

.github/CODEOWNERS

@@ -1,8 +1,8 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
 
-/linter_exclusions.yml @kairu-ms @fengzhou-msft
+/linter_exclusions.yml @kairu-ms @wangzelin007
 
-/src/index.json @fengzhou-msft @qwordy @houk-ms @kairu-ms @jsntcy @Juliehzl @jiasli @zhoxing-ms @evelyn-ys @xfz11 @08nholloway @necusjz
+/src/index.json @kairu-ms @jsntcy @jiasli @zhoxing-ms @evelyn-ys @necusjz @wangzelin007
 
 /src/footprint/ @jonunezd @Diego-Perez-Botero
 
@@ -22,7 +22,7 @@
 
 /src/eventgrid/ @kalyanaj
 
-/src/storage-preview/ @evelyn_ys @calvinhzy
+/src/storage-preview/ @evelyn-ys @calvinhzy
 
 /src/dev-spaces/ @amsoedal
 
@@ -112,9 +112,9 @@
 
 /src/blueprint/ @fengzhou-msft
 
-/src/storage-blob-preview/ @evelyn_ys @calvinhzy
+/src/storage-blob-preview/ @evelyn-ys @calvinhzy
 
-/src/logic/ @jsntcy @kairu
+/src/logic/ @jsntcy @kairu-ms
 
 /src/hardware-security-modules/ @bquantump
 
@@ -226,7 +226,7 @@
 
 /src/image-gallery/ @zhoxing-ms
 
-/src/keyvault-preview/ @evelyn_ys @calvinhzy
+/src/keyvault-preview/ @evelyn-ys @calvinhzy
 
 /src/init/ @zhoxing-ms @HuangYT2000
 
@@ -327,3 +327,7 @@
 /src/acat @qinqingxu @Sherylueen @yongxin-ms @wh-alice
 
 /src/zones/ @nielsams
+
+/src/vme/ @caoyihua
+
+/src/carbon/ @itiinani

.github/policies/resourceManagement.yml

@@ -3335,12 +3335,12 @@ configuration:
       - addLabel:
           label: Auto-Assign
       - requestReview:
-          reviewer: AllyW
+          reviewer: wangzelin007
       - requestReview:
           reviewer: yonzhan
       - assignTo:
           users:
-          - AllyW
+          - wangzelin007
       description: '[machine learning] Auto assign labels and reviewers based on PR title/description.'
     - if:
       - payloadType: Issues

src/acrcssc/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.0.0b2
+++++++
+* Bug fix: Updated to allow for az login when the account doesn't have any active subscriptions
+
 
 1.0.0b1
 ++++++

src/acrcssc/azext_acrcssc/templates/task/cssc_scan_image.yaml

@@ -45,7 +45,7 @@ steps:
       if [ "$eoslValue" = "true" ]; then \
         echo "PATCHING will be skipped as EOSL is $eoslValue for image {{.Values.SOURCE_REPOSITORY}}:{{.Values.SOURCE_IMAGE_TAG}}"; \
       elif [ $vulCount -gt 0 ]; then \
-          az login --identity; \
+          az login --identity --allow-no-subscriptions; \
           echo "Total OS vulnerabilities found -> $vulCount"; \
           echo "PATCHING task scheduled for image {{.Values.SOURCE_REPOSITORY}}:{{.Values.SOURCE_IMAGE_TAG}}, new patch tag will be {{.Values.SOURCE_IMAGE_ORIGINAL_TAG}}-{{.Values.SOURCE_IMAGE_NEWPATCH_TAG}}"; \
           az acr task run --name $patchimagetask --registry $RegistryName --set SOURCE_REPOSITORY={{.Values.SOURCE_REPOSITORY}} --set SOURCE_IMAGE_TAG={{.Values.SOURCE_IMAGE_ORIGINAL_TAG}} --set SOURCE_IMAGE_NEWPATCH_TAG={{.Values.SOURCE_IMAGE_NEWPATCH_TAG}} --no-wait; \

src/acrcssc/azext_acrcssc/templates/task/cssc_trigger_workflow.yaml

@@ -23,7 +23,7 @@ steps:
       - ACR_EXPERIMENTAL_CSSC=true
   - cmd: bash -c 'sed -n "/^Listing/,/^Matches/ {/^Listing/b;/^Matches/b;/^Repo/b;p}" filterReposWithPatchTags.txt' > filteredReposAndTags.txt
   - cmd: bash -c 'sed -n "/^Configured Tag Convention:/p" filterReposWithPatchTags.txt' > tagConvention.txt
-  - cmd: az login --identity 
+  - cmd: az login --identity --allow-no-subscriptions
   - id: scan-and-schedule-patch
     timeout: 1800
     cmd: |

src/acrcssc/setup.py

@@ -13,7 +13,7 @@
     from distutils import log as logger
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
 
-VERSION = '1.0.0b1'
+VERSION = '1.0.0b2'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers

src/aks-preview/HISTORY.rst

@@ -12,10 +12,14 @@ To release a new version, please select a new version number (usually plus 1 to
 Pending
 +++++++
 
-18.0.0b3
+18.0.0b4
 +++++++
 * Create managed namespace commands `az aks namespace add/update/show/list/delete/get-credentials`
 
+18.0.0b3
++++++++
+* Add basic lb sku migration support `az aks update --load-balancer-sku standard`
+
 18.0.0b2
 +++++++
 * Vendor new SDK and bump API version to 2025-03-02-preview.

src/aks-preview/azext_aks_preview/_help.py

@@ -816,6 +816,10 @@
         - name: --tier
           type: string
           short-summary: Specify SKU tier for managed clusters. '--tier standard' enables a standard managed cluster service with a financially backed SLA. '--tier free' changes a standard managed cluster to a free one.
+        - name: --load-balancer-sku
+          type: string
+          short-summary: Azure Load Balancer SKU selection for your cluster. only standard is accepted.
+          long-summary: Upgrade to Standard Azure Load Balancer SKU for your AKS cluster.
         - name: --load-balancer-managed-outbound-ip-count
           type: int
           short-summary: Load balancer managed outbound IP count.
@@ -1267,6 +1271,8 @@
         text: az aks update --disable-cluster-autoscaler -g MyResourceGroup -n MyManagedCluster
       - name: Update min-count or max-count for cluster autoscaler.
         text: az aks update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n MyManagedCluster
+      - name: Upgrade load balancer sku to standard
+        text: az aks update --load-balancer-sku standard -g MyResourceGroup -n MyManagedCluster
       - name: Update a kubernetes cluster with standard SKU load balancer to use two AKS created IPs for the load balancer outbound connection usage.
         text: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
       - name: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage.

src/aks-preview/azext_aks_preview/_params.py

@@ -1025,6 +1025,11 @@ def load_arguments(self, _):
         # managed cluster paramerters
         c.argument("disable_local_accounts", action="store_true")
         c.argument("enable_local_accounts", action="store_true")
+        c.argument(
+            "load_balancer_sku",
+            arg_type=get_enum_type([CONST_LOAD_BALANCER_SKU_STANDARD]),
+            validator=validate_load_balancer_sku,
+        )
         c.argument("load_balancer_managed_outbound_ip_count", type=int)
         c.argument(
             "load_balancer_outbound_ips", validator=validate_load_balancer_outbound_ips

src/aks-preview/azext_aks_preview/custom.py

@@ -763,6 +763,7 @@ def aks_update(
     tags=None,
     disable_local_accounts=False,
     enable_local_accounts=False,
+    load_balancer_sku=None,
     load_balancer_managed_outbound_ip_count=None,
     load_balancer_outbound_ips=None,
     load_balancer_outbound_ip_prefixes=None,