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

DFBUGS-1295: Syncing latest changes from upstream main for ceph-csi-operator #67

Merged
merged 7 commits into from
Jan 7, 2025

Conversation

df-build-team
Copy link

PR containing the latest commits from upstream main branch

dependabot bot and others added 5 commits December 30, 2024 03:40
Bumps [DavidAnson/markdownlint-cli2-action](https://github.com/davidanson/markdownlint-cli2-action) from 18 to 19.
- [Release notes](https://github.com/davidanson/markdownlint-cli2-action/releases)
- [Commits](DavidAnson/markdownlint-cli2-action@v18...v19)

---
updated-dependencies:
- dependency-name: DavidAnson/markdownlint-cli2-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…Anson/markdownlint-cli2-action-19

build(deps): bump DavidAnson/markdownlint-cli2-action from 18 to 19
always cache resources from operator deployed namespace and provider an
option to user for caching resources from other namespaces via
`WATCH_NAMESPACE` env var with a comma separated namespace values.

Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>
Signed-off-by: Leela Venkaiah G <lgangava@ibm.com>
restrict manager resource cache based on namespaces from environment
DF Build Team added 2 commits January 7, 2025 04:55
…-main

Signed-off-by: DF Build Team <df-build-team@redhat.com>
add generated bundle changes

Signed-off-by: DF Build Team <df-build-team@redhat.com>
@Madhu-1
Copy link
Member

Madhu-1 commented Jan 7, 2025

/lgtm
/approve

Copy link

openshift-ci bot commented Jan 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: df-build-team, Madhu-1

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-ci openshift-ci bot added the approved label Jan 7, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 533d640 into main Jan 7, 2025
13 checks passed
@leelavg
Copy link

leelavg commented Jan 7, 2025

/jira backport release-4.18, release-4.17

@leelavg
Copy link

leelavg commented Jan 7, 2025

/jira cherrypick DFBUGS-938

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 7, 2025

@leelavg: [Jira Issue DFBUGS-938](https://issues.redhat.com//browse/DFBUGS-938) has been cloned as [Jira Issue DFBUGS-1295](https://issues.redhat.com//browse/DFBUGS-1295). Will retitle bug to link to clone.
/retitle DFBUGS-1295: Syncing latest changes from upstream main for ceph-csi-operator

In response to this:

/jira cherrypick DFBUGS-938

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-ci openshift-ci bot changed the title Syncing latest changes from upstream main for ceph-csi-operator DFBUGS-1295: Syncing latest changes from upstream main for ceph-csi-operator Jan 7, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 7, 2025

@df-build-team: [Jira Issue DFBUGS-1295](https://issues.redhat.com//browse/DFBUGS-1295): All pull requests linked via external trackers have merged:

[Jira Issue DFBUGS-1295](https://issues.redhat.com//browse/DFBUGS-1295) has been moved to the MODIFIED state.

In response to this:

PR containing the latest commits from upstream main branch

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.

@leelavg
Copy link

leelavg commented Jan 7, 2025

/jira backport release-4.18,release-4.17

@openshift-ci-robot
Copy link

@leelavg: The following backport issues have been created:

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

In response to this:

/jira backport release-4.18,release-4.17

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: #67 failed to apply on top of branch "release-4.17":

Applying: build(deps): bump DavidAnson/markdownlint-cli2-action from 18 to 19
Using index info to reconstruct a base tree...
M	.github/workflows/lint.yaml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/lint.yaml
CONFLICT (content): Merge conflict in .github/workflows/lint.yaml
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 build(deps): bump DavidAnson/markdownlint-cli2-action from 18 to 19

In response to this:

@leelavg: The following backport issues have been created:

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

In response to this:

/jira backport release-4.18,release-4.17

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.

5 participants