Skip to content

Conversation

@joelanford
Copy link
Member

@joelanford joelanford commented Nov 14, 2024

This PR promotes the NewOLM feature to the Default featureset for SelfManaged clusters. OLMv1 is not ready to be included in Hypershift clusters. The regenerated CRDs will only be pulled into the payload after this PR merges and is incorporated into openshift/cluster-olm-operator#74

/hold

Holding until we are ready for this to merge (we have a few other tasks to execute first)

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 14, 2024

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

In response to this:

This PR promotes the NewOLM feature to the Default featureset. The regenerated CRDs will only be pulled into the payload after this PR merges and is incorporated into openshift/cluster-olm-operator#74

/hold

Holding until we are ready for this to merge (we have a few other tasks to execute first)

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 14, 2024
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 14, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 14, 2024

Hello @joelanford! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 14, 2024
@openshift-ci openshift-ci bot requested review from knobunc and sjenning November 14, 2024 23:58
@perdasilva
Copy link

I've cloned this PR (#2101) - to kick CI over until you show up in the morning so we can burn these down.

@joelanford joelanford force-pushed the newolm-default-payload branch from 60ed708 to 6cea01f Compare November 18, 2024 18:28
@joelanford
Copy link
Member Author

@perdasilva I updated this PR so that we stop showing up in Hypershift. @LalatenduMohanty will be submitting a new PR today in cluster-olm-operator that is similar to openshift/cluster-olm-operator#86 (which had to be reverted due to hypershift failures). It will essentially be a re-apply of 86, but with the corrected set of annotations.

@joelanford joelanford force-pushed the newolm-default-payload branch from 6cea01f to fdceee2 Compare November 18, 2024 20:43
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 18, 2024
productScope(ocpSpecific).
enhancementPR(legacyFeatureGateWithoutEnhancement).
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
enableForClusterProfile(SelfManaged, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade, configv1.Default).
Copy link
Member

Choose a reason for hiding this comment

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

@joelanford I do not see SelfManaged in other feature gates. I am not sure why we need it here.

Copy link
Member Author

Choose a reason for hiding this comment

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

This is supposed to make sure that we are only present in SelfManaged clusters. See https://github.com/openshift/api?tab=readme-ov-file#adding-new-techpreview-featuregate-to-all-only-hypershift, which is the closest example for what we're trying to do.

Choose a reason for hiding this comment

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

I guess the definition is here: https://github.com/openshift/api/blob/master/features/util.go#L34-L38

	Hypershift         = ClusterProfileName("include.release.openshift.io/ibm-cloud-managed")
	SelfManaged        = ClusterProfileName("include.release.openshift.io/self-managed-high-availability")
	AllClusterProfiles = []ClusterProfileName{Hypershift, SelfManaged}

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 18, 2024

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

In response to this:

This PR promotes the NewOLM feature to the Default featureset for SelfManaged clusters. OLMv1 is not ready to be included in Hypershift clusters. The regenerated CRDs will only be pulled into the payload after this PR merges and is incorporated into openshift/cluster-olm-operator#74

/hold

Holding until we are ready for this to merge (we have a few other tasks to execute first)

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.

@joelanford joelanford force-pushed the newolm-default-payload branch from fdceee2 to ce70fc5 Compare November 18, 2024 22:01
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=olms,scope=Cluster
// +kubebuilder:subresource:status
// +kubebuilder:metadata:annotations=include.release.openshift.io/ibm-cloud-managed=false
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets try adding the partner annotation and see if that brings the generation back

Suggested change
// +kubebuilder:metadata:annotations=include.release.openshift.io/ibm-cloud-managed=false
// +kubebuilder:metadata:annotations=include.release.openshift.io/ibm-cloud-managed=false
// +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability: "true"

Choose a reason for hiding this comment

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

// +kubebuilder:metadata:annotations=include.release.openshift.io/self-managed-high-availability=true

@perdasilva
Copy link

/retest

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
@joelanford joelanford force-pushed the newolm-default-payload branch from ce70fc5 to 917f3bf Compare November 19, 2024 14:18
@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 19, 2024
@joelanford
Copy link
Member Author

/test verify

@joelanford
Copy link
Member Author

/retest

@joelanford
Copy link
Member Author

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Nov 20, 2024
@jianzhangbjz
Copy link

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.18-multi-nightly-4.18-upgrade-from-stable-4.18-azure-ipi-proxy-tp-arm-f60

