OCPBUGS-39333: E2E: Add support for hypershift to ovs dynamic pinning and kubelet.experimental annotation tests #1150

mrniranjan · 2024-09-02T06:17:19Z

use appropriate resource pool nodepools for hypershift and mcp for regular cluster
replace dataplane test client instead of generic testclient.Client

openshift-ci-robot · 2024-09-02T06:49:31Z

@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

bug is open, matching expected state (open)
bug target version (4.18.0) matches configured target version for branch (4.18.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mrniranjan

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Changes primarily done to check nodepools instead of mcp for hypershift.

Also using appropriate dataplane test client instead of generic testclient.Client

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 · 2024-09-02T06:49:43Z

@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:

@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

bug is open, matching expected state (open)

bug target version (4.18.0) matches configured target version for branch (4.18.0)

bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mrniranjan

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Changes primarily done to check nodepools instead of mcp for hypershift.

Also using appropriate dataplane test client instead of generic testclient.Client

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.

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.

openshift-ci-robot · 2024-09-03T06:34:23Z

@mrniranjan: This pull request references Jira Issue OCPBUGS-39333, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.18.0) matches configured target version for branch (4.18.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mrniranjan

In response to this:

use appropriate resource pool nodepools for hypershift and mcp for regular cluster

replace dataplane test client instead of generic testclient.Client

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 · 2024-09-03T06:34:25Z

@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:

@mrniranjan: This pull request references Jira Issue OCPBUGS-39333, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)

bug target version (4.18.0) matches configured target version for branch (4.18.0)

bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mrniranjan

In response to this:

use appropriate resource pool nodepools for hypershift and mcp for regular cluster

replace dataplane test client instead of generic testclient.Client

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.

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.

mrniranjan · 2024-09-03T11:54:51Z

/retest-required

mrniranjan · 2024-09-23T02:10:28Z

/test e2e-aws-ovn-techpreview

Tal-or

Thank you for working on this, left couple of comments

Tal-or · 2024-10-08T06:30:02Z

test/e2e/performanceprofile/functests/7_performance_kubelet_node/kubelet.go


 	})
 	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)


Please remove the commented code

Tal-or · 2024-10-08T06:32:23Z

test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go

+			poolName, err = mcps.GetByProfile(profile)
+			Expect(err).ToNot(HaveOccurred())
+		} else {
+			hostedClusterName, err := hypershift.GetHostedClusterName()


We need to check for the error here

Tal-or · 2024-10-08T06:33:31Z

test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go

@@ -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() {


I would suggest to add
GetPoolName function that would handle the case for both OCP and HCP

Tal-or · 2024-10-08T06:35:25Z

test/e2e/performanceprofile/functests/7_performance_kubelet_node/kubelet.go

@@ -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() {


You can use a GetPoolName function hide the details about the platform and handle both cases

- 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]>

mrniranjan · 2024-10-09T06:43:31Z

/retest-required

mrniranjan · 2024-10-25T05:55:19Z

/retest-required

Tal-or · 2024-10-27T12:30:52Z

  STEP: Reverting the Profile - /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go:188 @ 10/25/24 08:15:12.157
  STEP: Applying changes in performance profile and waiting until clusters/24a18b9e1fced5fb7ddc-us-east-1a will start updating - /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go:196 @ 10/25/24 08:15:12.198
  Oct 25 08:15:12.201: [INFO]: wait for node pool "clusters/24a18b9e1fced5fb7ddc-us-east-1a" transition into update config state
  STEP: Waiting when clusters/24a18b9e1fced5fb7ddc-us-east-1a finishes updates - /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go:199 @ 10/25/24 08:15:22.209
  Oct 25 08:15:22.212: [INFO]: wait for node pool "clusters/24a18b9e1fced5fb7ddc-us-east-1a" transition into config ready state
  [FAILED] Unexpected error:
      <*url.Error | 0xc0006a2d50>: 
      Get "https://a9c92984710fa4b81a716a01d0bad186-164ea1e233c0eee6.elb.us-east-1.amazonaws.com:6443/apis/hypershift.openshift.io/v1beta1/namespaces/clusters/nodepools/24a18b9e1fced5fb7ddc-us-east-1a": http2: client connection lost
      {
          Op: "Get",
          URL: "https://a9c92984710fa4b81a716a01d0bad186-164ea1e233c0eee6.elb.us-east-1.amazonaws.com:6443/apis/hypershift.openshift.io/v1beta1/namespaces/clusters/nodepools/24a18b9e1fced5fb7ddc-us-east-1a",
          Err: <*errors.errorString | 0xc00029b140>{
              s: "http2: client connection lost",
          },
      }
  occurred
  In [AfterEach] at: /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/utils/profilesupdate/profile_update.go:168 @ 10/25/24 08:43:27.24
  < Exit [AfterEach] [Performance Profile Modified] - /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go:187 @ 10/25/24 08:43:27.24 (28m15.083s)
  Attempt #1 Failed.  Retrying ↺ @ 10/25/24 08:43:27.244
  > Enter [BeforeEach] [performance] Cgroups and affinity - /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go:97 @ 10/25/24 08:43:27.244
  STEP: Checking the profile performance with cpus reserved=[0] isolated=[1-3] - /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go:98 @ 10/25/24 08:43:27.245
  Oct 25 08:43:47.272: [INFO]: daemonset "node-inspector-ns" "node-inspector" desired 3 scheduled 3 ready 3
  [FAILED] Unexpected error:
      <*errors.errorString | 0xc000694c70>: 
      failed to get daemon pod for the node "ip-10-0-130-98.ec2.internal"
      {
          s: "failed to get daemon pod for the node \"ip-10-0-130-98.ec2.internal\"",
      }
  occurred
  In [BeforeEach] at: /go/src/github.com/openshift/cluster-node-tuning-operator/test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go:104 @ 10/25/24 08:43:47.275

Signed-off-by: Niranjan M.R <[email protected]>

mrniranjan · 2024-11-05T12:36:34Z

/test e2e-hypershift-pao

mrniranjan · 2024-11-06T09:22:02Z

/test e2e-hypershift-pao

mrniranjan · 2024-11-06T21:51:48Z

/retest-required

mrniranjan · 2024-11-13T09:54:52Z

/test e2e-hypershift-pao

mrniranjan · 2024-11-14T09:53:53Z

/test e2e-hypershift-pao

rbaturov · 2024-11-14T13:49:05Z

...anceprofile/functests/7_performance_kubelet_node/test_suite_performance_kubelet_node_test.go

@@ -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)


This should be DataPlaneClient

fixed in the latest commit

rbaturov · 2024-11-14T13:49:18Z

...anceprofile/functests/7_performance_kubelet_node/test_suite_performance_kubelet_node_test.go

@@ -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)


