e2e adapts to the new version of k8s dependencies

slime-io · Aug 23, 2022 · 121e0af · 121e0af
1 parent 556499f
commit 121e0af
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/staging/src/slime.io/slime/modules/lazyload/test/e2e/lazyload_test.go b/staging/src/slime.io/slime/modules/lazyload/test/e2e/lazyload_test.go
@@ -1,6 +1,7 @@
 package e2e
 
 import (
+ "context"
  "os"
  "os/exec"
  "path/filepath"
@@ -80,7 +81,7 @@ func createSlimeBoot(f *framework.Framework) {
  slimebootDeploymentInstalled := false
 
  for i := 0; i < 10; i++ {
- pods, err := cs.CoreV1().Pods(nsSlime).List(metav1.ListOptions{})
+ pods, err := cs.CoreV1().Pods(nsSlime).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  if len(pods.Items) == 0 {
  time.Sleep(500 * time.Millisecond)
@@ -125,7 +126,7 @@ func createSlimeModuleLazyload(f *framework.Framework, strictRev bool) {
  globalSidecarInstalled := false
 
  for i := 0; i < 60; i++ {
- pods, err := cs.CoreV1().Pods(nsSlime).List(metav1.ListOptions{})
+ pods, err := cs.CoreV1().Pods(nsSlime).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  if len(pods.Items) != 3 {
  time.Sleep(500 * time.Millisecond)
@@ -145,7 +146,7 @@ func createSlimeModuleLazyload(f *framework.Framework, strictRev bool) {
  }
 
  for i := 0; i < 60; i++ {
- pods, err := f.ClientSet.CoreV1().Pods(nsApps).List(metav1.ListOptions{})
+ pods, err := f.ClientSet.CoreV1().Pods(nsApps).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  if len(pods.Items) == 0 {
  time.Sleep(500 * time.Millisecond)
@@ -184,7 +185,7 @@ func createExampleApps(f *framework.Framework) {
 
  // check
  for i := 0; i < 60; i++ {
- pods, err := cs.CoreV1().Pods(nsApps).List(metav1.ListOptions{})
+ pods, err := cs.CoreV1().Pods(nsApps).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  if len(pods.Items) != 6 {
  time.Sleep(500 * time.Millisecond)
@@ -222,7 +223,7 @@ func createServiceFence(f *framework.Framework, strictRev bool) {
 
  svfCreated := false
  for i := 0; i < 60; i++ {
- svf, err := f.DynamicClient.Resource(svfGvr).Namespace(nsApps).Get(svfName, metav1.GetOptions{})
+ svf, err := f.DynamicClient.Resource(svfGvr).Namespace(nsApps).Get(context.TODO(), svfName, metav1.GetOptions{})
  if err != nil {
  time.Sleep(500 * time.Millisecond)
  continue
@@ -245,7 +246,7 @@ func createServiceFence(f *framework.Framework, strictRev bool) {
 
  sidecarCreated := false
  for i := 0; i < 60; i++ {
- sidecar, err := f.DynamicClient.Resource(sidecarGvr).Namespace(nsApps).Get(sidecarName, metav1.GetOptions{})
+ sidecar, err := f.DynamicClient.Resource(sidecarGvr).Namespace(nsApps).Get(context.TODO(), sidecarName, metav1.GetOptions{})
  if err != nil {
  time.Sleep(500 * time.Millisecond)
  continue
@@ -264,7 +265,7 @@ func createServiceFence(f *framework.Framework, strictRev bool) {
 }
 
 func updateSidecar(f *framework.Framework) {
- pods, err := f.ClientSet.CoreV1().Pods(nsApps).List(metav1.ListOptions{})
+ pods, err := f.ClientSet.CoreV1().Pods(nsApps).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
 ExecLoop:
  for _, pod := range pods.Items {
@@ -297,7 +298,7 @@ ExecLoop:
  sidecarUpdated := false
 VerifyLoop:
  for i := 0; i < 120; i++ {
- sidecar, err := f.DynamicClient.Resource(sidecarGvr).Namespace(nsApps).Get(sidecarName, metav1.GetOptions{})
+ sidecar, err := f.DynamicClient.Resource(sidecarGvr).Namespace(nsApps).Get(context.TODO(), sidecarName, metav1.GetOptions{})
  framework.ExpectNoError(err)
  egress, _, err := unstructured.NestedSlice(sidecar.Object, "spec", "egress")
  framework.ExpectNoError(err)
@@ -319,7 +320,7 @@ VerifyLoop:
 
 func verifyAccessLogs(f *framework.Framework) {
  cs := f.ClientSet
- pods, err := cs.CoreV1().Pods(nsApps).List(metav1.ListOptions{})
+ pods, err := cs.CoreV1().Pods(nsApps).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  for _, pod := range pods.Items {
  if strings.Contains(pod.Name, "productpage") {

diff --git a/staging/src/slime.io/slime/modules/limiter/test/e2e/limiter_test.go b/staging/src/slime.io/slime/modules/limiter/test/e2e/limiter_test.go
@@ -1,6 +1,7 @@
 package e2e
 
 import (
+ "context"
  "os"
  "path/filepath"
  "strings"
@@ -69,7 +70,7 @@ func createSlimeBoot(f *framework.Framework) {
  slimebootDeploymentInstalled := false
 
  for i := 0; i < 10; i++ {
- pods, err := cs.CoreV1().Pods(nsSlime).List(metav1.ListOptions{})
+ pods, err := cs.CoreV1().Pods(nsSlime).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  if len(pods.Items) == 0 {
  time.Sleep(500 * time.Millisecond)
@@ -101,7 +102,7 @@ func createSlimeModuleLimiter(f *framework.Framework) {
  limitDeploymentInstalled := false
 
  for i := 0; i < 60; i++ {
- pods, err := cs.CoreV1().Pods(nsSlime).List(metav1.ListOptions{})
+ pods, err := cs.CoreV1().Pods(nsSlime).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  if len(pods.Items) <= 1 {
  time.Sleep(1000 * time.Millisecond)
@@ -133,7 +134,7 @@ func createExampleApps(f *framework.Framework) {
 
  // check
  for i := 0; i < 60; i++ {
- pods, err := cs.CoreV1().Pods(nsApps).List(metav1.ListOptions{})
+ pods, err := cs.CoreV1().Pods(nsApps).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  if len(pods.Items) != 6 {
  time.Sleep(500 * time.Millisecond)
@@ -162,7 +163,7 @@ func createSmartLimiter(f *framework.Framework) {
  }
  created := false
  for i := 0; i < 60; i++ {
- _, err := f.DynamicClient.Resource(smartLimiterGVR).Namespace(nsApps).Get("productpage", metav1.GetOptions{})
+ _, err := f.DynamicClient.Resource(smartLimiterGVR).Namespace(nsApps).Get(context.TODO(), "productpage", metav1.GetOptions{})
  if err != nil {
  time.Sleep(500 * time.Millisecond)
  continue
@@ -181,7 +182,7 @@ func createSmartLimiter(f *framework.Framework) {
  Resource: efResource,
  }
  for i := 0; i < 30; i++ {
- _, err := f.DynamicClient.Resource(envoyFilterGVR).Namespace(nsApps).Get("productpage.temp.ratelimit", metav1.GetOptions{})
+ _, err := f.DynamicClient.Resource(envoyFilterGVR).Namespace(nsApps).Get(context.TODO(), "productpage.temp.ratelimit", metav1.GetOptions{})
  if err != nil {
  time.Sleep(1000 * time.Millisecond)
  continue
@@ -199,7 +200,7 @@ func createSmartLimiter(f *framework.Framework) {
 // curl -I http://reviews:9080/
 func limiterTackEffect(f *framework.Framework) {
  time.Sleep(20 * time.Second)
- pods, err := f.ClientSet.CoreV1().Pods(nsApps).List(metav1.ListOptions{})
+ pods, err := f.ClientSet.CoreV1().Pods(nsApps).List(context.TODO(), metav1.ListOptions{})
  framework.ExpectNoError(err)
  for _, pod := range pods.Items {
  if strings.Contains(pod.Name, "ratings") {