@jianzhangbjz
Copy link

@tmshort
Copy link
Contributor

tmshort commented Nov 20, 2024

/test ci/prow/verify

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 20, 2024

@tmshort: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test build
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-hypershift
  • /test e2e-aws-ovn-techpreview
  • /test e2e-aws-serial
  • /test e2e-aws-serial-techpreview
  • /test e2e-upgrade
  • /test images
  • /test integration
  • /test minor-e2e-upgrade-minor
  • /test minor-images
  • /test unit
  • /test verify
  • /test verify-client-go
  • /test verify-crd-schema
  • /test verify-deps

The following commands are available to trigger optional jobs:

  • /test e2e-azure
  • /test e2e-gcp
  • /test okd-scos-e2e-aws-ovn
  • /test okd-scos-images

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-api-master-build
  • pull-ci-openshift-api-master-e2e-aws-ovn
  • pull-ci-openshift-api-master-e2e-aws-ovn-hypershift
  • pull-ci-openshift-api-master-e2e-aws-ovn-techpreview
  • pull-ci-openshift-api-master-e2e-aws-serial
  • pull-ci-openshift-api-master-e2e-aws-serial-techpreview
  • pull-ci-openshift-api-master-e2e-azure
  • pull-ci-openshift-api-master-e2e-gcp
  • pull-ci-openshift-api-master-e2e-upgrade
  • pull-ci-openshift-api-master-images
  • pull-ci-openshift-api-master-integration
  • pull-ci-openshift-api-master-minor-e2e-upgrade-minor
  • pull-ci-openshift-api-master-minor-images
  • pull-ci-openshift-api-master-okd-scos-e2e-aws-ovn
  • pull-ci-openshift-api-master-unit
  • pull-ci-openshift-api-master-verify
  • pull-ci-openshift-api-master-verify-client-go
  • pull-ci-openshift-api-master-verify-crd-schema
  • pull-ci-openshift-api-master-verify-deps

In response to this:

/test ci/prow/verify

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
Copy link
Contributor

openshift-ci bot commented Nov 21, 2024

@perdasilva: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test build
/test e2e-aws-ovn
/test e2e-aws-ovn-hypershift
/test e2e-aws-ovn-techpreview
/test e2e-aws-serial
/test e2e-aws-serial-techpreview
/test e2e-upgrade
/test images
/test integration
/test minor-e2e-upgrade-minor
/test minor-images
/test unit
/test verify
/test verify-client-go
/test verify-crd-schema
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-azure
/test e2e-gcp
/test okd-scos-e2e-aws-ovn
/test okd-scos-images

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-api-master-build
pull-ci-openshift-api-master-e2e-aws-ovn
pull-ci-openshift-api-master-e2e-aws-ovn-hypershift
pull-ci-openshift-api-master-e2e-aws-ovn-techpreview
pull-ci-openshift-api-master-e2e-aws-serial
pull-ci-openshift-api-master-e2e-aws-serial-techpreview
pull-ci-openshift-api-master-e2e-azure
pull-ci-openshift-api-master-e2e-gcp
pull-ci-openshift-api-master-e2e-upgrade
pull-ci-openshift-api-master-images
pull-ci-openshift-api-master-integration
pull-ci-openshift-api-master-minor-e2e-upgrade-minor
pull-ci-openshift-api-master-minor-images
pull-ci-openshift-api-master-okd-scos-e2e-aws-ovn
pull-ci-openshift-api-master-unit
pull-ci-openshift-api-master-verify
pull-ci-openshift-api-master-verify-client-go
pull-ci-openshift-api-master-verify-crd-schema
pull-ci-openshift-api-master-verify-deps

In response to this:

/retest e2e-aws-serial

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.

@jianzhangbjz
Copy link

jianzhangbjz commented Nov 21, 2024

Hi @JoelSpeed, can we override those non-required jobs and let it merge? Thanks! Once openshift/cluster-olm-operator#74 is merged, these failure test cases can pass.

@joelanford
Copy link
Member Author

/test e2e-aws-serial

@LalatenduMohanty
Copy link
Member

LalatenduMohanty commented Nov 21, 2024

@JoelSpeed can we override e2e-aws-serial test failure as it is a non-required test, also QE has approved the PR. Also after merge openshift/cluster-olm-operator#74 it will improve the pass rate of the test. Need to merge this PR first then we can merge openshift/cluster-olm-operator#74

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ec9bf3f and 1 for PR HEAD 917f3bf in total

