Skip to content

OCPBUGS-23562: Add file based OLM catalog and remove SQLite index commands#206

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
alebedev87:add-file-based-catalog
Sep 10, 2024
Merged

OCPBUGS-23562: Add file based OLM catalog and remove SQLite index commands#206
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
alebedev87:add-file-based-catalog

Conversation

@alebedev87
Copy link
Copy Markdown
Contributor

@alebedev87 alebedev87 commented Nov 20, 2023

The SQLite based catalog format is deprecated since OCP 4.11. This PR adds the file based catalog which is the latest iteration of the catalog format. Creating file based catalog image doc was loosely followed to create the file based catalog. The commands which use SQLite based catalog are removed.

@openshift-ci openshift-ci Bot requested review from frobware and miheer November 20, 2023 14:14
@alebedev87 alebedev87 force-pushed the add-file-based-catalog branch from 637fdb8 to 248fb52 Compare November 21, 2023 10:06
@alebedev87 alebedev87 changed the title Add file based OLM catalog Add file based OLM catalog and remove SQLite index commands Nov 21, 2023
@alebedev87 alebedev87 changed the title Add file based OLM catalog and remove SQLite index commands OCPBUGS-23562: Add file based OLM catalog and remove SQLite index commands Nov 22, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 22, 2023
@openshift-ci-robot
Copy link
Copy Markdown

@alebedev87: This pull request references Jira Issue OCPBUGS-23562, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

The SQLite based catalog format is deprecated since OCP 4.11. This PR adds the file based catalog which is the latest iteration of the catalog format. Creating file based catalog image doc was loosely followed to create the file based catalog. The commands which use SQLite based catalog are removed.

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 openshift-ci Bot requested a review from lihongan November 22, 2023 12:26
@alebedev87 alebedev87 force-pushed the add-file-based-catalog branch from 248fb52 to b6fbe27 Compare November 22, 2023 12:39
@candita
Copy link
Copy Markdown

candita commented Nov 29, 2023

/assign @rfredette

@openshift-bot
Copy link
Copy Markdown

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Feb 28, 2024
@alebedev87
Copy link
Copy Markdown
Contributor Author

/remove-lifecycle stale

@openshift-ci openshift-ci Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Mar 5, 2024
@openshift-bot
Copy link
Copy Markdown

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 4, 2024
@lihongan
Copy link
Copy Markdown

lihongan commented Jun 4, 2024

/remove-lifecycle stale

@openshift-ci openshift-ci Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 4, 2024
Copy link
Copy Markdown
Contributor

@rfredette rfredette left a comment

Choose a reason for hiding this comment

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

I have a couple questions, but otherwise this looks good to me.

Comment thread Dockerfile.catalog Outdated
Comment on lines +7 to +12
CMD ["serve", "/configs"]

# Copy declarative config root into image at /configs
ADD catalog /configs

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In ALBO's catalog.Dockerfile, it looks like opm uses a cache ("--cache-dir=/tmp/cache"). Is there a reason we'd want the cached version there but not here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good catch. I don't remember exactly why they are different. Probably I generated both but for ALBO I also looked at how other operators did this. Both approaches work but I think I would align this one with ALBO (and other operators in openshift org).

Comment thread Dockerfile.catalog Outdated
@@ -0,0 +1,14 @@
# The base image is expected to contain
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
FROM registry.redhat.io/openshift4/ose-operator-registry:v4.14
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Since this has been waiting for review for a while (my apologies), it looks like there are newer versions of the ose-operator-registry image. Should we update this to v4.16?

Copy link
Copy Markdown
Contributor Author

@alebedev87 alebedev87 Sep 10, 2024

Choose a reason for hiding this comment

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

registry.redhat.io/openshift4/ose-operator-registry image seems to be discontinued, v4.15 and v4.16 tags are not there. The 4.16 OCP documentation suggests to use registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16. It's fine with me because we would like to migrate to RHEL9 migration in the upcoming release anyway (#227).

@alebedev87 alebedev87 force-pushed the add-file-based-catalog branch from b6fbe27 to 95ade09 Compare September 10, 2024 20:53
@rfredette
Copy link
Copy Markdown
Contributor

/approve
/lgtm

thanks!

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rfredette

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 10, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 10, 2024

@alebedev87: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit 178cf49 into openshift:main Sep 10, 2024
@openshift-ci-robot
Copy link
Copy Markdown

@alebedev87: Jira Issue OCPBUGS-23562: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-23562 has been moved to the MODIFIED state.

Details

In response to this:

The SQLite based catalog format is deprecated since OCP 4.11. This PR adds the file based catalog which is the latest iteration of the catalog format. Creating file based catalog image doc was loosely followed to create the file based catalog. The commands which use SQLite based catalog are removed.

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.

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. jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants