-
Notifications
You must be signed in to change notification settings - Fork 160
Bug 2101880: manifests/00-namespace: Set empty openshift.io/run-level #472
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
Conversation
We dropped the run-level label from this namespace back in 8120317 (no need to run CCO as privileged pod, 2020-03-03, openshift#159, 4.5 [1]). But because of how the cluster-version operator reconciles manifest labels, dropping a label from the manifest does not remove it from the in-cluster resource when old clusters are updated into the new manifest [2]. This commit uses the approach the cluster-version operator used to drop its run-level [3], by setting the value to an empty string, which the run-level-consuming code treats identically to an unset label. This avoids errors about: ...container has runAsNonRoot and image will run as root... when updating to 4.11 [4]. Because the namespace manifest sorts before the deployment manifest, there is probably no need to get this change back into 4.10 manifests, although that wouldn't hurt. [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1806892 [2]: https://issues.redhat.com/browse/OTA-330 [3]: openshift/cluster-version-operator@539e944#diff-39019af7716ea5d1b86c1eb34e131de533e2701b1bb3014f9a2d71be603ff345R12 [4]: https://bugzilla.redhat.com/show_bug.cgi?id=2101880#c2
|
@wking: This pull request references Bugzilla bug 2101880, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker. 3 validation(s) were run on this bug
Requesting review from QA contact: DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/cc @jianping-shu |
akhil-rane
left a comment
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.
/lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: akhil-rane, wking The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Reproduced w/ the following steps:
|
|
Verified with cluster-bot build.
|
|
/retest |
Codecov Report
@@ Coverage Diff @@
## master #472 +/- ##
=======================================
Coverage 46.08% 46.08%
=======================================
Files 94 94
Lines 9422 9422
=======================================
Hits 4342 4342
Misses 4553 4553
Partials 527 527 |
|
/override ci/prow/e2e-aws |
|
/retest |
|
@akhil-rane: Overrode contexts on behalf of akhil-rane: ci/prow/e2e-aws DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/override ci/prow/e2e-aws |
|
@akhil-rane: Overrode contexts on behalf of akhil-rane: ci/prow/e2e-aws DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/override ci/prow/e2e-upgrade |
|
@akhil-rane: Overrode contexts on behalf of akhil-rane: ci/prow/e2e-upgrade DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
@wking: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
@wking: All pull requests linked via external trackers have merged: Bugzilla bug 2101880 has been moved to the MODIFIED state. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/cherry-pick release-4.11 |
|
@akhil-rane: new pull request created: #473 DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Bug 2101880: manifests/00-namespace: Set empty openshift.io/run-level
We dropped the run-level label from this namespace back in 8120317 (#159, 4.5). But because of how the cluster-version operator reconciles manifest labels, dropping a label from the manifest does not remove it from the in-cluster resource when old clusters are updated into the new manifest. This commit uses the approach the cluster-version operator used to drop its run-level, by setting the value to an empty string, which the run-level-consuming code treats identically to an unset label.
This avoids errors about:
when updating to 4.11. Because the namespace manifest sorts before the deployment manifest, there is probably no need to get this change back into 4.10 manifests, although that wouldn't hurt.