-
Notifications
You must be signed in to change notification settings - Fork 105
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
OCPBUGS-39333: E2E: Add support for hypershift to ovs dynamic pinning and kubelet.experimental annotation tests #1150
base: master
Are you sure you want to change the base?
Conversation
mrniranjan
commented
Sep 2, 2024
•
edited
Loading
edited
- use appropriate resource pool nodepools for hypershift and mcp for regular cluster
- replace dataplane test client instead of generic testclient.Client
@mrniranjan: This pull request references Jira Issue OCPBUGS-39333, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: mrniranjan. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
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-sigs/prow repository. |
0175192
to
dc1511b
Compare
@mrniranjan: This pull request references Jira Issue OCPBUGS-39333, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: mrniranjan. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
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-sigs/prow repository. |
/retest-required |
50a6bed
to
e4c0635
Compare
62628dd
to
b4edf8a
Compare
/test e2e-aws-ovn-techpreview |
b4edf8a
to
8e13645
Compare
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.
Thank you for working on this, left couple of comments
|
||
}) | ||
Context("Additional kubelet arguments", Label(string(label.Tier2)), func() { | ||
It("[test_id:45488]Test performance profile annotation for changing multiple kubelet settings", func() { | ||
sysctls := "{\"allowedUnsafeSysctls\":[\"net.core.somaxconn\",\"kernel.msg*\"],\"systemReserved\":{\"memory\":\"300Mi\"},\"kubeReserved\":{\"memory\":\"768Mi\"},\"imageMinimumGCAge\":\"3m\"}" | ||
profile.Annotations = updateKubeletConfigOverrideAnnotations(profile.Annotations, sysctls) | ||
annotations, err := json.Marshal(profile.Annotations) | ||
Expect(err).ToNot(HaveOccurred()) | ||
//annotations, err := json.Marshal(profile.Annotations) |
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.
Please remove the commented code
poolName, err = mcps.GetByProfile(profile) | ||
Expect(err).ToNot(HaveOccurred()) | ||
} else { | ||
hostedClusterName, err := hypershift.GetHostedClusterName() |
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.
We need to check for the error here
@@ -74,18 +76,24 @@ var _ = Describe("[performance] Cgroups and affinity", Ordered, Label(string(lab | |||
profile, err = profiles.GetByNodeLabels(testutils.NodeSelectorLabels) | |||
Expect(err).ToNot(HaveOccurred()) | |||
|
|||
performanceMCP, err = mcps.GetByProfile(profile) | |||
Expect(err).ToNot(HaveOccurred()) | |||
if !hypershift.IsHypershiftCluster() { |
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.
I would suggest to add
GetPoolName
function that would handle the case for both OCP and HCP
@@ -45,33 +52,38 @@ var _ = Describe("[ref_id: 45487][performance]additional kubelet arguments", Ord | |||
profile, err = profiles.GetByNodeLabels(testutils.NodeSelectorLabels) | |||
Expect(err).ToNot(HaveOccurred()) | |||
|
|||
performanceMCP, err = mcps.GetByProfile(profile) | |||
Expect(err).ToNot(HaveOccurred()) | |||
if !hypershift.IsHypershiftCluster() { |
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.
You can use a GetPoolName
function hide the details about the platform and handle both cases
d9db25c
to
a88eddf
Compare
- Changes primarily done to check nodepools instead of mcp for hypershift. - Also using appropriate dataplane test client instead of generic testclient.Client Signed-off-by: Niranjan M.R <[email protected]>
- Changes primarily done to check nodepools instead of mcp for hypershift. - Also using appropriate dataplane test client instead of generic testclient.Client Signed-off-by: Niranjan M.R <[email protected]>
- using testclient.ControlPlaneClient allows to the client to be used in hypershift and regular cluster Signed-off-by: Niranjan M.R <[email protected]>
…arget Signed-off-by: Niranjan M.R <[email protected]>
a88eddf
to
49bfa41
Compare
/retest-required |
1 similar comment
/retest-required |
|
Signed-off-by: Niranjan M.R <[email protected]>
b000306
to
613d3b3
Compare
/test e2e-hypershift-pao |
1 similar comment
/test e2e-hypershift-pao |
/retest-required |
/test e2e-hypershift-pao |
1 similar comment
/test e2e-hypershift-pao |
@@ -31,7 +31,7 @@ import ( | |||
var _ = BeforeSuite(func() { | |||
Expect(testclient.ClientsEnabled).To(BeTrue()) | |||
// create test namespace | |||
err := testclient.Client.Create(context.TODO(), namespaces.TestingNamespace) | |||
err := testclient.ControlPlaneClient.Create(context.TODO(), namespaces.TestingNamespace) |
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.
This should be DataPlaneClient
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.
fixed in the latest commit
@@ -40,7 +40,7 @@ var _ = BeforeSuite(func() { | |||
}) | |||
|
|||
var _ = AfterSuite(func() { | |||
err := testclient.Client.Delete(context.TODO(), namespaces.TestingNamespace) | |||
err := testclient.ControlPlaneClient.Delete(context.TODO(), namespaces.TestingNamespace) |
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.
Here as well ^
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.
fixed in the latest commit
Signed-off-by: Niranjan M.R <[email protected]>
@mrniranjan: all tests passed! Full PR test history. Your PR dashboard. 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-sigs/prow repository. I understand the commands that are listed here. |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jmencak, mrniranjan 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 |