@JoelSpeed
Copy link
Contributor

/hold we concluded some origin changes need to go in, and then this will likely need a green button merge simultaneously with openshift/cluster-olm-operator#74

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 21, 2024
@joelanford
Copy link
Member Author

Origin PR that needs to merge first: openshift/origin#29313

@LalatenduMohanty
Copy link
Member

openshift/origin#29313 has merged

@joelanford
Copy link
Member Author

openshift/origin#29313 and openshift/cluster-olm-operator#74 have merged. Proceeding now with a merge of this PR.

/hold cancel
/overrride ci/prow/e2e-aws-ovn

@openshift-ci 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
Copy link
Member Author

/skip
/override ci/prow/e2e-aws-serial

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 21, 2024

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

In response to this:

/skip
/override ci/prow/e2e-aws-serial

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.

@joelanford
Copy link
Member Author

/override ci/prow/e2e-aws-ovn

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 21, 2024

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

In response to this:

/override ci/prow/e2e-aws-ovn

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-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD c98acdb and 0 for PR HEAD 917f3bf in total

@joelanford
Copy link
Member Author

/override ci/prow/verify
/override ci/prow/verify-crd-schema

(see #2099 (comment))

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 21, 2024

@joelanford: Overrode contexts on behalf of joelanford: ci/prow/verify, ci/prow/verify-crd-schema

In response to this:

/override ci/prow/verify
/override ci/prow/verify-crd-schema

(see #2099 (comment))

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.

@joelanford
Copy link
Member Author

/override ci/prow/verify
/override ci/prow/verify-crd-schema

(see #2099 (comment))

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 21, 2024

@joelanford: Overrode contexts on behalf of joelanford: ci/prow/verify, ci/prow/verify-crd-schema

In response to this:

/override ci/prow/verify
/override ci/prow/verify-crd-schema

(see #2099 (comment))

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-robot
Copy link

/hold

Revision 917f3bf was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 21, 2024
@joelanford
Copy link
Member Author

/override ci/prow/e2e-aws-ovn-techpreview
/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-serial-techpreview
/override ci/prow/e2e-upgrade
/override ci/prow/minor-e2e-upgrade-minor

These tests are unlikely to pass until a payload containing openshift/cluster-olm-operator#74 is used as a basis. However the OLM team is concerned that openshift/cluster-olm-operator#74, by itself may fail tests. All engineering and QE validation testing was performed on a payload that included that PR and this PR together. As such, we are proceeding with a merge here because we believe the current state (where openshift/cluster-olm-operator#74 is merged and this PR is not is more precarious than if we force merge this one)

We will be watching builds closely and are in communication with TRT so a quick revert can happen if necessary.

@joelanford
Copy link
Member Author

/hold cancel

@openshift-ci 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
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 21, 2024

@joelanford: Overrode contexts on behalf of joelanford: ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-techpreview, ci/prow/e2e-aws-serial-techpreview, ci/prow/e2e-upgrade, ci/prow/minor-e2e-upgrade-minor

In response to this:

/override ci/prow/e2e-aws-ovn-techpreview
/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-serial-techpreview
/override ci/prow/e2e-upgrade
/override ci/prow/minor-e2e-upgrade-minor

These tests are unlikely to pass until a payload containing openshift/cluster-olm-operator#74 is used as a basis. However the OLM team is concerned that openshift/cluster-olm-operator#74, by itself may fail tests. All engineering and QE validation testing was performed on a payload that included that PR and this PR together. As such, we are proceeding with a merge here because we believe the current state (where openshift/cluster-olm-operator#74 is merged and this PR is not is more precarious than if we force merge this one)

We will be watching builds closely and are in communication with TRT so a quick revert can happen if necessary.

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-merge-bot openshift-merge-bot bot merged commit 053bb8a into openshift:master Nov 21, 2024
20 checks passed
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 21, 2024

@joelanford: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp 917f3bf link false /test e2e-gcp
ci/prow/okd-scos-e2e-aws-ovn 917f3bf link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-azure 917f3bf link false /test e2e-azure

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.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.19.0-202411220011.p0.g053bb8a.assembly.stream.el9.
All builds following this will include this PR.

@joelanford joelanford deleted the newolm-default-payload branch September 2, 2025 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. qe-approved Signifies that QE has signed off on this PR size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants