-
Notifications
You must be signed in to change notification settings - Fork 231
Rebase 5.1 fix #7218
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
Open
eslutsky
wants to merge
16
commits into
openshift:main
Choose a base branch
from
eslutsky:rebase-5.1-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Rebase 5.1 fix #7218
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
cb52a8a
update last_rebase.sh
microshift-rebase-script[bot] 0de451e
update changelog
microshift-rebase-script[bot] 81dfe2b
update microshift/go.mod
microshift-rebase-script[bot] f526463
update microshift/deps
microshift-rebase-script[bot] 7ec3a59
update microshift/vendor
microshift-rebase-script[bot] 1c0f0f1
update etcd/go.mod
microshift-rebase-script[bot] 3605ec6
update etcd/vendor
microshift-rebase-script[bot] f844caa
update component images
microshift-rebase-script[bot] 4047a59
update manifests
microshift-rebase-script[bot] 2495a75
update buildfiles
microshift-rebase-script[bot] d1e36c4
update cbom
microshift-rebase-script[bot] 1db8a54
Update AI Model Serving for MicroShift
microshift-rebase-script[bot] 8524cd7
Update SR-IOV for MicroShift
microshift-rebase-script[bot] d9ad767
NO-ISSUE: update common_versions.sh for 5.1 rebase
eslutsky d183189
NO-ISSUE: fix common_versions.sh to match CI environment
eslutsky 797e370
NO-ISSUE: use 5.0-el9-beta for dependencies until 5.1 beta is populated
eslutsky 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=36 | ||
| KUBE_GIT_VERSION=v1.36.2 | ||
| KUBE_GIT_COMMIT=98b35193b2ac7a23a673325f5e9b830ecd5ba406 | ||
| KUBE_GIT_VERSION=v1.36.3 | ||
| KUBE_GIT_COMMIT=7b29fb077260554429dcef8234272e9fd25fcfbd | ||
| 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-07-27-004356 | ||
| OCP_VERSION := 5.1.0-0.nightly-arm64-2026-08-20-025249 |
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-07-23-224236 | ||
| OCP_VERSION := 5.1.0-0.nightly-2026-08-18-233908 |
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-07-27-004356" | ||
| "base": "5.1.0-0.nightly-arm64-2026-08-20-025249" | ||
| }, | ||
| "images": { | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a0c089dbbd138b47d7467ce50d0ea3eff60bff9674a34d429078118eeabb78a3", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1557d1200e7c7c8672f9cd9fa145874d43967f61f798f27894f643d5b857b99a" | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6936d3ebc0a49d4b738d1e293260453ea1fe399e9f20e6dd0a29146b735fdcaa", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:778ced6e2bc8daa303e2267a8ddbac4987a7c4f9b1b127a215f364da7523ea7c" | ||
| } | ||
| } |
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-07-23-224236" | ||
| "base": "5.1.0-0.nightly-2026-08-18-233908" | ||
| }, | ||
| "images": { | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:29f31422d6d637e350f99a58001ef8929cb151497ccc4d4f128d3b408812f635", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c63df61df4155fb06d9da879bb7d0e96b5e34161e1ad78e43e87d0690fcae29a" | ||
| "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8bc05b935cbe9b205a725ae907fc06f50060c0707684dd09b911afa199b58bdf", | ||
| "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a66440a99b400344814a10a81ffb704dbc5cae63de9c20938edacb88575ab796" | ||
| } | ||
| } |
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
2 changes: 1 addition & 1 deletion
2
assets/optional/ai-model-serving/release-ai-model-serving-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
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-07-27-004356" | ||
| "base": "5.1.0-0.nightly-arm64-2026-08-20-025249" | ||
| }, | ||
| "images": { | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c8eebdd593891b886d0fb2fc554b2cbcf39c77c57c8582b72c9647cf9e0f8684", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:823e379c09c3e2c566efe5c95f91134eb4170643fe2ba5633bcd382738cc841c", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fc51b97845de29e7a245f185d31ff8adb2c7b7a5350686876a700104499ae2f5" | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2964377e8cd83d9db24a7c8e64a707c3041cb327649f9e2fd22ddc55658ed629", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:81927720736adb05b74ef978a4e309bdd9d7f8177468cbd096a62767a8d814b8", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:df64843344fa7bb71f4ab5a0abdb48c4c2c2b6d8bd5732028903d5eae3251527" | ||
| } | ||
| } |
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-07-23-224236" | ||
| "base": "5.1.0-0.nightly-2026-08-18-233908" | ||
| }, | ||
| "images": { | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:18957bcdaaa13c8c028b3742805b66d30d82fab2273dbeb71938844c44c5d5c5", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:714be6db62abadfce860b3ace30d35e63e087d9bf07ac3e667578d91e8659fcd", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:849ba7d8ef4add8ef5841c14276f97cf9920b33bebf26ee021d72f08064e7abb" | ||
| "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4a528ac0df56212d2aba8cd5f6af80576a9f38786b90648e37f29bef077de765", | ||
| "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:84ab87490655d3c0b5ea6db72fdd1e7ab008842898f4420d28ab7abab6d662b2", | ||
| "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:01df5215d93cda24669fe9f3711223f34f674071321b3d0e7975feef702d0099" | ||
| } | ||
| } |
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.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
Repository: openshift/microshift
Length of output: 2315
🏁 Script executed:
Repository: openshift/microshift
Length of output: 44472
🌐 Web query:
openshift service-ca-operator service-ca-controller-config ConfigMap /var/run/configmaps/config💡 Result:
The service-ca-controller-config ConfigMap and the associated /var/run/configmaps/config directory are used by the OpenShift Service CA Operator to manage and provide operator-level configuration, specifically for centralized TLS settings [1][2]. Key details include: 1. Purpose: The ConfigMap, often named service-ca-controller-config or service-ca-operator-config, stores a GenericOperatorConfig YAML document that defines TLS settings, such as minTLSVersion and cipherSuites [1][2]. 2. Mounting: The operator deployment mounts this ConfigMap as a volume at /var/run/configmaps/config [1]. 3. Controller Usage: The Service CA Operator container arguments include flags that point to this mounted configuration file, for example: --config=/var/run/configmaps/config/controller-config.yaml [1]. Additionally, the flag --terminate-on-files is often used to ensure the process reacts to configuration changes [1][2]. 4. Automation: This configuration is typically managed by the Cluster Version Operator (CVO), which injects the centralized TLS configuration into the operator's config using specific annotations (e.g., config.openshift.io/inject-tls: "true") [2]. This mechanism allows the operator to dynamically adjust its TLS serving info based on cluster-wide security policies [1][2]. It is distinct from the ConfigMap CA bundle injection process, which the Service CA Operator performs for user-defined ConfigMaps annotated with service.beta.openshift.io/inject-cabundle=true [3][4].
Citations:
🌐 Web query:
github openshift service-ca-operator "service-ca-controller-config"💡 Result:
In the context of the OpenShift service-ca-operator, the service-ca-controller-config ConfigMap is an internal resource used to hold the centralized TLS security configuration for the operator's controllers [1]. Key functions and characteristics of this ConfigMap include: 1. Purpose: It stores configuration data, specifically rendering observed TLS settings (such as cipher suites and minimum TLS versions) into a GenericOperatorConfig YAML document [1]. 2. Mechanism: An observer controller watches the service-ca TLS security profile and updates this ConfigMap [1]. The rendered configuration is then mounted into the operator's controller deployment to ensure that the service-ca controllers operate with the appropriate security settings [1]. 3. Integration: This process is part of a broader effort to inject centralized TLS configurations into OpenShift operators [1][2]. The ConfigMap is typically found in the openshift-service-ca namespace [1]. The service-ca-operator itself is a ClusterOperator responsible for managing serving certificates for Kubernetes services and injecting CA bundles into various resources (ConfigMaps, APIServices, etc.) via specific annotations [3][4]. The management of these certificates and the CA is handled by internal controllers that, through updates like the one involving service-ca-controller-config, are increasingly able to respect cluster-wide or centralized TLS security policies [1][5]. The presence and structure of this ConfigMap are part of the operator's internal implementation details and are subject to changes driven by upstream repository developments [1][2].
Citations:
🏁 Script executed:
Repository: openshift/microshift
Length of output: 31238
Provision
service-ca-controller-configbefore applying the Deployment.startServiceCAControllercreates onlysigning-cabundle, while the Deployment mountsservice-ca-controller-configinopenshift-service-ca. Without an external producer, the pod cannot start.🤖 Prompt for AI Agents