Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve merge conflict on custom-words.txt for Microsoft.ContainerService/aks 2023-10-01 #26585

Conversation

FumingZhang
Copy link
Member

ARM (Control Plane) API Specification Update Pull Request

PR review workflow diagram

Please understand this diagram before proceeding. It explains how to get your PR approved & merged.

diagram

[1] ARM review queue (for merge queues, see [4])
The PRs are processed by time opened, ascending. Your PR may show up on 2nd or later page.
If you addressed Step 1 from the diagram and your PR is not showing up in the queue, ensure the label ARMChangesRequested
is removed from your PR. This should cause the label WaitForARMFeedback to be added.
[2] https://aka.ms/azsdk/support/specreview-channel
[3] List of SDK breaking changes approvers in pinned Teams announcement
[4] public repo merge queue, private repo merge queue (for ARM review queue, [1])

If you need further help with anything, see Getting help section below.

Purpose of this PR

What's the purpose of this PR? Check all that apply. This is mandatory!

  • New API version. (Such PR should have been generated with OpenAPI Hub).
  • Update existing version for a new feature. (This is applicable only when you are revising a private preview API version.)
  • Update existing version to fix swagger quality issues in S360.
  • Other, please clarify:
    • edit this with your clarification

Due diligence checklist

To merge this PR, you must go through the following checklist and confirm you understood
and followed the instructions by checking all the boxes:

Breaking changes review (Step 1)

  • If the automation determines you have breaking changes, i.e. Step 1 from the diagram applies to you,
    you must follow the breaking changes process.
    IMPORTANT This applies even if:
    • The tool fails while it shouldn't, e.g. due to runtime exception, or incorrect detection of breaking changes.
    • You believe there is no need for you to request breaking change approval, for any reason.
      Such claims must be reviewed, and the process is the same.

ARM API changes review (Step 2)

  • If this PR is in purview of ARM review then automation will add the ARMReview label.
  • If you want to force ARM review, add the label yourself.
  • Proceed according to the diagram at the top of this comment.

Viewing API changes

For convenient view of the API changes made by this PR, refer to the URLs provided in the table
in the Generated ApiView comment added to this PR. You can use ApiView to show API versions diff.

Suppressing failures

If one or multiple validation error/warning suppression(s) is detected in your PR, please follow the
Swagger-Suppression-Process
to get approval.

Getting help

Copy link

openapi-pipeline-app bot commented Nov 7, 2023

Next Steps to Merge

✔️ All automated merging requirements have been met! Refer to step 4 in the PR workflow diagram (even if your PR is for data plane, not ARM).

Copy link

openapi-pipeline-app bot commented Nov 7, 2023

Swagger Validation Report

️️✔️BreakingChange succeeded [Detail] [Expand]
There are no breaking changes.
️️✔️Breaking Change(Cross-Version) succeeded [Detail] [Expand]
There are no breaking changes.
️️✔️LintDiff succeeded [Detail] [Expand]
Validation passes for LintDiff.
️️✔️Avocado succeeded [Detail] [Expand]
Validation passes for Avocado.
️️✔️SwaggerAPIView succeeded [Detail] [Expand]
️️✔️TypeSpecAPIView succeeded [Detail] [Expand]
️️✔️ModelValidation succeeded [Detail] [Expand]
Validation passes for ModelValidation.
️️✔️SemanticValidation succeeded [Detail] [Expand]
Validation passes for SemanticValidation.
️️✔️PrettierCheck succeeded [Detail] [Expand]
Validation passes for PrettierCheck.
️️✔️SpellCheck succeeded [Detail] [Expand]
Validation passes for SpellCheck.
️️✔️PR Summary succeeded [Detail] [Expand]
Validation passes for Summary.
️⌛Automated merging requirements met pending [Detail]
Posted by Swagger Pipeline | How to fix these errors?

Copy link

openapi-pipeline-app bot commented Nov 7, 2023

Swagger Generation Artifacts

️️✔️ApiDocPreview succeeded [Detail] [Expand]
️️✔️SDK Breaking Change Tracking succeeded [Detail] [Expand]

Breaking Changes Tracking

Posted by Swagger Pipeline | How to fix these errors?

Copy link

Swagger pipeline started successfully. If there is ApiView generated, it will be updated in this comment.

@FumingZhang FumingZhang enabled auto-merge (squash) November 7, 2023 02:49
@FumingZhang
Copy link
Member Author

Resolve merge conflict for PR #26483.

@FumingZhang FumingZhang merged commit 5f495af into Azure:dev-containerservice-Microsoft.ContainerService-2023-10-01 Nov 7, 2023
28 checks passed
zizw123 pushed a commit that referenced this pull request Nov 7, 2023
…add version stable/2023-10-01 (#26483)

* Adds base for updating Microsoft.ContainerService/aks from version stable/2023-09-01 to version 2023-10-01

* Updates readme

* Updates API version in new specs and examples

* Add rest api specs for node public IP IPtags and IP-based Load Balancers (#26389)

* feat: add rest api spec for node public IP IPTags

* feat: add rest api spec for ip-based load balancer

* Add API spec for AKS HostNetwork NSG Control (#26385)

* update readme (#26388)

* Update custom words for ContainerService/aks 2023-10-01 (#26481)

* add CapacityReservationGroup into custom-words.txt (#26461)

Co-authored-by: tong chen <tonche@microsoft.com>

* add lower case capacityreservationgroup (#26475)

Co-authored-by: tong chen <tonche@microsoft.com>

---------

Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com>
Co-authored-by: tong chen <tonche@microsoft.com>

* restored to dev branch base (#26451)

Co-authored-by: tong chen <tonche@microsoft.com>

* resolve conflict (#26585)

---------

Co-authored-by: Qi Ni <pomelonicky@gmail.com>
Co-authored-by: Jialun Cai <jialun.cai@pm.me>
Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com>
Co-authored-by: tong chen <tonche@microsoft.com>
zman-ms pushed a commit that referenced this pull request Jan 10, 2024
…add version stable/2023-10-01 (#26483)

* Adds base for updating Microsoft.ContainerService/aks from version stable/2023-09-01 to version 2023-10-01

* Updates readme

* Updates API version in new specs and examples

* Add rest api specs for node public IP IPtags and IP-based Load Balancers (#26389)

* feat: add rest api spec for node public IP IPTags

* feat: add rest api spec for ip-based load balancer

* Add API spec for AKS HostNetwork NSG Control (#26385)

* update readme (#26388)

* Update custom words for ContainerService/aks 2023-10-01 (#26481)

* add CapacityReservationGroup into custom-words.txt (#26461)

Co-authored-by: tong chen <tonche@microsoft.com>

* add lower case capacityreservationgroup (#26475)

Co-authored-by: tong chen <tonche@microsoft.com>

---------

Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com>
Co-authored-by: tong chen <tonche@microsoft.com>

* restored to dev branch base (#26451)

Co-authored-by: tong chen <tonche@microsoft.com>

* resolve conflict (#26585)

---------

Co-authored-by: Qi Ni <pomelonicky@gmail.com>
Co-authored-by: Jialun Cai <jialun.cai@pm.me>
Co-authored-by: Tong Chen <99183466+tonychen15@users.noreply.github.com>
Co-authored-by: tong chen <tonche@microsoft.com>
@FumingZhang FumingZhang deleted the fuming/dev-cs-1001 branch February 4, 2024 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants