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.

Sign up for GitHub

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

Jump to bottom

Fix e2e regressions #2327

Merged
merged 5 commits into from
Feb 7, 2024
Merged

Fix e2e regressions #2327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20485a2
Fix to deploy vald-agent-config
ykadowak Feb 7, 2024
3655454
fix vald-agent-ngt to vald-agent
ykadowak Feb 7, 2024
b5b9fdd
fix vald-agent-ngt to vald-agent
ykadowak Feb 7, 2024
ea0a5f8
fix e2e max dim
ykadowak Feb 7, 2024
10520c7
fix apply to delete
ykadowak Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/e2e-max-dim.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:

sleep 3

kubectl rollout restart statefulset vald-agent-ngt
kubectl rollout restart statefulset vald-agent

sleep 30

Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
echo "MAX_BIT=${BIT}"
env:
DEFAULT_IMAGE_TAG: ${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }}
WAIT_FOR_SELECTOR: app=vald-agent-ngt
WAIT_FOR_SELECTOR: app=vald-agent
WAIT_FOR_TIMEOUT: 29m
VALUES: .github/helm/values/values-max-dim.yaml
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ jobs:
with:
helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }}
values: .github/helm/values/values-readreplica.yaml
wait_for_selector: app=vald-agent-ngt
wait_for_selector: app=vald-agent

- name: Deploy Vald Read Replica
id: deploy_vald_readreplica
Expand Down
2 changes: 2 additions & 0 deletions Makefile.d/k8s.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ k8s/vald/deploy:
@echo "Permitting error because there's some cases nothing to apply"
kubectl apply -f $(TEMP_DIR)/vald/templates/manager/index || true
kubectl apply -f $(TEMP_DIR)/vald/templates/agent || true
kubectl apply -f $(TEMP_DIR)/vald/templates/agent/ngt || true
kubectl apply -f $(TEMP_DIR)/vald/templates/agent/readreplica || true
kubectl apply -f $(TEMP_DIR)/vald/templates/discoverer || true
kubectl apply -f $(TEMP_DIR)/vald/templates/gateway || true
Expand Down Expand Up @@ -152,6 +153,7 @@ k8s/vald/delete:
kubectl delete -f $(TEMP_DIR)/vald/templates/manager/index
kubectl delete -f $(TEMP_DIR)/vald/templates/discoverer
kubectl delete -f $(TEMP_DIR)/vald/templates/agent/readreplica || true
kubectl delete -f $(TEMP_DIR)/vald/templates/agent/ngt || true
kubectl delete -f $(TEMP_DIR)/vald/templates/agent
kubectl delete -f $(TEMP_DIR)/vald/crds
rm -rf $(TEMP_DIR)
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/crud/crud_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,8 @@ func TestE2EIndexJobCorrection(t *testing.T) {
}

t.Log("Test case 2: execute index correction after one agent removed")
t.Log("removing vald-agent-ngt-0...")
cmd := exec.CommandContext(ctx, "sh", "-c", "kubectl delete pod vald-agent-ngt-0 && kubectl wait --for=condition=Ready pod/vald-agent-ngt-0")
t.Log("removing vald-agent-0...")
cmd := exec.CommandContext(ctx, "sh", "-c", "kubectl delete pod vald-agent-0 && kubectl wait --for=condition=Ready pod/vald-agent-0")
out, err := cmd.Output()
if err != nil {
if exitErr, ok := err.(*exec.ExitError); ok {
Expand Down Expand Up @@ -853,12 +853,12 @@ func TestE2EReadReplica(t *testing.T) {
sleep(t, waitAfterInsertDuration)

t.Log("starting to restart all the agent pods to make it backup index to pvc...")
if err := kubectl.RolloutResource(ctx, t, "statefulsets/vald-agent-ngt"); err != nil {
if err := kubectl.RolloutResource(ctx, t, "statefulsets/vald-agent"); err != nil {
t.Fatalf("failed to restart all the agent pods: %s", err)
}

t.Log("starting to create read replica rotators...")
pods, err := kubeClient.GetPods(ctx, namespace, "app=vald-agent-ngt")
pods, err := kubeClient.GetPods(ctx, namespace, "app=vald-agent")
if err != nil {
t.Fatalf("GetPods failed: %s", err)
}
Expand Down