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 Kubernetes dependencies to 1.26.x #287

Merged
merged 1 commit into from
Jun 11, 2023

Conversation

erikgb
Copy link
Contributor

@erikgb erikgb commented May 28, 2023

This PR bumps the K8s dependencies to 1.26.x. My main motivation is to get access to new features available in recent versions of controller-runtime. I have not bumped to the latest version of c-r, since it contains a lot of breaking changes that will require changing a lot more code, ref. https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.15.0. I could eventually fix this in a follow-up PR.

As a consequence of the bump of K8s dependencies, it is required to bump other dependencies like cert-controller as well.

All tests run fine: normal tests and e2e-tests (also in HNC_REPAIR mode). I notice a few TLS errors in controller logs, but I do not know if this is caused by my corporate network environment. But I wouldn't mind someone else checking it!

@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 28, 2023
@erikgb
Copy link
Contributor Author

erikgb commented May 28, 2023

/test all

@erikgb erikgb changed the title WIP: Bump Kubernetes depdendencies WIP: Bump Kubernetes dependencies May 28, 2023
@erikgb
Copy link
Contributor Author

erikgb commented May 28, 2023

/test all

@adrianludwin
Copy link
Contributor

Hey @erikgb is there some reason to bump this now?

@erikgb
Copy link
Contributor Author

erikgb commented May 29, 2023

@adrianludwin I tried to write tests in #285, and is blocked by features added to newer controller-runtime versions. I can always work around it, by copying code. Is there a reason for not upgrading? 😉

@adrianludwin
Copy link
Contributor

Nope, that sounds great! Just wanted to know :) Thanks!

@erikgb erikgb force-pushed the bump-controller-tools branch 2 times, most recently from c3c3028 to 51e29ff Compare May 29, 2023 16:50
@erikgb erikgb changed the title WIP: Bump Kubernetes dependencies Bump Kubernetes dependencies May 29, 2023
@erikgb erikgb marked this pull request as ready for review May 29, 2023 16:50
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 29, 2023
@k8s-ci-robot k8s-ci-robot requested a review from tashimi May 29, 2023 16:50
@erikgb
Copy link
Contributor Author

erikgb commented May 29, 2023

/assign @adrianludwin @rjbez17

@erikgb
Copy link
Contributor Author

erikgb commented May 29, 2023

/test all

@adrianludwin
Copy link
Contributor

/retest

@erikgb
Copy link
Contributor Author

erikgb commented May 29, 2023

/retest pull-hnc-test

@k8s-ci-robot
Copy link
Contributor

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

  • /test pull-hnc-test

Use /test all to run all jobs.

In response to this:

/retest pull-hnc-test

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.

@erikgb
Copy link
Contributor Author

erikgb commented May 29, 2023

@adrianludwin Any idea what has happened to the CI? It ran yesterday....

@erikgb erikgb changed the title Bump Kubernetes dependencies Bump Kubernetes dependencies to 1.26.x May 29, 2023
@erikgb erikgb force-pushed the bump-controller-tools branch from 51e29ff to a61dfa9 Compare May 29, 2023 16:56
@@ -112,8 +111,8 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
type FooStatus struct{ // Represents the observations of a foo's
current state. // Known .status.conditions.type are: \"Available\",
\n type FooStatus struct{ // Represents the observations of a
Copy link
Contributor

Choose a reason for hiding this comment

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

Any idea what this \n is?

Copy link
Contributor Author

@erikgb erikgb May 29, 2023

Choose a reason for hiding this comment

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

I think it originates from the upstream K8s Condition type doc. It is what controller-gen "spits out" now. I have seen occasional changes to our CRDs (in other controllers) when reusing upstream types and docs updated upstream.

Copy link
Contributor

Choose a reason for hiding this comment

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

That newline just looks weird, it's not showing up anywhere else? Maybe check the comment in the source file to make sure there's no weird newline there? But obviously not a big deal if it's not obvious.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is how the source looks like:

// Condition contains details for one aspect of the current state of this API Resource.
// ---
// This struct is intended for direct use as an array at the field path .status.conditions.  For example,
//
//	type FooStatus struct{
//	    // Represents the observations of a foo's current state.
//	    // Known .status.conditions.type are: "Available", "Progressing", and "Degraded"
//	    // +patchMergeKey=type
//	    // +patchStrategy=merge
//	    // +listType=map
//	    // +listMapKey=type
//	    Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
//
//	    // other fields
//	}
type Condition struct {

It seems like the empty line adds /n to the CRD field description.

@adrianludwin
Copy link
Contributor

adrianludwin commented May 29, 2023 via email

@adrianludwin
Copy link
Contributor

Maybe file a bug to the Prow folks? Other repos seem to have passing tests today, so maybe it's just us? A quick Google search didn't turn up any obvious problems.

@erikgb
Copy link
Contributor Author

erikgb commented May 29, 2023

Maybe file a bug to the Prow folks? Other repos seem to have passing tests today, so maybe it's just us? A quick Google search didn't turn up any obvious problems.

@adrianludwin There is already an issue on this: kubernetes/test-infra#29622. Let's hope it will be sorted out soon.

@adrianludwin
Copy link
Contributor

Great, glad to know it's not just us :)

@erikgb
Copy link
Contributor Author

erikgb commented May 29, 2023

/retest

1 similar comment
@erikgb
Copy link
Contributor Author

erikgb commented May 30, 2023

/retest

@erikgb erikgb requested a review from adrianludwin May 30, 2023 20:56
@rjbez17
Copy link
Contributor

rjbez17 commented May 31, 2023

The tests look to be passing now, @adrianludwin ok to merge?

@rjbez17
Copy link
Contributor

rjbez17 commented Jun 11, 2023

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 11, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: erikgb, rjbez17

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 11, 2023
Tested: All tests run fine, including e2e-tests in HNC_REPAIR mode. While running the e2e-tests I noticed some TLS handshake errors in HNC controller logs, but I don't know if it is due to my corporate network environment.
@erikgb erikgb force-pushed the bump-controller-tools branch from a61dfa9 to 4b7fb70 Compare June 11, 2023 08:34
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 11, 2023
@rjbez17
Copy link
Contributor

rjbez17 commented Jun 11, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 11, 2023
@k8s-ci-robot k8s-ci-robot merged commit 6bdf001 into kubernetes-sigs:master Jun 11, 2023
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants