Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Bug 1894025: Add annotations to cluster-csi-drivers namespace #100

Merged
merged 1 commit into from Nov 5, 2020
Merged

Bug 1894025: Add annotations to cluster-csi-drivers namespace #100

merged 1 commit into from Nov 5, 2020

Conversation

bertinatto
Copy link
Member

CC @openshift/storage

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Nov 4, 2020
@openshift-ci-robot
Copy link
Contributor

@bertinatto: This pull request references Bugzilla bug 1894025, 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
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1894025: Add annotations to cluster-csi-drivers namespace

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Nov 4, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 4, 2020
bertinatto
bertinatto commented Nov 4, 2020
View reviewed changes
assets/csidriveroperators/aws-ebs/01_namespace.yaml
@@ -2,3 +2,6 @@ apiVersion: v1
kind: Namespace
metadata:
name: openshift-cluster-csi-drivers
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is to match d558dbc

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory we could simply remove these files from assets because the openshift-cluster-csi-drivers namespace is created by CVO.

@huffmanca
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 5, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, huffmanca

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [bertinatto,huffmanca]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit ae24520 into openshift:master Nov 5, 2020
@openshift-ci-robot
Copy link
Contributor

@bertinatto: All pull requests linked via external trackers have merged:

Bugzilla bug 1894025 has been moved to the MODIFIED state.

In response to this:

Bug 1894025: Add annotations to cluster-csi-drivers namespace

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.

@bertinatto bertinatto mentioned this pull request Nov 23, 2020
Merged
@bertinatto
Copy link
Member Author

/cherry-pick release-4.6

@openshift-cherrypick-robot
Copy link

@bertinatto: #100 failed to apply on top of branch "release-4.6":

Applying: Add annotations to cluster-csi-drivers namespace
Using index info to reconstruct a base tree...
M	manifests/02_csi_driver_operators_namespace.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/02_csi_driver_operators_namespace.yaml
CONFLICT (content): Merge conflict in manifests/02_csi_driver_operators_namespace.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add annotations to cluster-csi-drivers namespace
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

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.

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

@jsafrane jsafrane Awaiting requested review from jsafrane

@tsmetana tsmetana Awaiting requested review from tsmetana

Assignees

@huffmanca huffmanca

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bertinatto @openshift-ci-robot @huffmanca @openshift-cherrypick-robot @openshift-merge-robot