Merge branch 'main' into documentation/pull_request_and_issue_templat…

…e/update_versions_20240315_081342_220
vdaas · Mar 19, 2024 · 27e9c51 · 27e9c51
2 parents 0dc4564 + f8280b2
commit 27e9c51
Show file tree

Hide file tree

Showing 10 changed files with 359 additions and 29 deletions.
diff --git a/.github/actions/detect-docker-image-tags/action.yaml b/.github/actions/detect-docker-image-tags/action.yaml
@@ -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"
@@ -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

diff --git a/.github/actions/setup-e2e/action.yaml b/.github/actions/setup-e2e/action.yaml
@@ -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"

diff --git a/.github/actions/wait-for-docker-image/action.yaml b/.github/actions/wait-for-docker-image/action.yaml
@@ -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"

diff --git a/.github/helm/values/values-readreplica.yaml b/.github/helm/values/values-readreplica.yaml
@@ -48,6 +48,7 @@ agent:
     dimension: 784
     index_path: /var/ngt/index
     enable_in_memory_mode: false
+    enable_export_index_info_to_k8s: true
   persistentVolume:
     enabled: true
     accessMode: ReadWriteOnce
@@ -80,3 +81,6 @@ manager:
     readreplica:
       rotator:
         enabled: true
+    operator:
+      enabled: true
+      rotation_job_concurrency: 10
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -279,9 +279,6 @@ jobs:
   e2e-stream-crud-with-readreplica:
     name: "E2E test (Stream CRUD) with read replica"
     needs: [dump-contexts-to-log]
-    # FIXME: This job is disabled because it is not working properly for a moment.
-    #        Needs to fix TestE2EReadReplica not to use CronJob since there is no CronJob for read replica anymore.
-    if: false
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:

diff --git a/internal/k8s/client/client.go b/internal/k8s/client/client.go
@@ -67,6 +67,7 @@ type (
 	EnvVar             = corev1.EnvVar
 	Job                = batchv1.Job
 	JobList            = batchv1.JobList
+	JobStatus          = batchv1.JobStatus
 	CronJob            = batchv1.CronJob
 	Result             = reconcile.Result
 )

diff --git a/internal/test/testify/testify.go b/internal/test/testify/testify.go
@@ -24,3 +24,5 @@ type (
 const (
 	Anything = mock.Anything
 )
+
+var AnythingOfType = mock.AnythingOfType
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,3 +24,5 @@ type ( @@
     const (
     	Anything = mock.Anything
     )
+    var AnythingOfType = mock.AnythingOfType