chore: remove unrelated framework changes from webhook validation PR

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: AlinsRan

test/e2e/framework/api7_dashboard.go

@@ -33,26 +33,15 @@ import (
 )
 
 var (
-	valuesTemplate          *template.Template
-	_db                     string
-	postgresImageRegistry   string
-	postgresImageRepository string
-	postgresImageTag        string
+	valuesTemplate *template.Template
+	_db            string
 )
 
 func init() {
 	_db = os.Getenv("DB")
 	if _db == "" {
 		_db = postgres
 	}
-
-	postgresImageRegistry = os.Getenv("POSTGRESQL_IMAGE_REGISTRY")
-	postgresImageRepository = os.Getenv("POSTGRESQL_IMAGE_REPOSITORY")
-	postgresImageTag = os.Getenv("POSTGRESQL_IMAGE_TAG")
-	if postgresImageRegistry != "" && postgresImageRepository == "" {
-		postgresImageRepository = "bitnami/postgresql"
-	}
-
 	tmpl, err := template.New("values.yaml").Parse(`
 dashboard:
   image:
@@ -219,14 +208,6 @@ jaeger:
 postgresql:
 {{- if ne .DB "postgres" }}
   builtin: false
-{{- end }}
-{{- if .PostgresImageRegistry }}
-  image:
-    registry: {{ .PostgresImageRegistry }}
-    repository: {{ .PostgresImageRepository }}
-{{- if .PostgresImageTag }}
-    tag: {{ .PostgresImageTag }}
-{{- end }}
 {{- end }}
   primary:
     containerSecurityContext:

test/e2e/framework/api7_framework.go

@@ -35,7 +35,6 @@ import (
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/kube"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const defaultDashboardVersion = "dev"
@@ -78,10 +77,7 @@ func (f *Framework) BeforeSuite() {
 	f.DeployComponents()
 
 	time.Sleep(1 * time.Minute)
-	err := f.ensureServiceWithTimeout("api7ee3-dashboard", _namespace, 1, 300)
-	Expect(err).ShouldNot(HaveOccurred(), "ensuring dashboard service")
-
-	err = f.newDashboardTunnel()
+	err := f.newDashboardTunnel()
 	f.Logf("Dashboard HTTP Tunnel:" + _dashboardHTTPTunnel.Endpoint())
 	Expect(err).ShouldNot(HaveOccurred(), "creating dashboard tunnel")
 
@@ -200,12 +196,9 @@ func (f *Framework) deploy() {
 
 	buf := bytes.NewBuffer(nil)
 	_ = valuesTemplate.Execute(buf, map[string]any{
-		"DB":                      _db,
-		"DSN":                     getDSN(),
-		"Tag":                     dashboardVersion,
-		"PostgresImageRegistry":   postgresImageRegistry,
-		"PostgresImageRepository": postgresImageRepository,
-		"PostgresImageTag":        postgresImageTag,
+		"DB":  _db,
+		"DSN": getDSN(),
+		"Tag": dashboardVersion,
 	})
 
 	f.Logf("values: %s", buf.String())
@@ -219,15 +212,10 @@ func (f *Framework) deploy() {
 	}
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "install dashboard")
 
-	_, err = k8s.GetServiceE(GinkgoT(), f.kubectlOpts, "api7ee3-dashboard")
+	err = f.ensureService("api7ee3-dashboard", _namespace, 1)
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "ensuring dashboard service")
 
-	err = WaitPodsAvailableWithTimeout(f.GinkgoT, f.kubectlOpts, metav1.ListOptions{
-		LabelSelector: "app.kubernetes.io/instance=api7ee3,app.kubernetes.io/name=postgresql,app.kubernetes.io/component=primary",
-	}, 5*time.Minute)
-	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "waiting for postgres pod ready")
-
-	err = f.ensureServiceWithTimeout("api7-postgresql", _namespace, 1, 300)
+	err = f.ensureService("api7-postgresql", _namespace, 1)
 	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "ensuring postgres service")
 }
 

test/e2e/framework/k8s.go

@@ -261,19 +261,12 @@ func (f *Framework) applySSLSecret(namespace, name string, cert, pkey, caCert []
 }
 
 func WaitPodsAvailable(t testing.TestingT, kubeOps *k8s.KubectlOptions, opts metav1.ListOptions) error {
-	return WaitPodsAvailableWithTimeout(t, kubeOps, opts, 2*time.Minute)
-}
-
-func WaitPodsAvailableWithTimeout(t testing.TestingT, kubeOps *k8s.KubectlOptions, opts metav1.ListOptions, timeout time.Duration) error {
-	var lastErr error
 	condFunc := func() (bool, error) {
 		items, err := k8s.ListPodsE(t, kubeOps, opts)
 		if err != nil {
-			lastErr = err
 			return false, err
 		}
 		if len(items) == 0 {
-			lastErr = fmt.Errorf("no pods found for selector %q", opts.LabelSelector)
 			return false, nil
 		}
 		for _, item := range items {
@@ -284,60 +277,23 @@ func WaitPodsAvailableWithTimeout(t testing.TestingT, kubeOps *k8s.KubectlOption
 				}
 				foundPodReady = true
 				if cond.Status != "True" {
-					lastErr = fmt.Errorf("pod %s is not ready: %s", item.Name, describePodStatus(item))
 					return false, nil
 				}
 			}
 			if !foundPodReady {
-				lastErr = fmt.Errorf("pod %s has no Ready condition: %s", item.Name, describePodStatus(item))
 				return false, nil
 			}
 		}
 		return true, nil
 	}
-	err := waitConstantIntervalWithTimeout(condFunc, timeout)
-	if err != nil && lastErr != nil {
-		return lastErr
-	}
-	return err
-}
-
-func describePodStatus(pod corev1.Pod) string {
-	conditions := make([]string, 0, len(pod.Status.Conditions))
-	for _, cond := range pod.Status.Conditions {
-		conditions = append(conditions, fmt.Sprintf("%s=%s", cond.Type, cond.Status))
-	}
-
-	containerStates := make([]string, 0, len(pod.Status.ContainerStatuses))
-	for _, status := range pod.Status.ContainerStatuses {
-		state := "unknown"
-		switch {
-		case status.State.Waiting != nil:
-			state = fmt.Sprintf("waiting(%s:%s)", status.State.Waiting.Reason, status.State.Waiting.Message)
-		case status.State.Terminated != nil:
-			state = fmt.Sprintf("terminated(%s:%s)", status.State.Terminated.Reason, status.State.Terminated.Message)
-		case status.State.Running != nil:
-			state = "running"
-		}
-		containerStates = append(containerStates, fmt.Sprintf("%s=%s", status.Name, state))
-	}
-
-	return fmt.Sprintf("phase=%s conditions=[%s] containers=[%s]",
-		pod.Status.Phase,
-		strings.Join(conditions, ", "),
-		strings.Join(containerStates, ", "),
-	)
+	return waitExponentialBackoff(condFunc)
 }
 
-func waitConstantIntervalWithTimeout(condFunc func() (bool, error), timeout time.Duration) error {
-	steps := int(timeout / (2 * time.Second))
-	if steps < 1 {
-		steps = 1
-	}
+func waitExponentialBackoff(condFunc func() (bool, error)) error {
 	backoff := wait.Backoff{
-		Duration: 2 * time.Second,
-		Factor:   1,
-		Steps:    steps,
+		Duration: 500 * time.Millisecond,
+		Factor:   2,
+		Steps:    8,
 	}
 	return wait.ExponentialBackoff(backoff, condFunc)
 }