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

cgroupv1: do not run tests for version >= 4179 #569

Merged
merged 2 commits into from
Dec 12, 2024

Conversation

ader1990
Copy link
Contributor

@ader1990 ader1990 commented Dec 2, 2024

Flatcar with systemd >= 256 does not support cgroupv1 anymore.

See: flatcar/scripts#2145

@tormath1
Copy link
Contributor

tormath1 commented Dec 2, 2024

Thanks, this can be done on the kubeadm test too:

cgroupSuffix := ""
var major int64 = 0
if testParams["cgroupv1"].(bool) {
cgroupSuffix = ".cgroupv1"
major = 3140
}
if CNI == "flannel" {
flags = append(flags, register.NoEnableSelinux)
}
if mmvi, ok := testParams["MinMajorVersion"]; ok {
mmv := (int64)(mmvi.(int))
// Careful, so we don't lower
// the min version too much.
if mmv > major {
major = mmv
}
}

@ader1990
Copy link
Contributor Author

ader1990 commented Dec 2, 2024

Thanks, this can be done on the kubeadm test too:

cgroupSuffix := ""
var major int64 = 0
if testParams["cgroupv1"].(bool) {
cgroupSuffix = ".cgroupv1"
major = 3140
}
if CNI == "flannel" {
flags = append(flags, register.NoEnableSelinux)
}
if mmvi, ok := testParams["MinMajorVersion"]; ok {
mmv := (int64)(mmvi.(int))
// Careful, so we don't lower
// the min version too much.
if mmv > major {
major = mmv
}
}

Yes, that needs to be addressed, but do not know where is the best place to compare with a max version aka EndVersion. I think it should be done in a unified way, only defined once and used accordingly.

@ader1990 ader1990 force-pushed the ader1990/disable_cgroupv1_tests branch 2 times, most recently from dda563c to 8f9cec9 Compare December 2, 2024 14:26
@ader1990 ader1990 force-pushed the ader1990/disable_cgroupv1_tests branch from 8f9cec9 to 6642c50 Compare December 2, 2024 14:48
@ader1990 ader1990 requested a review from a team December 11, 2024 11:00
@ader1990
Copy link
Contributor Author

Hello @flatcar/flatcar-maintainers, I would like to have this PR reviewed, to unblock flatcar/scripts#2145

@ader1990 ader1990 self-assigned this Dec 11, 2024
@@ -38,6 +38,7 @@ func init() {
},
Distros: []string{"cl"},
MinVersion: semver.Version{Major: 3033},
EndVersion: semver.Version{Major: 4152},
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the next alpha will be greater than 4152. So we might need to bump this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

depends on when we merge the systemd PR. now (aka today), or after the next alpha gets released.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I saw that the next alpha release will be 4179, let's get this merged after this next alpha release to have time for better functional testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated to 4179 for ample of time.

@ader1990 ader1990 force-pushed the ader1990/disable_cgroupv1_tests branch from 6642c50 to 7463baf Compare December 11, 2024 13:48
@ader1990 ader1990 changed the title cgroupv1: do not run tests for version >= 4152 cgroupv1: do not run tests for version >= 4179 Dec 11, 2024
@ader1990 ader1990 merged commit 34b4d28 into flatcar-master Dec 12, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants