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

Update the Notebook-controller manifests images with the commit d53909e #280

Merged

Conversation

harshad16
Copy link
Member

Update the Notebook-controller manifests images with the commit d53909e

Description

Set the latest image in the deployment manifests.

How Has This Been Tested?

NA

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

Signed-off-by: Harshad Reddy Nalla <hnalla@redhat.com>
@harshad16 harshad16 merged commit 701498f into opendatahub-io:v1.7-branch Mar 15, 2024
0 of 6 checks passed
@openshift-ci openshift-ci bot requested review from LaVLaS and VaishnaviHire March 15, 2024 04:18
Copy link

openshift-ci bot commented Mar 15, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from harshad16. For more information see the Kubernetes Code Review Process.

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@harshad16
Copy link
Member Author

/cherrypick stable

@openshift-cherrypick-robot

@harshad16: #280 failed to apply on top of branch "stable":

Applying: Update the Notebook-controller manifests images with the commit d53909e
Using index info to reconstruct a base tree...
M	components/notebook-controller/config/overlays/openshift/kustomization.yaml
M	components/odh-notebook-controller/config/base/kustomization.yaml
Falling back to patching base and 3-way merge...
Auto-merging components/odh-notebook-controller/config/base/kustomization.yaml
CONFLICT (content): Merge conflict in components/odh-notebook-controller/config/base/kustomization.yaml
Auto-merging components/notebook-controller/config/overlays/openshift/kustomization.yaml
CONFLICT (content): Merge conflict in components/notebook-controller/config/overlays/openshift/kustomization.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 Update the Notebook-controller manifests images with the commit d53909e
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:

/cherrypick stable

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants