mirror of
https://github.com/coreos/prometheus-operator.git
synced 2026-02-05 06:45:27 +01:00
chore: update e2e tests to Kubernetes v1.27.3 (#5680)
* ci: Update to kube 1.27.3 and remove feature gate on minReadySeconds for sts * test:e2e: Remove gate for minReadySeconds tests * Bubble up Pod Phase in error for running and ready check * test: Add retry to WaitForPodsReady if Phase is Completed
This commit is contained in:
@@ -2184,7 +2184,6 @@ func testAMWeb(t *testing.T) {
|
||||
func testAlertManagerMinReadySeconds(t *testing.T) {
|
||||
// Don't run Alertmanager tests in parallel. See
|
||||
// https://github.com/prometheus/alertmanager/issues/1835 for details.
|
||||
runFeatureGatedTests(t)
|
||||
|
||||
testCtx := framework.NewTestCtx(t)
|
||||
defer testCtx.Cleanup(t)
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
# See https://kind.sigs.k8s.io/docs/user/configuration/
|
||||
# This allows starting a kind cluster with specific feature gates enabled
|
||||
kind: Cluster
|
||||
apiVersion: kind.x-k8s.io/v1alpha4
|
||||
name: kind
|
||||
featureGates:
|
||||
"StatefulSetMinReadySeconds": true
|
||||
|
||||
|
||||
@@ -68,6 +68,9 @@ func skipOperatorUpgradeTests(t *testing.T) {
|
||||
}
|
||||
|
||||
// feature gated tests need to be explicitly included
|
||||
// not currently in use
|
||||
//
|
||||
// nolint:all
|
||||
func runFeatureGatedTests(t *testing.T) {
|
||||
if os.Getenv("FEATURE_GATED_TESTS") != "include" {
|
||||
t.Skip("Skipping Feature Gated tests")
|
||||
|
||||
@@ -3919,7 +3919,6 @@ func testPromWebWithThanosSidecar(t *testing.T) {
|
||||
}
|
||||
|
||||
func testPromMinReadySeconds(t *testing.T) {
|
||||
runFeatureGatedTests(t)
|
||||
t.Parallel()
|
||||
|
||||
testCtx := framework.NewTestCtx(t)
|
||||
|
||||
@@ -216,7 +216,6 @@ func testTRPreserveUserAddedMetadata(t *testing.T) {
|
||||
}
|
||||
|
||||
func testTRMinReadySeconds(t *testing.T) {
|
||||
runFeatureGatedTests(t)
|
||||
t.Parallel()
|
||||
|
||||
testCtx := framework.NewTestCtx(t)
|
||||
|
||||
@@ -94,7 +94,7 @@ func (f *Framework) WaitForPodsReady(ctx context.Context, namespace string, time
|
||||
for _, p := range pl.Items {
|
||||
isRunningAndReady, err := k8sutil.PodRunningAndReady(p)
|
||||
if err != nil {
|
||||
return false, err
|
||||
return false, nil
|
||||
}
|
||||
|
||||
if isRunningAndReady {
|
||||
|
||||
Reference in New Issue
Block a user