Skip to content

Conversation

@otcbot
Copy link
Contributor

@otcbot otcbot bot commented Jan 15, 2026

This is an automatically created Pull Request for changes to cloud-container-engine-api-ref to promote changes down the pipeline to Production environment.

The original change can be found under https://gitea.eco.tsi-dev.otc-service.com/docs/cloud-container-engine/pulls/135.

There were patch conflicts, please review original patch file.

@otcbot otcbot bot added the documentation Improvements or additions to documentation label Jan 15, 2026
@otcbot
Copy link
Contributor Author

otcbot bot commented Jan 15, 2026

I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.

BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.

In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.

Following is the patch remainder:

diff a/umn/source/nodes/node_oss.rst b/umn/source/nodes/node_oss.rst	(rejected hunks)
@@ -17,59 +17,65 @@ Node OSs and Cluster Types
    +=====================+=================+======================+===================================+==========================+===========================================+
    |                     |                 | VPC Network          | Tunnel Network                    | Cloud Native Network 2.0 |                                           |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   | HCE OS 2.0          | v1.32           | Y                    | Y                                 | Y                        | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
+   | HCE OS 2.0          | v1.33           | Supported            | Supported                         | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.31           | Y                    | Y                                 | Y                        | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
+   |                     | v1.32           | Supported            | Supported                         | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.30           | Y                    | Y                                 | Y                        | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
+   |                     | v1.31           | Supported            | Supported                         | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.29           | Y                    | Y                                 | Y                        | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
+   |                     | v1.30           | Supported            | Supported                         | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.28           | Y                    | Y                                 | Y                        | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
+   |                     | v1.29           | Supported            | Supported                         | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.27           | Y                    | Supported in v1.27.3-r0 or later. | Y                        | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
+   |                     | v1.28           | Supported            | Supported                         | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.25           | Y                    | Supported in v1.25.6-r0 or later. | Y                        | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
+   |                     | v1.27           | Supported            | Supported in v1.27.3-r0 or later. | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   | Ubuntu 22.04        | v1.32           | Y                    | x                                 | Y                        | 5.15.0-126-generic                        |
+   |                     | v1.25           | Supported            | Supported in v1.25.6-r0 or later. | Supported                | 5.10.0-182.0.0.95.r2220_156.hce2.x86_64   |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.31           | Y                    | x                                 | Y                        | 5.15.0-126-generic                        |
+   | Ubuntu 22.04        | v1.33           | Supported            | x                                 | Y                        | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.30           | Y                    | x                                 | Y                        | 5.15.0-126-generic                        |
+   |                     | v1.32           | Supported            | Not supported                     | Supported                | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.29           | Y                    | x                                 | Y                        | 5.15.0-126-generic                        |
+   |                     | v1.31           | Supported            | Not supported                     | Supported                | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.28           | Y                    | x                                 | Y                        | 5.15.0-126-generic                        |
+   |                     | v1.30           | Supported            | Not supported                     | Supported                | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.27           | Y                    | x                                 | Y                        | 5.15.0-126-generic                        |
+   |                     | v1.29           | Supported            | Not supported                     | Supported                | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.25           | Y                    | x                                 | Y                        | 5.15.0-126-generic                        |
+   |                     | v1.28           | Supported            | Not supported                     | Supported                | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   | EulerOS release 2.9 | v1.32           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.27           | Supported            | Not supported                     | Supported                | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.31           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.25           | Supported            | Not supported                     | Supported                | 5.15.0-126-generic                        |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.30           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   | EulerOS release 2.9 | v1.33           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.29           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.32           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.28           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.31           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.27           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.30           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.25           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.29           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.23           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.28           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.21           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.27           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.19           | Y                    | Y                                 | Y                        | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
+   |                     | v1.25           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   | EulerOS release 2.5 | v1.25           | Y                    | Y                                 | Y                        | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
+   |                     | v1.23           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.23           | Y                    | Y                                 | Y                        | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
+   |                     | v1.21           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.21           | Y                    | Y                                 | Y                        | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
+   |                     | v1.19           | Supported            | Supported                         | Supported                | 4.18.0-147.5.1.6.h1447.eulerosv2r9.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
-   |                     | v1.19           | Y                    | Y                                 | Y                        | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
+   | EulerOS release 2.5 | v1.25           | Supported            | Supported                         | Supported                | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
+   +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
+   |                     | v1.23           | Supported            | Supported                         | Supported                | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
+   +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
+   |                     | v1.21           | Supported            | Supported                         | Supported                | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
+   +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+
+   |                     | v1.19           | Supported            | Supported                         | Supported                | 3.10.0-862.14.1.5.h687.eulerosv2r7.x86_64 |
    +---------------------+-----------------+----------------------+-----------------------------------+--------------------------+-------------------------------------------+

@github-actions
Copy link

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants