OPRUN-3401, OPRUN-3588: Update manifest annotations for GA #74

perdasilva · 2024-10-15T11:38:49Z

Preconditions:

openshift/api#2066 merged
catalogd and o-c APIs promoted to v1 and downsync'ed
cluster-olm-operator has been updated to use openshift/api/operator/v1 OLM resource
OPRUN-3576 done
OPRUN-3589 done (outcome may require changes to this PR)

Changes:

removes TechPreview annotation
adds cluster profile annotations to all manifests
adds OLM v1 cluster capability annotation to all manifests

Next PR: openshift/release#57844

openshift-ci · 2024-10-15T11:39:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

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~~ [perdasilva]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2024-10-21T08:34:25Z

@perdasilva: This pull request references OPRUN-3401 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

This pull request references OPRUN-3588 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

Preconditions:

openshift/api#2066 merged

catalogd and o-c APIs promoted to v1 and downsync'ed

cluster-olm-operator has been updated to use openshift/api/operator/v1 OLM resource

OPRUN-3576 done

OPRUN-3589 done (outcome may require changes to this PR)

Changes:

removes TechPreview annotation

adds cluster profile annotations to all manifests

adds OLM v1 cluster capability annotation to all manifests

Next PR: openshift/release#57844

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.

perdasilva · 2024-10-30T08:40:58Z

/hold

perdasilva · 2024-10-30T08:41:29Z

/jira refresh

openshift-ci-robot · 2024-10-30T08:41:32Z

@perdasilva: This pull request references OPRUN-3401 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

This pull request references OPRUN-3588 which is a valid jira issue.

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

perdasilva · 2024-10-30T08:45:41Z

/jira refresh

openshift-ci-robot · 2024-10-30T08:45:45Z

@perdasilva: This pull request references OPRUN-3401 which is a valid jira issue.

This pull request references OPRUN-3588 which is a valid jira issue.

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

perdasilva · 2024-11-05T16:04:00Z

/hold don't merge

manifests/0000_51_olm_00-olm-operator.yml

manifests/0000_51_olm_02_operator_clusterrole.yaml

LalatenduMohanty · 2024-11-12T20:30:34Z

@perdasilva We should not remove tech-preview yet. We should add the annotations (including the capability) in this PR and remove the tech-preview stuff in a separate PR.

manifests/0000_51_olm_00-olm-operator.yml

perdasilva · 2024-11-14T08:55:28Z

@perdasilva We should not remove tech-preview yet. We should add the annotations (including the capability) in this PR and remove the tech-preview stuff in a separate PR.

The other capability only PR has been merged =D

jianzhangbjz · 2024-11-18T07:21:57Z

Hi, I'd like to list the current test status here, the OperatorLifecycleManagerV1 capability has been enabled as default by now, as follows,

jiazha-mac:~ jiazha$ oc get clusterversion
NAME      VERSION                              AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.18.0-0.nightly-2024-11-15-113437   True        False         20m     Cluster version is 4.18.0-0.nightly-2024-11-15-113437
jiazha-mac:~ jiazha$ oc get clusterversion version -o yaml
apiVersion: config.openshift.io/v1
kind: ClusterVersion
...
status:
  availableUpdates: null
  capabilities:
    enabledCapabilities:
    - Build
    - CSISnapshot
    - CloudControllerManager
    - CloudCredential
    - Console
    - DeploymentConfig
    - ImageRegistry
    - Ingress
    - Insights
    - MachineAPI
    - NodeTuning
    - OperatorLifecycleManager
    - OperatorLifecycleManagerV1
    - Storage
    - baremetal
    - marketplace
    - openshift-samples
    knownCapabilities:
    - Build
    - CSISnapshot
    - CloudControllerManager
    - CloudCredential
    - Console
    - DeploymentConfig
    - ImageRegistry
    - Ingress
    - Insights
    - MachineAPI
    - NodeTuning
    - OperatorLifecycleManager
    - OperatorLifecycleManagerV1
    - Storage
    - baremetal
    - marketplace
    - openshift-samples

However, the corresponding OLMv1 resources weren't enabled because this PR wasn't merged. Correct me if I'm wrong, thanks!

jiazha-mac:~ jiazha$ oc get clustercatalog
error: the server doesn't have a resource type "clustercatalog"

And, due to conflicts, I couldn't create cluster to test it.

And, a bug about the installer config: https://issues.redhat.com/browse/OCPBUGS-44642

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

grokspawn · 2024-11-18T18:07:12Z

And, a bug about the installer config: https://issues.redhat.com/browse/OCPBUGS-44642

@jianzhangbjz this is being worked as openshift/installer#9196

jianzhangbjz · 2024-11-19T01:24:05Z

this is being worked as openshift/installer#9196

Ahh, sorry, I missed it.

jianzhangbjz · 2024-11-20T09:43:54Z

Pre-merge test fail, details: https://redhat-internal.slack.com/archives/C06KP34REFJ/p1732095507235489?thread_ts=1732077839.541179&cid=C06KP34REFJ

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

perdasilva · 2024-11-20T12:44:26Z

/hold currently replaces openshift/api dependency with the branch that promotes NewOLM to default - need to revert back to openshift/api before merge

openshift-ci · 2024-11-20T17:24:08Z

@joelanford: This PR was included in a payload test run from openshift/api#2099
trigger 4 job(s) of type blocking for the ci release of OCP 4.18

periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.18-e2e-gcp-ovn-upgrade
periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1f932580-a764-11ef-91df-736755db3e6c-0

openshift-ci · 2024-11-20T18:30:32Z

@joelanford: This PR was included in a payload test run from openshift/api#2099
trigger 14 job(s) of type blocking for the nightly release of OCP 4.18

periodic-ci-openshift-release-master-ci-4.18-e2e-aws-upgrade-ovn-single-node
periodic-ci-openshift-release-master-ci-4.18-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.18-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-rt-upgrade
periodic-ci-openshift-hypershift-release-4.18-periodics-e2e-aws-ovn-conformance
periodic-ci-openshift-release-master-nightly-4.18-e2e-aws-ovn-serial
periodic-ci-openshift-release-master-ci-4.18-e2e-aws-ovn-techpreview
periodic-ci-openshift-release-master-ci-4.18-e2e-aws-ovn-techpreview-serial
periodic-ci-openshift-release-master-ci-4.18-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-nightly-4.18-fips-payload-scan
periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-bm
periodic-ci-openshift-release-master-nightly-4.18-e2e-metal-ipi-ovn-ipv6
periodic-ci-openshift-microshift-release-4.18-periodics-e2e-aws-ovn-ocp-conformance
periodic-ci-openshift-microshift-release-4.18-periodics-e2e-aws-ovn-ocp-conformance-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8415a6a0-a76d-11ef-8e6a-5e18a0a92929-0

jianzhangbjz · 2024-11-21T05:35:00Z

/label qe-approved

openshift-ci-robot · 2024-11-21T05:35:05Z

@perdasilva: This pull request references OPRUN-3401 which is a valid jira issue.

This pull request references OPRUN-3588 which is a valid jira issue.

In response to this:

Preconditions:

openshift/api#2066 merged

catalogd and o-c APIs promoted to v1 and downsync'ed

cluster-olm-operator has been updated to use openshift/api/operator/v1 OLM resource

OPRUN-3576 done

OPRUN-3589 done (outcome may require changes to this PR)

Changes:

removes TechPreview annotation

adds cluster profile annotations to all manifests

adds OLM v1 cluster capability annotation to all manifests

Next PR: openshift/release#57844

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.

grokspawn · 2024-11-21T06:15:37Z

/label acknowledge-critical-fixes-only
/lgtm

joelanford · 2024-11-21T06:39:37Z

/override ci/prow/openshift-e2e-aws-techpreview

@perdasilva please remove the hold after openshift/api#2099 merges.

Once both openshift/api#2099 and this PR merge, we can follow back up (more leisurely) with a rebase of this repo off of my branch and back onto o/api.

openshift-ci · 2024-11-21T06:39:49Z

@joelanford: Overrode contexts on behalf of joelanford: ci/prow/openshift-e2e-aws-techpreview

In response to this:

/override ci/prow/openshift-e2e-aws-techpreview

@perdasilva please remove the hold after openshift/api#2099 merges.

Once both openshift/api#2099 and this PR merge, we can follow back up (more leisurely) with a rebase of this repo off of my branch and back onto o/api.

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.

openshift-ci · 2024-11-21T06:39:52Z

@perdasilva: all tests passed!

Full PR test history. Your PR dashboard.

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.

joelanford · 2024-11-21T18:07:05Z

openshift/origin#29313 has merged. Proceeding now with a dual merge of this PR and openshift/api#2099

/hold cancel

openshift-bot · 2024-11-21T21:30:19Z

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-olm-operator
This PR has been included in build ose-cluster-olm-operator-container-v4.19.0-202411212037.p0.ga0cfc8b.assembly.stream.el9.
All builds following this will include this PR.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 15, 2024

openshift-ci bot requested review from kevinrizza and oceanc80 October 15, 2024 11:39

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 15, 2024

perdasilva force-pushed the perdasilva/olmv1-ga branch from aa78bc6 to 8ef55c4 Compare October 17, 2024 13:29

perdasilva changed the title ~~[WIP] Add cluster-olm-operator to payload by default~~ [WIP] Update manifest annotations for GA Oct 18, 2024

perdasilva changed the title ~~[WIP] Update manifest annotations for GA~~ [HOLD] Update manifest annotations for GA Oct 18, 2024

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 18, 2024

This was referenced Oct 18, 2024

OPRUN-3423: Update OLMv1 jobs for GA openshift/release#57844

Merged

OPRUN-3588: Add OperatorLifecycleManagerV1 cluster version capability openshift/api#2066

Merged

perdasilva changed the title ~~[HOLD] Update manifest annotations for GA~~ [HOLD] OPRUN-3401, OPRUN-3588: Update manifest annotations for GA Oct 21, 2024

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 21, 2024

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 30, 2024

kuiwang02 reviewed Nov 7, 2024

View reviewed changes

manifests/0000_51_olm_00-olm-operator.yml Show resolved Hide resolved

wking reviewed Nov 12, 2024

View reviewed changes

manifests/0000_51_olm_02_operator_clusterrole.yaml Outdated Show resolved Hide resolved

wking reviewed Nov 12, 2024

View reviewed changes

manifests/0000_51_olm_00-olm-operator.yml Outdated Show resolved Hide resolved

joelanford force-pushed the perdasilva/olmv1-ga branch from 333aeef to 047372d Compare November 12, 2024 21:02

perdasilva force-pushed the perdasilva/olmv1-ga branch from 047372d to b45d07c Compare November 14, 2024 08:53

joelanford mentioned this pull request Nov 14, 2024

OPRUN-3401: Promote NewOLM to Default FeatureSet openshift/api#2099

Merged

Per Goncalves da Silva added 2 commits November 18, 2024 11:36

Drop single-node-developer annotations from manifest

20f4653

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

Drop TechPreviewNoUpgrade annotation

b6084ff

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

perdasilva force-pushed the perdasilva/olmv1-ga branch from b45d07c to b6084ff Compare November 18, 2024 10:37

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 18, 2024

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2024

jianzhangbjz mentioned this pull request Nov 20, 2024

add OLMv1 cap openshift/release#58914

Merged

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2024

Replace api dependency with promotion branch for test

275ad31

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

drop 'include.release.openshift.io/ibm-cloud-managed: "true"' annotation

0799bd5

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 21, 2024

openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Nov 21, 2024

openshift-ci bot assigned grokspawn Nov 21, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 21, 2024

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 21, 2024

joelanford changed the title ~~[HOLD] OPRUN-3401, OPRUN-3588: Update manifest annotations for GA~~ OPRUN-3401, OPRUN-3588: Update manifest annotations for GA Nov 21, 2024

openshift-merge-bot bot merged commit a0cfc8b into openshift:main Nov 21, 2024
6 checks passed

OPRUN-3401, OPRUN-3588: Update manifest annotations for GA #74

OPRUN-3401, OPRUN-3588: Update manifest annotations for GA #74

Uh oh!

Conversation

perdasilva commented Oct 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Oct 15, 2024

Uh oh!

openshift-ci-robot commented Oct 21, 2024 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

perdasilva commented Oct 30, 2024

Uh oh!

perdasilva commented Oct 30, 2024

Uh oh!

openshift-ci-robot commented Oct 30, 2024 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

perdasilva commented Oct 30, 2024

Uh oh!

openshift-ci-robot commented Oct 30, 2024 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

perdasilva commented Nov 5, 2024

Uh oh!

Uh oh!

Uh oh!

LalatenduMohanty commented Nov 12, 2024

Uh oh!

Uh oh!

perdasilva commented Nov 14, 2024

Uh oh!

jianzhangbjz commented Nov 18, 2024

Uh oh!

grokspawn commented Nov 18, 2024

Uh oh!

jianzhangbjz commented Nov 19, 2024

Uh oh!

jianzhangbjz commented Nov 20, 2024

Uh oh!

perdasilva commented Nov 20, 2024

Uh oh!

openshift-ci bot commented Nov 20, 2024

Uh oh!

openshift-ci bot commented Nov 20, 2024

Uh oh!

jianzhangbjz commented Nov 21, 2024

Uh oh!

openshift-ci-robot commented Nov 21, 2024 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

grokspawn commented Nov 21, 2024

Uh oh!

joelanford commented Nov 21, 2024

Uh oh!

openshift-ci bot commented Nov 21, 2024

Uh oh!

openshift-ci bot commented Nov 21, 2024

Uh oh!

joelanford commented Nov 21, 2024

Uh oh!

Uh oh!

openshift-bot commented Nov 21, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

perdasilva commented Oct 15, 2024 •

edited

Loading

openshift-ci-robot commented Oct 21, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Oct 30, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Oct 30, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 21, 2024 •

edited by openshift-ci bot

Loading