Skip to content

Commit

Permalink
Update default image list in action.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
ykadowak committed Mar 18, 2024
1 parent cf28af4 commit 6cdac9f
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .github/actions/detect-docker-image-tags/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ inputs:
images:
description: "Image names"
required: false
default: "vdaas/vald-agent-ngt vdaas/vald-agent-faiss vdaas/vald-agent-sidecar vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-filter-gateway vdaas/vald-mirror-gateway vdaas/vald-manager-index"
default: "vdaas/vald-agent-ngt vdaas/vald-agent-faiss vdaas/vald-agent-sidecar vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-filter-gateway vdaas/vald-mirror-gateway vdaas/vald-manager-index vdaas/vald-index-operator vdaas/vald-readreplica-rotate"
outputs:
HELM_EXTRA_OPTIONS:
description: "Helm extra options that specifies image tags"
Expand All @@ -49,8 +49,10 @@ runs:
["vdaas/vald-manager-index"]="manager.index.image.tag"
["vdaas/vald-index-creation"]="manager.index.creator.image.tag"
["vdaas/vald-index-save"]="manager.index.saver.image.tag"
["vdaas/vald-readreplica-rotate"]="manager.index.readreplica.rotator.image.tag"
["vdaas/vald-helm-operator"]="image.tag"
["vdaas/vald-ci-container"]=""
["vdaas/vald-index-operator"]="manager.index.operator.image.tag"
)
for image in ${IMAGES}; do
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-e2e/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ inputs:
target_images:
description: "Image names"
required: false
default: "vdaas/vald-agent-ngt vdaas/vald-agent-faiss vdaas/vald-agent-sidecar vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-filter-gateway vdaas/vald-mirror-gateway vdaas/vald-manager-index"
default: "vdaas/vald-agent-ngt vdaas/vald-agent-faiss vdaas/vald-agent-sidecar vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-filter-gateway vdaas/vald-mirror-gateway vdaas/vald-manager-index vdaas/vald-index-operator vdaas/vald-readreplica-rotate"
outputs:
HELM_EXTRA_OPTIONS:
description: "Helm extra options that specifies E2E target image tags"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/wait-for-docker-image/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inputs:
images:
description: "image names"
required: false
default: "vdaas/vald-agent-ngt vdaas/vald-agent-faiss vdaas/vald-agent-sidecar vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-filter-gateway vdaas/vald-mirror-gateway vdaas/vald-manager-index"
default: "vdaas/vald-agent-ngt vdaas/vald-agent-faiss vdaas/vald-agent-sidecar vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-filter-gateway vdaas/vald-mirror-gateway vdaas/vald-manager-index vdaas/vald-index-operator vdaas/vald-readreplica-rotate"
outputs: {}
runs:
using: "composite"
Expand Down
4 changes: 1 addition & 3 deletions .github/helm/values/values-readreplica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ manager:
memory: 30Mi
indexer:
auto_index_duration_limit: 2m
auto_index_check_duration: 10s
auto_save_index_duration_limit: 2m
auto_save_index_wait_duration: 10s
auto_index_check_duration: 30s
auto_index_length: 1000
readreplica:
rotator:
Expand Down
10 changes: 8 additions & 2 deletions tests/e2e/crud/crud_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ func TestE2EIndexJobCorrection(t *testing.T) {
t.Fatalf("an error occurred: %s", err)
}
}

// TestE2EReadReplica tests that search requests succeed with read replica resources.
func TestE2EReadReplica(t *testing.T) {
t.Cleanup(teardown)

Expand Down Expand Up @@ -862,7 +862,13 @@ func TestE2EReadReplica(t *testing.T) {

t.Log("index operator should be creating read replica rotator jobs")
t.Log("waiting for read replica rotator jobs to complete...")
if err := kubectl.WaitResources(ctx, t, "job", "app=vald-readreplica-rotate", "complete", "120s"); err != nil {
if err := kubectl.WaitResources(ctx, t, "job", "app=vald-readreplica-rotate", "complete", "60s"); err != nil {
t.Log("wait failed. printing yaml of vald-readreplica-rotate")
kubectl.KubectlCmd(ctx, t, "get", "pod", "-l", "app=vald-readreplica-rotate", "-oyaml")
t.Log("wait failed. printing log of vald-index-operator")
kubectl.DebugLog(ctx, t, "app=vald-index-operator")
t.Log("wait failed. printing log of vald-readreplica-rotate")
kubectl.DebugLog(ctx, t, "app=vald-readreplica-rotate")
t.Fatalf("failed to wait for read replica rotator jobs to complete: %s", err)
}

Expand Down
12 changes: 12 additions & 0 deletions tests/e2e/kubernetes/kubectl/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ func WaitResources(ctx context.Context, t *testing.T, resource, labelSelector, c
return runCmd(t, cmd)
}

func DebugLog(ctx context.Context, t *testing.T, label string) error {
t.Helper()
cmd := exec.CommandContext(ctx, "kubectl", "logs", "-l", label, "--tail=-1")
return runCmd(t, cmd)
}

func KubectlCmd(ctx context.Context, t *testing.T, subcmds ...string) error {
t.Helper()
cmd := exec.CommandContext(ctx, "kubectl", subcmds...)
return runCmd(t, cmd)
}

func runCmd(t *testing.T, cmd *exec.Cmd) error {
t.Helper()
out, err := cmd.Output()
Expand Down

0 comments on commit 6cdac9f

Please sign in to comment.