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

Bug 1933978: Update OD security dependency to resolve kibana index migration issue #2106

Merged
merged 1 commit into from
Apr 22, 2021

Conversation

jcantrill
Copy link
Contributor

Description

This PR

  • Updates the version of opendistro-security to pull-in a fix that addresses issues related to kibana index migration

/cc @ewolinetz @periklis @vimalk78

/cherrypick release-5.0
/cherrypick release-5.1

Links

@openshift-ci-robot
Copy link

@jcantrill: This pull request references Bugzilla bug 1933978, which is valid.

1 validation(s) were run on this bug
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (anli@redhat.com), skipping review request.

In response to this:

Bug 1933978: Update OD security dependency to resolve kibana index migration issue

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 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. labels Apr 16, 2021
@jcantrill jcantrill added release/4.6 and removed 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. labels Apr 16, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2021
Copy link
Contributor

@periklis periklis left a comment

Choose a reason for hiding this comment

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

LGTM. Can you point to the build on PNC to verify that the build numbers 00007 and 00006 match?

@jcantrill
Copy link
Contributor Author

LGTM. Can you point to the build on PNC to verify that the build numbers 00007 and 00006 match?

ES: http://orch.psi.redhat.com/pnc-web/#/projects/698/build-configs/5267/builds/91431
security: http://orch.psi.redhat.com/pnc-web/#/projects/964/build-configs/5356/builds/91444

@vimalk78
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, vimalk78

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

@jcantrill
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added 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. labels Apr 21, 2021
@openshift-ci-robot
Copy link

@jcantrill: This pull request references Bugzilla bug 1933978, which is valid.

1 validation(s) were run on this bug
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (anli@redhat.com), skipping review request.

In response to this:

/bugzilla refresh

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.

@ashcrow ashcrow added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 22, 2021
@openshift-merge-robot openshift-merge-robot merged commit f94138e into openshift:release-4.6 Apr 22, 2021
@jcantrill jcantrill deleted the 1933978 branch April 22, 2021 16:18
@jcantrill
Copy link
Contributor Author

/cherrypick release-5.0
/cherrypick release-5.1
/cherrypick master

@openshift-cherrypick-robot

@jcantrill: #2106 failed to apply on top of branch "release-5.0":

Applying: Bug 1933978: Update OD security dependency to resolve kibana index migration issue
Using index info to reconstruct a base tree...
M	elasticsearch/Dockerfile.rhel8
M	elasticsearch/fetch-artifacts-koji.yaml
Falling back to patching base and 3-way merge...
Auto-merging elasticsearch/fetch-artifacts-koji.yaml
CONFLICT (content): Merge conflict in elasticsearch/fetch-artifacts-koji.yaml
Auto-merging elasticsearch/Dockerfile.rhel8
CONFLICT (content): Merge conflict in elasticsearch/Dockerfile.rhel8
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1933978: Update OD security dependency to resolve kibana index migration issue
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 release-5.0
/cherrypick release-5.1
/cherrypick master

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-cherrypick-robot

@vimalk78: #2106 failed to apply on top of branch "release-5.0":

Applying: Bug 1933978: Update OD security dependency to resolve kibana index migration issue
Using index info to reconstruct a base tree...
M	elasticsearch/Dockerfile.rhel8
M	elasticsearch/fetch-artifacts-koji.yaml
Falling back to patching base and 3-way merge...
Auto-merging elasticsearch/fetch-artifacts-koji.yaml
CONFLICT (content): Merge conflict in elasticsearch/fetch-artifacts-koji.yaml
Auto-merging elasticsearch/Dockerfile.rhel8
CONFLICT (content): Merge conflict in elasticsearch/Dockerfile.rhel8
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1933978: Update OD security dependency to resolve kibana index migration issue
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-5.0
/cherry-pick release-5.1
/cherry-pick master

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
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. release/4.6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants