Skip to content

Conversation

periklis
Copy link
Contributor

@periklis periklis commented Sep 1, 2021

Description

This PR pins the operand images to operand-specific versions, i.e.:

  • elasticsearch6 -> 6.8.1
  • elasticsearch-proxy -> 1.0
  • kibana6 -> 6.8.1
  • curator5 -> 5.8.1

To address: https://issues.redhat.com/browse/LOG-1697

/cc @igor-karpukhin

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2021
Copy link
Contributor

@igor-karpukhin igor-karpukhin left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 1, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: igor-karpukhin, periklis

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 [igor-karpukhin,periklis]

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 lgtm Indicates that a PR is ready to be merged. label Sep 1, 2021
@openshift-merge-robot openshift-merge-robot merged commit 5789348 into openshift:master Sep 1, 2021
@periklis
Copy link
Contributor Author

periklis commented Sep 1, 2021

/cherry-pick release-5.2

@openshift-cherrypick-robot

@periklis: #786 failed to apply on top of branch "release-5.2":

Applying: Use pinned operand image versions from quay.io
Using index info to reconstruct a base tree...
M	bundle/manifests/elasticsearch-operator.clusterserviceversion.yaml
M	config/manager/manager.yaml
M	olm_deploy/scripts/catalog-deploy.sh
A	olm_deploy/scripts/env.sh
M	olm_deploy/scripts/registry-init.sh
Falling back to patching base and 3-way merge...
Auto-merging olm_deploy/scripts/registry-init.sh
CONFLICT (modify/delete): olm_deploy/scripts/env.sh deleted in HEAD and modified in Use pinned operand image versions from quay.io. Version Use pinned operand image versions from quay.io of olm_deploy/scripts/env.sh left in tree.
Auto-merging olm_deploy/scripts/catalog-deploy.sh
Auto-merging config/manager/manager.yaml
Auto-merging bundle/manifests/elasticsearch-operator.clusterserviceversion.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 Use pinned operand image versions from quay.io
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.2

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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants