-
Notifications
You must be signed in to change notification settings - Fork 230
USHIFT-7176: Rebase 5.0 + updated OVN-K init flags #6829
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a341299
Update Go version
3996dda
update last_rebase.sh
024d204
update changelog
116c31f
update microshift/deps
1084906
update microshift/vendor
8994a03
update component images
46c1461
update manifests
38123b4
update buildfiles
5954be3
Update SR-IOV for MicroShift
69f2c5a
Update OVNK flags
pmtk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| KUBE_GIT_MAJOR=1 | ||
| KUBE_GIT_MINOR=35 | ||
| KUBE_GIT_VERSION=v1.35.3 | ||
| KUBE_GIT_COMMIT=99b75aa92a7f60c4446ee29f54d511f140a8aed0 | ||
| KUBE_GIT_COMMIT=872bd3722d0954b31459f715fbd4fb7612aaf338 | ||
| KUBE_GIT_TREE_STATE=clean |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-04-190103 | ||
| OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-08-012537 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| OCP_VERSION := 5.0.0-0.nightly-2026-06-04-190102 | ||
| OCP_VERSION := 5.0.0-0.nightly-2026-06-07-132537 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "release": { | ||
| "base": "5.0.0-0.nightly-arm64-2026-06-04-190103" | ||
| "base": "5.0.0-0.nightly-arm64-2026-06-08-012537" | ||
| }, | ||
| "images": { | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d95acb85de525f3ed6c179c7c780245d7f50821d881f2c5c84c9f08c947d47b3", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5fed52311e3e769dbb5dc03067ce33c7de0c1308ee033310cc53f7203f7fbe5f" | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c4c1ba07ed890fb4f59cf6e67b39b77f6db5976adb20a9ba037ea2446b3e3d93", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:137bf91943370a9be844a2727b26630f2e962501d08742816426d94cb2ff7246" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "release": { | ||
| "base": "5.0.0-0.nightly-2026-06-04-190102" | ||
| "base": "5.0.0-0.nightly-2026-06-07-132537" | ||
| }, | ||
| "images": { | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d6d962ee038eac98ae9a7cb182052a79804740db2c03bfeedb0dd7196a894a62", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:51b0ac230b385565a5285a95b29ff48a65b7110445f7631b9888212329e7f165" | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:53ff24eb2aa039458a2b6063e7ad6d54a192047f2e683965938fdbc3af964081", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c0c398bbac716ad20b404521beb4e7b19065ca07b49d81842c6f0b7e4bfe8f9a" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "release": { | ||
| "base": "5.0.0-0.nightly-arm64-2026-06-04-190103" | ||
| "base": "5.0.0-0.nightly-arm64-2026-06-08-012537" | ||
| }, | ||
| "images": { | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d3328a007e3059145dc4261121a0dcb6c9c2f7f82aba8bed2dc7fe4442b44317", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1fb113ed086cc02b16fcb089d0456ffd3faa917ad28ed669cad0b40b7bfe11b8", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:793a8dbe8247852c605ad6bebb039641eeef1a84842d7661a7ec3c8c2c8617fb" | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0ec48c1246f7ceff0ce419c0654220ed3b81bd43338a19d10e8e772edca265de", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:80c2c256795ec60d072e1649ff6174a852c7da8e2df4acbe078822db99cff034", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a51e40c312acb95b55559b8228df6f5f65a04e688a2aa6f09ff60d1d9df6397c" | ||
| } | ||
| } |
8 changes: 4 additions & 4 deletions
8
assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "release": { | ||
| "base": "5.0.0-0.nightly-2026-06-04-190102" | ||
| "base": "5.0.0-0.nightly-2026-06-07-132537" | ||
| }, | ||
| "images": { | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5983a2a3a4a7505ef21024cb248c8b8011789eb51de8fc4fd0528df4b6652a9e", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:83031211e6f9b1d120da82554fba373db194236cf7395058efaeb74bf7015e84", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2f55f068d30a61367962c5af6c43d399a5ecba5b1ba24749c2268131ba4ed98" | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:341f8ea2724f3487c90d649b64749f6fa2d5f97ca8f00dce227725e8bca03ef9", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9b7343b0927caee13e51334c6d9e8d2d85e0f4c671f6a3d20de2b2076726f1aa", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:694eff563bee1f5c0366c51b9adb17f3ff563199075a162c1587639b04b6f918" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update startup log to match actual OVN flags.
The log message still prints
--init-masterwhile the command now uses--init-cluster-managerand--init-ovnkube-controller. This can mislead debugging.Suggested diff
📝 Committable suggestion
🤖 Prompt for AI Agents