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

Bump golang, k8s #37

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Bump golang, k8s #37

merged 3 commits into from
Dec 5, 2023

Conversation

oceanc80
Copy link
Contributor

@oceanc80 oceanc80 commented Oct 18, 2023

Description of the change:
Transfer ansible-operator-plugins changes from operator-framework/operator-sdk#6514 to this repository.

Motivation for the change:
Bump k8s, golang and golang.org/x/net version

Comment on lines -345 to -380
{
Name: "reconcile deletetion",
GVK: gvk,
ReconcilePeriod: 5 * time.Second,
Runner: &fake.Runner{
JobEvents: []eventapi.JobEvent{
eventapi.JobEvent{
Event: eventapi.EventPlaybookOnStats,
Created: eventapi.EventTime{Time: eventTime},
},
},
Finalizer: "testing.io/finalizer",
},
Client: fakeclient.NewClientBuilder().WithObjects(&unstructured.Unstructured{
Object: map[string]interface{}{
"metadata": map[string]interface{}{
"name": "reconcile",
"namespace": "default",
"annotations": map[string]interface{}{
controller.ReconcilePeriodAnnotation: "3s",
},
"deletionTimestamp": eventTime.Format(time.RFC3339),
},
"apiVersion": "operator-sdk/v1beta1",
"kind": "Testing",
"spec": map[string]interface{}{},
},
}).Build(),
Result: reconcile.Result{},
Request: reconcile.Request{
NamespacedName: types.NamespacedName{
Name: "reconcile",
Namespace: "default",
},
},
},
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this test now unnecessary?

Copy link
Member

Choose a reason for hiding this comment

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

I bet this is because of the behaviour of the fake client which has changed in controller-runtime and now requires a sub resource to be present explicitly, which makes this unnecessary as the next test does the same. Should have commented while making this change :/

Let me run it locally and see if my brain remembers!

@oceanc80 oceanc80 force-pushed the k8s-bump branch 3 times, most recently from cd8f4e8 to 9d47b30 Compare October 19, 2023 17:31
go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
@varshaprasad96
Copy link
Member

@oceanc80 Also realized that we need to bump this:

export K8S_VERSION = 1.26.0

go.mod Outdated Show resolved Hide resolved
@oceanc80 oceanc80 force-pushed the k8s-bump branch 2 times, most recently from 2987e77 to 635d52a Compare October 30, 2023 21:38
@oceanc80
Copy link
Contributor Author

@oceanc80 Also realized that we need to bump this:

export K8S_VERSION = 1.26.0

635d52a

@oceanc80 oceanc80 force-pushed the k8s-bump branch 2 times, most recently from 51bf8c6 to 495781e Compare November 9, 2023 14:06
@oceanc80 oceanc80 changed the title DRAFT: Bump golang, k8s Bump golang, k8s Nov 9, 2023
@oceanc80 oceanc80 force-pushed the k8s-bump branch 4 times, most recently from acbb5fd to de27b35 Compare November 13, 2023 16:17
go.mod Outdated Show resolved Hide resolved
@oceanc80 oceanc80 force-pushed the k8s-bump branch 2 times, most recently from 290bc4a to 7af40e3 Compare December 1, 2023 15:11
Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>
Signed-off-by: everettraven <everettraven@gmail.com>
Signed-off-by: everettraven <everettraven@gmail.com>
Copy link
Collaborator

@everettraven everettraven left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2023
@oceanc80 oceanc80 merged commit d0bb0f7 into operator-framework:main Dec 5, 2023
5 checks passed
@oceanc80 oceanc80 deleted the k8s-bump branch December 5, 2023 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants