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

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

mrniranjan
Copy link
Contributor

@mrniranjan mrniranjan commented Sep 2, 2024

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

@mrniranjan 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 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
@openshift-ci-robot
Copy link
Contributor

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

Copy link
Contributor

openshift-ci bot commented Sep 2, 2024

@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
Copy link
Contributor

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

Copy link
Contributor

openshift-ci bot commented Sep 3, 2024

@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
Copy link
Contributor Author

/retest-required

@mrniranjan mrniranjan force-pushed the cgroups_hypershift branch 2 times, most recently from 50a6bed to e4c0635 Compare September 8, 2024 08:44
@mrniranjan 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 mrniranjan force-pushed the cgroups_hypershift branch 6 times, most recently from 62628dd to b4edf8a Compare September 22, 2024 12:52
@mrniranjan
Copy link
Contributor Author

/test e2e-aws-ovn-techpreview

Copy link
Contributor

@Tal-or Tal-or left a 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)
Copy link
Contributor

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()
Copy link
Contributor

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() {
Copy link
Contributor

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() {
Copy link
Contributor

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

@mrniranjan 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
- 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]>
@mrniranjan
Copy link
Contributor Author

/retest-required

1 similar comment
@mrniranjan
Copy link
Contributor Author

/retest-required

@Tal-or
Copy link
Contributor

Tal-or commented Oct 27, 2024

  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

@mrniranjan
Copy link
Contributor Author

/test e2e-hypershift-pao

1 similar comment
@mrniranjan
Copy link
Contributor Author

/test e2e-hypershift-pao

@mrniranjan
Copy link
Contributor Author

/retest-required

@mrniranjan
Copy link
Contributor Author

/test e2e-hypershift-pao

1 similar comment
@mrniranjan
Copy link
Contributor Author

/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)
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be DataPlaneClient

Copy link
Contributor Author

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)
Copy link
Contributor

Choose a reason for hiding this comment

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

Here as well ^

Copy link
Contributor Author

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

Copy link
Contributor

openshift-ci bot commented Nov 14, 2024

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

@jmencak
Copy link
Contributor

jmencak commented Nov 15, 2024

/approve

Copy link
Contributor

openshift-ci bot commented Nov 15, 2024

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2024
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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants