Bug 1998208: Rebase to upstream 0.52.4 #814
Closed
Conversation
This file contains 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
Bump to latest upstream
Bump to latest upstream
The internal Networking team needs to be able to approve and review. Signed-off-by: Brad P. Crochet <[email protected]>
Signed-off-by: Brad P. Crochet <[email protected]>
[CARRY] Add midstream reviewers and approvers
[CARRY] Make operator bundle for OLM
``` Image build failed. Error in plugin pin_operator_digest: while constructing a mapping\n in "/tmp/tmpii4h0l34/openshift-kubernetes-nmstate-operator-bundle/manifests/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml", line 5, column 5\nfound duplicate key "certified" with value "false" (original value: "false")\n in "/tmp/tmpii4h0l34/openshift-kubernetes-nmstate-operator-bundle/manifests/kubernetes-nmstate-operator.v4.7.0.clusterserviceversion.yaml", line 26, column 5\n\nTo suppress this check see:\n http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys\n\nDuplicate keys will become and error in future releases, and are errors\nby default when using the new API.\n. OSBS build id: openshift-kubernetes-nmstate-op-rhaos-47-rhel-8-2faf9-1 ```
Remove duplicated 'certified' key in CSV
Inadverdently used 'RELATED_IMAGES_' instead of 'RELATED_IMAGE_'
[CARRY] Correct the env var used for the handler image
Signed-off-by: Brad P. Crochet <[email protected]>
[CARRY] Add securitycontextconstraints to CSV
This is causing a conflict with ART tooling.
[CARRY] Remove RELATED_IMAGE_ from the handler image env var
This adds the privileged SCC for the nmstate-handler serviceaccount. The nmstate-operator serviceaccount was not enough. Multiple sa's can be specificed in the CSV. Signed-off-by: Brad P. Crochet <[email protected]>
[CARRY] Add cluster rules for nmstate-handler sa
Originally I placed the nmstate-handler SA under the cluster permission. It needed to be in the namespaced section. Signed-off-by: Brad P. Crochet <[email protected]>
[CARRY] Move the nmstate-handler sa to the correct section
…lder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/d29c8eea8eaa4e66c0af4a855f5a081d1312aeff/images/openshift-kubernetes-nmstate-operator.yml
…der & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/d29c8eea8eaa4e66c0af4a855f5a081d1312aeff/images/openshift-kubernetes-nmstate-handler.yml
The example as given doesn't really work. It's better to have a working sample. Signed-off-by: Brad P. Crochet <[email protected]>
Change example name to nmstate, and add nodeSelector
…nshift-4.7-openshift-kubernetes-nmstate-operator Updating openshift-kubernetes-nmstate-operator builder & base images to be consistent with ART
…nshift-4.7-openshift-kubernetes-nmstate-handler Updating openshift-kubernetes-nmstate-handler builder & base images to be consistent with ART
…lder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b0ab44b419faae6b18e639e780a1fa50a1df8521/images/openshift-kubernetes-nmstate-operator.yml
…der & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b0ab44b419faae6b18e639e780a1fa50a1df8521/images/openshift-kubernetes-nmstate-handler.yml
The example in the CSV manifest is incorrect. The nodeSelected needs to be represented as an object, not as a string. Signed-off-by: Brad P. Crochet <[email protected]>
Bug 1918958: Fix the example NMState instance in the manifest
…nshift-4.7-openshift-kubernetes-nmstate-operator Updating openshift-kubernetes-nmstate-operator builder & base images to be consistent with ART
…ifests release-4.9-olm-manifests
Set default bundle channel to 4.9
…nshift-4.9-openshift-kubernetes-nmstate-handler Updating openshift-kubernetes-nmstate-handler images to be consistent with ART
They're now focused on other things so we don't want them auto-assigned to PRs in this repo.
UPSTREAM: <carry>: Add manifests to .PHONY in Makefile
Remove Brad and Toni from reviewers
name replacement must exactly match string in CSV
The internal Networking team needs to be able to approve and review. Signed-off-by: Brad P. Crochet <[email protected]>
Signed-off-by: Brad P. Crochet <[email protected]>
Without this, make sees the manifests directory we added and thinks the target is always up to date.
|
@cybertron: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it. 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. |
kubevirt-bot
added
dco-signoff: no
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Hi @cybertron. Thanks for your PR. I'm waiting for a nmstate member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
kubevirt-bot
added
needs-ok-to-test
|
Thanks for your pull request. Before we can look at it, you'll need to add a 'DCO signoff' to your commits. 📝 Please follow instructions in the contributing guide to update your commits with the DCO Full details of the Developer Certificate of Origin can be found at developercertificate.org. The list of commits missing DCO signoff:
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. I understand the commands that are listed here. |
|
The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the nmstate org. You can then trigger verification by writing
|
|
Argh, this was supposed to go to the openshift repo. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
kubernetes-nmstate 0.52.4 rebase process
Inspired by the commit description for openshift/coredns#52
Identify carry commits:
git log --oneline --no-merges v0.52.4..openshift/masterNote that the
UPSTREAM: <carry>: openshift:prefix was added to any new commits to carry since the previous rebase. This will make new carry commits easy to identify alongside prior carry commits.After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch.
The following commands cover these steps:
Process
My 0.52.4 merge commit from the above process is (af57ae1).
With the merge-0.52.4 branch in place, I cherry picked the carry commits. Merge conflicts were resolved on an individual commit basis when necessary. Some carry commits may have been squashed to reduce the number of cherry-picks in future rebases. If there are any questions please let me know.
Carried Commits (applied bottom to top / oldest first):