Skip to content

Commit cd09e84

Browse files
committed
fix(ci)
Signed-off-by: András Jáky <ajaky@cisco.com> Signed-off-by: András Jáky <ajaky@cisco.com>
1 parent e65a860 commit cd09e84

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

e2e/deploy/workloads/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: StatefulSet
33
metadata:
44
name: reloader-test-statefulset
55
spec:
6-
replicas: 2
6+
replicas: 1
77
selector:
88
matchLabels:
99
app.kubernetes.io/name: reloader-test-statefulset

e2e/reloader_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package e2e
2020
import (
2121
"context"
2222
"encoding/json"
23+
"fmt"
2324
"os"
2425
"testing"
2526
"time"
@@ -165,18 +166,19 @@ func workloadsAvailable(cfg *envconf.Config) error {
165166
return obj.(*appsv1.DaemonSet).Status.NumberReady == obj.(*appsv1.DaemonSet).Status.DesiredNumberScheduled
166167
}), wait.WithTimeout(10*time.Minute))
167168
if err != nil {
168-
return err
169+
return fmt.Errorf("reloader-test-daemonset: %w", err)
169170
}
170171

171172
// wait for the statefulset to become available
172173
statefulSet := &appsv1.StatefulSet{
173174
ObjectMeta: metav1.ObjectMeta{Name: "reloader-test-statefulset", Namespace: cfg.Namespace()},
174175
}
175176
err = wait.For(conditions.New(cfg.Client().Resources()).ResourceMatch(statefulSet, func(obj k8s.Object) bool {
177+
println(fmt.Sprintf("readyReplicas: %d, specReplicas: %d, statusReplicas: %d, availableReplicas: %d, currentReplicas: %d", obj.(*appsv1.StatefulSet).Status.ReadyReplicas, *obj.(*appsv1.StatefulSet).Spec.Replicas, obj.(*appsv1.StatefulSet).Status.Replicas, obj.(*appsv1.StatefulSet).Status.AvailableReplicas, obj.(*appsv1.StatefulSet).Status.CurrentReplicas))
176178
return obj.(*appsv1.StatefulSet).Status.ReadyReplicas == *obj.(*appsv1.StatefulSet).Spec.Replicas
177179
}), wait.WithTimeout(10*time.Minute))
178180
if err != nil {
179-
return err
181+
return fmt.Errorf("reloader-test-statefulset: %w", err)
180182
}
181183

182184
// wait for the deployments to become available
@@ -185,23 +187,23 @@ func workloadsAvailable(cfg *envconf.Config) error {
185187
}
186188
err = wait.For(conditions.New(cfg.Client().Resources()).DeploymentConditionMatch(deploymentToBeReloaded, appsv1.DeploymentAvailable, v1.ConditionTrue), wait.WithTimeout(10*time.Minute))
187189
if err != nil {
188-
return err
190+
return fmt.Errorf("reloader-test-deployment-to-be-reloaded: %w", err)
189191
}
190192

191193
deploymentNoReload := &appsv1.Deployment{
192194
ObjectMeta: metav1.ObjectMeta{Name: "reloader-test-deployment-no-reload", Namespace: cfg.Namespace()},
193195
}
194196
err = wait.For(conditions.New(cfg.Client().Resources()).DeploymentConditionMatch(deploymentNoReload, appsv1.DeploymentAvailable, v1.ConditionTrue), wait.WithTimeout(10*time.Minute))
195197
if err != nil {
196-
return err
198+
return fmt.Errorf("reloader-test-deployment-no-reload: %w", err)
197199
}
198200

199201
deploymentFixedVersionsNoReload := &appsv1.Deployment{
200202
ObjectMeta: metav1.ObjectMeta{Name: "reloader-test-deployment-fixed-versions-no-reload", Namespace: cfg.Namespace()},
201203
}
202204
err = wait.For(conditions.New(cfg.Client().Resources()).DeploymentConditionMatch(deploymentFixedVersionsNoReload, appsv1.DeploymentAvailable, v1.ConditionTrue), wait.WithTimeout(10*time.Minute))
203205
if err != nil {
204-
return err
206+
return fmt.Errorf("reloader-test-deployment-fixed-versions-no-reload: %w", err)
205207
}
206208

207209
return nil

0 commit comments

Comments
 (0)