Skip to content

add minKubeVersion and upgrade operator-sdk #104

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

Merged
merged 1 commit into from
Jun 17, 2021

Conversation

Daniel-Fan
Copy link
Contributor

No description provided.

@Daniel-Fan
Copy link
Contributor Author

/cherry-pick release-cd

@ibm-ci-bot
Copy link

@Daniel-Fan: once the present PR merges, I will cherry-pick it on top of release-cd in a new PR and assign it to you.

In response to this:

/cherry-pick release-cd

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.

Copy link
Contributor

@ZhuoxiLi ZhuoxiLi left a comment

Choose a reason for hiding this comment

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

/lgtm

@ibm-ci-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Daniel-Fan, ZhuoxiLi

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 [Daniel-Fan,ZhuoxiLi]

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

@ibm-ci-bot ibm-ci-bot merged commit 2a41271 into IBM:master Jun 17, 2021
@ibm-ci-bot
Copy link

@Daniel-Fan: #104 failed to apply on top of branch "release-cd":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	bundle-restricted/manifests/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
M	bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml
Auto-merging bundle-restricted/manifests/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle-restricted/manifests/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
Patch failed at 0001 add minKubeVersion and upgrade operator-sdk

In response to this:

/cherry-pick release-cd

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.

Daniel-Fan added a commit to Daniel-Fan/ibm-namespace-scope-operator that referenced this pull request Jun 17, 2021
@Daniel-Fan Daniel-Fan deleted the minkubeversion branch June 22, 2021 19:19
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