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

OCPBUGS-32186: cmd: report server version, supported OCP #3987

Conversation

stevekuznetsov
Copy link
Contributor

Previously, both hcp and hypershift CLIs would only report their client versions, which was misleading to some users, as the real determination for what versions of OCP are possible to deploy relies on both the client and the server together.

$ ./bin/hcp version
Client Version: openshift/hypershift: 0a16c7cad4d056f4cda9a393cfc036e1ceb56d60. Latest supported OCP: 4.16.0
Server Version: openshift/hypershift: 6bb55dffe1bbf25c1086fa4398c8c97b083b57bb. Latest supported OCP: 4.16.0
Server Supports OCP Versions: 4.16, 4.15, 4.14, 4.13

/cc @davidvossel

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 6, 2024
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-32186, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Previously, both hcp and hypershift CLIs would only report their client versions, which was misleading to some users, as the real determination for what versions of OCP are possible to deploy relies on both the client and the server together.

$ ./bin/hcp version
Client Version: openshift/hypershift: 0a16c7cad4d056f4cda9a393cfc036e1ceb56d60. Latest supported OCP: 4.16.0
Server Version: openshift/hypershift: 6bb55dffe1bbf25c1086fa4398c8c97b083b57bb. Latest supported OCP: 4.16.0
Server Supports OCP Versions: 4.16, 4.15, 4.14, 4.13

/cc @davidvossel

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 openshift-ci bot requested a review from davidvossel May 6, 2024 18:15
@openshift-ci openshift-ci bot added do-not-merge/needs-area area/cli Indicates the PR includes changes for CLI area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels May 6, 2024
@stevekuznetsov stevekuznetsov force-pushed the skuznets/cli-report-supported-versions branch 2 times, most recently from 749c8fe to 9c0bfcc Compare May 6, 2024 19:05
@stevekuznetsov stevekuznetsov force-pushed the skuznets/cli-report-supported-versions branch from 9c0bfcc to bdbebb5 Compare May 9, 2024 15:10
Copy link

netlify bot commented May 9, 2024

Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit c624e1e
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/665620e7638e770008cd9f6a
😎 Deploy Preview https://deploy-preview-3987--hypershift-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@csrwng
Copy link
Contributor

csrwng commented May 9, 2024

/approve

Copy link
Contributor

openshift-ci bot commented May 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, stevekuznetsov

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 9, 2024
@enxebre
Copy link
Member

enxebre commented May 14, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 14, 2024
@bryan-cox
Copy link
Member

/retest

@stevekuznetsov
Copy link
Contributor Author

/jira-refresh

@stevekuznetsov
Copy link
Contributor Author

/jira refresh
/backport release-4.15 release-4.14

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label May 14, 2024
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-32186, 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.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @LiangquanLi930

In response to this:

/jira refresh
/backport release-4.15 release-4.14

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 removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 14, 2024
@stevekuznetsov
Copy link
Contributor Author

/retest

@openshift-ci openshift-ci bot requested a review from LiangquanLi930 May 14, 2024 17:46
@stevekuznetsov
Copy link
Contributor Author

/cherrypick release-4.15 release-4.14

@openshift-cherrypick-robot

@stevekuznetsov: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.15 release-4.14

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.

@stevekuznetsov
Copy link
Contributor Author

/retest

1 similar comment
@stevekuznetsov
Copy link
Contributor Author

/retest

Previously, both hcp and hypershift CLIs would only report their client
versions, which was misleading to some users, as the real determination
for what versions of OCP are possible to deploy relies on both the
client and the server together.

Signed-off-by: Steve Kuznetsov <[email protected]>
@stevekuznetsov stevekuznetsov force-pushed the skuznets/cli-report-supported-versions branch from bdbebb5 to c624e1e Compare May 28, 2024 18:22
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 28, 2024
@@ -61,7 +65,8 @@ func LookupDefaultOCPVersion(releaseStream string) (OCPVersion, error) {
}

func NewVersionCommand() *cobra.Command {
var commitOnly bool
var commitOnly, clientOnly bool
namespace := "hypershift"
Copy link
Member

Choose a reason for hiding this comment

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

This assumption might not always be true

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's hard-coded into the rest of the repo right now, so not sure how to improve it?

@@ -22,8 +23,9 @@ import (
)

const (
configMapKey = "supported-versions"
supportedVersionsLabel = "hypershift.openshift.io/supported-versions"
ConfigMapVersionsKey = "supported-versions"
Copy link
Member

Choose a reason for hiding this comment

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

This is resulting confusing at least for me, it'd be nice to include in the naming if we are referring to HOVersion or OCPVersions

@enxebre
Copy link
Member

enxebre commented May 29, 2024

Dropped some minors, feel free to follow up on them
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 29, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD af0dd13 and 2 for PR HEAD c624e1e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d5b642b and 1 for PR HEAD c624e1e in total

@stevekuznetsov
Copy link
Contributor Author

/retest

2 similar comments
@bryan-cox
Copy link
Member

/retest

@stevekuznetsov
Copy link
Contributor Author

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 6fea573 and 0 for PR HEAD c624e1e in total

@openshift-ci-robot
Copy link

/hold

Revision c624e1e 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 May 30, 2024
@bryan-cox
Copy link
Member

/retest-required

@stevekuznetsov
Copy link
Contributor Author

/retest

@bryan-cox
Copy link
Member

/unhold

@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 Jun 3, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 94174f5 and 2 for PR HEAD c624e1e in total

Copy link
Contributor

openshift-ci bot commented Jun 3, 2024

@stevekuznetsov: The following test 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-azure c624e1e 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-merge-bot openshift-merge-bot bot merged commit c0c55a0 into openshift:main Jun 3, 2024
13 of 14 checks passed
@openshift-ci-robot
Copy link

@stevekuznetsov: Jira Issue OCPBUGS-32186: All pull requests linked via external trackers have merged:

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

In response to this:

Previously, both hcp and hypershift CLIs would only report their client versions, which was misleading to some users, as the real determination for what versions of OCP are possible to deploy relies on both the client and the server together.

$ ./bin/hcp version
Client Version: openshift/hypershift: 0a16c7cad4d056f4cda9a393cfc036e1ceb56d60. Latest supported OCP: 4.16.0
Server Version: openshift/hypershift: 6bb55dffe1bbf25c1086fa4398c8c97b083b57bb. Latest supported OCP: 4.16.0
Server Supports OCP Versions: 4.16, 4.15, 4.14, 4.13

/cc @davidvossel

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

@stevekuznetsov: new pull request created: #4140

In response to this:

/cherrypick release-4.15 release-4.14

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

@stevekuznetsov: new pull request created: #4141

In response to this:

/cherrypick release-4.16 release-4.15 release-4.14
/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 kubernetes-sigs/prow repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-hypershift-container-v4.17.0-202406031613.p0.gc0c55a0.assembly.stream.el9 for distgit hypershift.
All builds following this will include this PR.

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. area/cli Indicates the PR includes changes for CLI area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release jira/severity-moderate Referenced Jira bug's severity is moderate 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.

7 participants