Here as well ^

fixed in the latest commit

Signed-off-by: Niranjan M.R <[email protected]>

jmencak · 2024-11-15T07:47:02Z

/approve

openshift-ci · 2024-11-15T07:47:24Z

[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:

~~OWNERS~~ [jmencak]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Tal-or · 2024-11-18T09:38:45Z

/lgtm

openshift-ci-robot · 2024-11-18T11:35:09Z

/retest-required

Remaining retests: 0 against base HEAD ad4a69f and 2 for PR HEAD 3abea36 in total

openshift-ci-robot · 2024-11-18T17:43:19Z

/retest-required

Remaining retests: 0 against base HEAD ad4a69f and 2 for PR HEAD 3abea36 in total

openshift-ci-robot · 2024-11-19T08:03:02Z

/retest-required

Remaining retests: 0 against base HEAD ad4a69f and 2 for PR HEAD 3abea36 in total

openshift-ci · 2024-11-19T09:56:27Z

@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.

openshift-ci-robot · 2024-11-19T10:00:39Z

@mrniranjan: Jira Issue OCPBUGS-39333: All pull requests linked via external trackers have merged:

openshift/cluster-node-tuning-operator#1150

Jira Issue OCPBUGS-39333 has been moved to the MODIFIED state.

In response to this:

use appropriate resource pool nodepools for hypershift and mcp for regular cluster

replace dataplane test client instead of generic testclient.Client

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-bot · 2024-11-19T13:03:12Z

[ART PR BUILD NOTIFIER]

Distgit: cluster-node-tuning-operator
This PR has been included in build cluster-node-tuning-operator-container-v4.18.0-202411191206.p0.gccb2b95.assembly.stream.el9.
All builds following this will include this PR.

mrniranjan · 2024-11-20T06:42:03Z

/cherry-pick release-4.17

openshift-cherrypick-robot · 2024-11-20T06:42:51Z

@mrniranjan: #1150 failed to apply on top of branch "release-4.17":

Applying: E2E: Add support for hypershift to ovs dynamic pinning tests
Using index info to reconstruct a base tree...
M	test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/functests/7_performance_kubelet_node/cgroups.go
Applying: E2E: Add hypershift for kubelet experimental annotation suite
Applying: E2E: use testclient.ControlPlaneClient for creating namespaces
Applying: Add OVS Dynamic pinning and kubelet.experimental to hypershift make target
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0004 Add OVS Dynamic pinning and kubelet.experimental to hypershift make target

In response to this:

/cherry-pick release-4.17

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.

openshift-ci bot requested review from jmencak and rbaturov September 2, 2024 06:17

mrniranjan changed the title ~~E2E: Add support for hypershift to ovs dynamic pinning tests~~ OCPBUGS-39333: E2E: Add support for hypershift to ovs dynamic pinning tests Sep 2, 2024

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 2, 2024

mrniranjan force-pushed the cgroups_hypershift branch from 0175192 to dc1511b Compare September 3, 2024 06:23

mrniranjan force-pushed the cgroups_hypershift branch 2 times, most recently from 50a6bed to e4c0635 Compare September 8, 2024 08:44

mrniranjan changed the title ~~OCPBUGS-39333: E2E: Add support for hypershift to ovs dynamic pinning tests~~ OCPBUGS-39333: E2E: Add support for hypershift to ovs dynamic pinning and kubelet.experimental annotation tests Sep 8, 2024

mrniranjan force-pushed the cgroups_hypershift branch 6 times, most recently from 62628dd to b4edf8a Compare September 22, 2024 12:52

mrniranjan force-pushed the cgroups_hypershift branch from b4edf8a to 8e13645 Compare September 23, 2024 11:01

Tal-or reviewed Oct 8, 2024

View reviewed changes

mrniranjan force-pushed the cgroups_hypershift branch 3 times, most recently from d9db25c to a88eddf Compare October 8, 2024 11:01

Niranjan M.R added 4 commits October 9, 2024 06:29

E2E: Add support for hypershift to ovs dynamic pinning tests

97ebdfc

- 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]>

