-
Notifications
You must be signed in to change notification settings - Fork 70
Upgrade k8s depencencies in host for Openshift 4.16 #1125
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
Merged
ranakan19
merged 16 commits into
codeready-toolchain:master
from
ranakan19:openshift_4_16_host
Feb 3, 2025
Merged
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
7cb37af
update kube dependencies for 4.16
ranakan19 e74f1cf
merge conflict resolved
ranakan19 b9f5313
mod changes
ranakan19 0f920b0
fix replace versions
ranakan19 8611c7a
merge conflict resolve, and fix openshift/api version
ranakan19 7c21e2e
Merge branch 'master' into openshift_4_16_host
ranakan19 34db249
tidy after merge
ranakan19 730e6c2
update golang version in readme, and dockerfile.tools
ranakan19 862cb57
Merge branch 'master' into openshift_4_16_host
ranakan19 31b398b
Merge branch 'openshift_4_16_host' of github.com:ranakan19/host-opera…
ranakan19 b70c114
fix replace version with latest from fork, add comments for cache opt…
ranakan19 2dc5684
add link for webhook server doc in comment
ranakan19 0645b38
update controller-gen version
ranakan19 c15d543
Merge branch 'master' into openshift_4_16_host
ranakan19 3eeba8a
Merge branch 'master' into openshift_4_16_host
ranakan19 021aab0
remove replace block
ranakan19 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,7 +51,7 @@ func TestNotificationSuccess(t *testing.T) { | |
| notification, err := notify.NewNotificationBuilder(cl, test.HostOperatorNs).Create(context.TODO(), "[email protected]") | ||
| require.NoError(t, err) | ||
| notification.Status.Conditions = []toolchainv1alpha1.Condition{sentCond()} | ||
| require.NoError(t, cl.Update(context.TODO(), notification)) | ||
| require.NoError(t, cl.Status().Update(context.TODO(), notification)) | ||
|
|
||
| // when | ||
| result, err := reconcileNotification(controller, notification) | ||
|
|
@@ -74,7 +74,7 @@ func TestNotificationSuccess(t *testing.T) { | |
| require.NoError(t, err) | ||
| notification.Status.Conditions = []toolchainv1alpha1.Condition{sentCond()} | ||
| notification.Status.Conditions[0].LastTransitionTime = metav1.Time{Time: time.Now().Add(-cast.ToDuration("10s"))} | ||
| require.NoError(t, cl.Update(context.TODO(), notification)) | ||
| require.NoError(t, cl.Status().Update(context.TODO(), notification)) | ||
|
|
||
| // when | ||
| result, err := reconcileNotification(controller, notification) | ||
|
|
@@ -103,7 +103,7 @@ func TestNotificationSentFailure(t *testing.T) { | |
| require.NoError(t, err) | ||
| notification.Status.Conditions = []toolchainv1alpha1.Condition{sentCond()} | ||
| notification.Status.Conditions[0].LastTransitionTime = metav1.Time{Time: time.Now().Add(-cast.ToDuration("10s"))} | ||
| require.NoError(t, cl.Update(context.TODO(), notification)) | ||
| require.NoError(t, cl.Status().Update(context.TODO(), notification)) | ||
|
|
||
| // when | ||
| result, err := reconcileNotification(controller, notification) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for my understanding, this change is related to dependency update ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good question. These changes are from the previous update of controller-runtime to v0.15 (see here) but missed it last time. This test didn't fail before so this change slipped by, but unit tests were failing now.