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

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #64

Merged
merged 7 commits into from
Jul 14, 2023

Commits on Jul 13, 2023

  1. Configuration menu
    Copy the full SHA
    c39e370 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7c6a161 View commit details
    Browse the repository at this point in the history
  3. [submodule] Update submodule sonic-utilities to the latest HEAD autom…

    …atically (#15809)
    
    src/sonic-utilities
    
    * 20853a6f - (HEAD -> 202205, origin/202205) Revert "[GCU Feature Update] Cherry-pick Platform Validator PR to 202205  (#2883)" (#2908) (6 hours ago) [isabelmsft]
    mssonicbld authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    2d39daf View commit details
    Browse the repository at this point in the history
  4. Upgrade XGS SAI version to 7.1.54.4 (#15820)

    Signed-off-by: zitingguo-ms <zitingguo@microsoft.com>
    Gfrom2016 authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    e73924e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9cd3319 View commit details
    Browse the repository at this point in the history
  6. Add health check probe for k8s upgrade containers. (#15223)

    #### Why I did it
    After k8s upgrade a container, k8s can only know the container is running, don't know the service's status inside container. So we need a probe inside container, k8s will call the probe to check whether the container is really ready.
    ##### Work item tracking
    - Microsoft ADO **(number only)**: 22453004
    #### How I did it
    Add a health check probe inside config engine container, the probe will check whether the start service exit normally or not if the start service exists and call the python script to do container self-related specific checks if the script is there. The python script should be implemented by feature owner if it's needed.
    
    more details: [design doc](https://github.com/sonic-net/SONiC/blob/master/doc/kubernetes/health-check.md)
    #### How to verify it
    Check path /usr/bin/readiness_probe.sh inside container.
    
    #### Which release branch to backport (provide reason below if selected)
    
    - [ ] 201811
    - [ ] 201911
    - [ ] 202006
    - [ ] 202012
    - [ ] 202106
    - [ ] 202111
    - [x] 202205
    - [x] 202211
    
    #### Tested branch (Please provide the tested image version)
    - [x] 20220531.28
    lixiaoyuner authored and mssonicbld committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    fb14b98 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Configuration menu
    Copy the full SHA
    56aabe0 View commit details
    Browse the repository at this point in the history