E2E: Add hypershift for kubelet experimental annotation suite

7ff70fe

- 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]>

E2E: use testclient.ControlPlaneClient for creating namespaces

a0913b4

- using testclient.ControlPlaneClient allows to the client to be used in hypershift and regular cluster Signed-off-by: Niranjan M.R <[email protected]>

Add OVS Dynamic pinning and kubelet.experimental to hypershift make t…

49bfa41

…arget Signed-off-by: Niranjan M.R <[email protected]>

mrniranjan force-pushed the cgroups_hypershift branch from a88eddf to 49bfa41 Compare October 9, 2024 01:07

Replace PostUpdateSync with WaitForTuningUpdated

613d3b3

Signed-off-by: Niranjan M.R <[email protected]>

mrniranjan force-pushed the cgroups_hypershift branch from b000306 to 613d3b3 Compare October 30, 2024 09:00

rbaturov reviewed Nov 14, 2024

View reviewed changes

Use DataPlaneClient to create and delete test namespaces

3abea36

Signed-off-by: Niranjan M.R <[email protected]>

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2024

openshift-ci bot assigned Tal-or Nov 18, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 18, 2024

openshift-merge-bot bot merged commit ccb2b95 into openshift:master Nov 19, 2024
17 checks passed

OCPBUGS-39333: E2E: Add support for hypershift to ovs dynamic pinning and kubelet.experimental annotation tests #1150

OCPBUGS-39333: E2E: Add support for hypershift to ovs dynamic pinning and kubelet.experimental annotation tests #1150

Uh oh!

Conversation

mrniranjan commented Sep 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 2, 2024

Uh oh!

openshift-ci bot commented Sep 2, 2024

Uh oh!

openshift-ci-robot commented Sep 3, 2024

Uh oh!

openshift-ci bot commented Sep 3, 2024

Uh oh!

mrniranjan commented Sep 3, 2024

Uh oh!

mrniranjan commented Sep 23, 2024

Uh oh!

Tal-or left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mrniranjan commented Oct 9, 2024

Uh oh!

mrniranjan commented Oct 25, 2024

Uh oh!

Tal-or commented Oct 27, 2024

Uh oh!

mrniranjan commented Nov 5, 2024

Uh oh!

mrniranjan commented Nov 6, 2024

Uh oh!

mrniranjan commented Nov 6, 2024

Uh oh!

mrniranjan commented Nov 13, 2024

Uh oh!

mrniranjan commented Nov 14, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmencak commented Nov 15, 2024

Uh oh!

openshift-ci bot commented Nov 15, 2024

Uh oh!

Tal-or commented Nov 18, 2024

Uh oh!

openshift-ci-robot commented Nov 18, 2024

Uh oh!

openshift-ci-robot commented Nov 18, 2024

Uh oh!

openshift-ci-robot commented Nov 19, 2024

Uh oh!

openshift-ci bot commented Nov 19, 2024

Uh oh!

Uh oh!

openshift-ci-robot commented Nov 19, 2024

Uh oh!

openshift-bot commented Nov 19, 2024

Uh oh!

mrniranjan commented Nov 20, 2024

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2024

Uh oh!

Uh oh!

mrniranjan commented Sep 2, 2024 •

edited

Loading