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.

Sign up for GitHub

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

Jump to bottom

Onboard clients only if they are on same version as provider - 2 #2308

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Onboard clients only if they are on same version as provider - 2 #2308

merged 1 commit into from
Dec 21, 2023

Conversation

leelavg
Copy link
Contributor

@leelavg leelavg commented Dec 7, 2023 •
edited
Loading

  • Operator major and minor version of client and provider should match for onboarding process to begin
  • After this commit older clients will fail to get onboarded
    [RHSTOR-5072]

@leelavg leelavg force-pushed the 5072-onboard branch 2 times, most recently from b03f030 to d2dc5c4 Compare December 7, 2023 02:59
@leelavg
Copy link
Contributor Author

leelavg commented Dec 7, 2023

@leelavg
Copy link
Contributor Author

leelavg commented Dec 7, 2023

/hold

will unhold after 2 votes

@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 Dec 7, 2023
@leelavg leelavg changed the title Onboard clients only if they are on same version as provider - 2 [RHSTOR-5072] Onboard clients only if they are on same version as provider - 2 Dec 7, 2023
@leelavg leelavg mentioned this pull request Dec 11, 2023
Merged
@leelavg leelavg requested a review from rewantsoni December 11, 2023 11:26
@leelavg leelavg mentioned this pull request Dec 12, 2023
Merged
leelavg added a commit to leelavg/ocs-operator that referenced this pull request Dec 12, 2023
@leelavg
remove StorageClientIncompatibleOperatorVersion alert at Critical level
39e6f16 
- This alert is initially raised if client operator is outside of
support matrix b/n ODF Provider and ODF Client
- With red-hat-storage#2308 and red-hat-storage#2311 we are enforcing the onboard and upgrade
- So, this alert can be removed now

Signed-off-by: Leela Venkaiah G <[email protected]>
@leelavg leelavg mentioned this pull request Dec 12, 2023
Closed
@leelavg leelavg mentioned this pull request Dec 12, 2023
Merged
umangachapagain
umangachapagain requested changes Dec 12, 2023
View reviewed changes
Copy link
Contributor

@umangachapagain umangachapagain left a comment

Choose a reason for hiding this comment

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

What is the intent of this PR?
It reverts the changes and adds the same changes back.

@leelavg
Copy link
Contributor Author

leelavg commented Dec 12, 2023

What is the intent of this PR? It reverts the changes and adds the same changes back.

nb-ohad
nb-ohad requested changes Dec 12, 2023
View reviewed changes
services/provider/client/client.go Outdated Show resolved Hide resolved
services/provider/server/server.go Outdated Show resolved Hide resolved
services/provider/server/server.go Outdated Show resolved Hide resolved
services/provider/server/server.go Outdated Show resolved Hide resolved
@leelavg
Copy link
Contributor Author

leelavg commented Dec 12, 2023

re-tested and verified new changes as well, older client updating the status after change in interface as below

// provider server from current commit
# date --utc; gl -1
Tuesday 12 December 2023 12:17:30 PM UTC
* dea06327 - (22 minutes ago)  (HEAD -> 5072-onboard) Onboard clients only if they are on same version as provider - 2 <Leela Venkaiah G>

# go run services/provider/main.go 
I1212 17:47:42.233373 1166545 main.go:22] Starting Provider API server
I1212 17:48:41.471251 1166545 server.go:675] Client status report received: storageConsumerUUID:"ff37c951-8c31-4861-9bcd-d97823eb67b9"  clientPlatformVersion:"4.14.2"  clientOperatorVersion:"4.14.2-rhodf"
I1212 17:48:41.557599 1166545 consumer.go:215] successfully updated Status for StorageConsumer storageconsumer-d1344bdd-ce33-4b55-a5b7-0ca41d8b8e46
I1212 17:48:41.600241 1166545 server.go:164] Found storageConsumer for GetStorageConfig
I1212 17:48:41.847969 1166545 server.go:182] successfully returned the config details to the consumer.

// client operator status reporter from 4.14
# date --utc; gl -1; go run service/status-report/main.go  && echo done
Tuesday 12 December 2023 12:18:37 PM UTC
*   c0935a9 - (3 weeks ago)  (HEAD -> release-4.14, origin/release-4.14) Merge pull request #41 from red-hat-storage/fusion-hci-4.14 <Mudit Agarwal>
|\  
done

@leelavg leelavg force-pushed the 5072-onboard branch 5 times, most recently from cccb32f to dc28578 Compare December 15, 2023 03:53
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2023
@leelavg leelavg force-pushed the 5072-onboard branch 2 times, most recently from b48cdb0 to eb0c884 Compare December 20, 2023 05:15
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2023
@leelavg leelavg force-pushed the 5072-onboard branch 5 times, most recently from 5e2828a to ef18be7 Compare December 21, 2023 09:46
@leelavg
Onboard clients only if they are on same version as provider - 2
ceed99c 
- Operator major and minor version of client and provider should match
for onboarding process to begin
- After this commit older clients will fail to get onboarded

Minor: Rename package clientstatus to interfaces

Signed-off-by: Leela Venkaiah G <[email protected]>
@leelavg
Copy link
Contributor Author

leelavg commented Dec 21, 2023

rebased.

@nb-ohad
Copy link
Contributor

nb-ohad commented Dec 21, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2023
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leelavg, nb-ohad

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 Dec 21, 2023
@leelavg
Copy link
Contributor Author

leelavg commented Dec 21, 2023

/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 Dec 21, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 6704e73 into red-hat-storage:main Dec 21, 2023
14 checks passed
@leelavg leelavg mentioned this pull request Dec 26, 2023
Merged
@leelavg
Copy link
Contributor Author

leelavg commented Jan 5, 2024

/cherrypick release-4.15

@openshift-cherrypick-robot
Copy link

@leelavg: new pull request created: #2372

In response to this:

/cherrypick release-4.15

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 5, 2024
Merged
@leelavg leelavg deleted the 5072-onboard branch December 11, 2024 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@umangachapagain umangachapagain umangachapagain requested changes

@nb-ohad nb-ohad Awaiting requested review from nb-ohad

Assignees

@umangachapagain umangachapagain

@nb-ohad nb-ohad

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@leelavg @nb-ohad @openshift-cherrypick-robot @umangachapagain @openshift-merge-robot