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.

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

api: make inMaintenanceMode optional #281

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

rewantsoni
Copy link
Member

olm stops operator updates when a new field is introduced with a required qualifer, hence we need to make it optional

olm stops operator updates when a new field is introduced with
a required qualifer, hence we need to make it optional

Signed-off-by: Rewant Soni <[email protected]>
@nb-ohad
Copy link
Contributor

nb-ohad commented Nov 26, 2024

/lgtm

Copy link

openshift-ci bot commented Nov 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nb-ohad, rewantsoni

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:

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

@openshift-merge-bot openshift-merge-bot bot merged commit 5ef26d8 into red-hat-storage:main Nov 26, 2024
10 checks passed
@rewantsoni
Copy link
Member Author

/jira backport release-4.18

@openshift-ci-robot
Copy link

@rewantsoni: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.18

In response to this:

/jira backport release-4.18

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot

@openshift-ci-robot: #281 failed to apply on top of branch "release-4.18":

Applying: api: make inMaintenanceMode optional
Using index info to reconstruct a base tree...
M	api/v1alpha1/storageclient_types.go
M	bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
M	bundle/manifests/ocs.openshift.io_storageclients.yaml
M	config/crd/bases/ocs.openshift.io_storageclients.yaml
Falling back to patching base and 3-way merge...
Auto-merging config/crd/bases/ocs.openshift.io_storageclients.yaml
Auto-merging bundle/manifests/ocs.openshift.io_storageclients.yaml
Auto-merging bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
Auto-merging api/v1alpha1/storageclient_types.go
CONFLICT (content): Merge conflict in api/v1alpha1/storageclient_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 api: make inMaintenanceMode optional

In response to this:

@rewantsoni: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.18

In response to this:

/jira backport release-4.18

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 openshift-eng/jira-lifecycle-plugin repository.

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-sigs/prow repository.

@rewantsoni
Copy link
Member Author

/jira backport release-4.18

@openshift-ci-robot
Copy link

@rewantsoni: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.18

In response to this:

/jira backport release-4.18

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot

@openshift-ci-robot: new pull request created: #283

In response to this:

@rewantsoni: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.18

In response to this:

/jira backport release-4.18

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 openshift-eng/jira-lifecycle-plugin repository.

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants