Revert "Add index correction helm templates and E2E (#2200)"

This reverts commit 366cd02.
vdaas · Nov 30, 2023 · 1f1adbb · 1f1adbb
1 parent 8173d8c
commit 1f1adbb
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 1,410 deletions.
diff --git a/.github/helm/values/values-lb.yaml b/.github/helm/values/values-lb.yaml
@@ -69,8 +69,3 @@ manager:
       auto_index_duration_limit: 2m
       auto_index_check_duration: 30s
       auto_index_length: 1000
-    corrector:
-      enabled: true
-      # suspend because you do not want corrector to start automatically in CI
-      # instead run it manually
-      suspend: true
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -227,42 +227,6 @@ jobs:
         env:
           POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }}
 
-  e2e-jobs:
-    name: "E2E test (Jobs)"
-    needs: [dump-contexts-to-log]
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set Git config
-        run: |
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Setup E2E environment
-        id: setup_e2e
-        uses: ./.github/actions/setup-e2e
-
-      - name: Deploy Vald
-        id: deploy_vald
-        uses: ./.github/actions/e2e-deploy-vald
-        with:
-          helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }}
-          values: .github/helm/values/values-lb.yaml
-          wait_for_selector: app=vald-lb-gateway
-
-      - name: Run E2E Jobs
-        run: |
-          make hack/benchmark/assets/dataset/${{ env.DATASET }}
-          make E2E_BIND_PORT=8081 \
-            E2E_INSERT_COUNT=10000\
-            E2E_WAIT_FOR_CREATE_INDEX_DURATION=3m \
-            E2E_TARGET_POD_NAME=${POD_NAME} \
-            E2E_TARGET_NAMESPACE=default \
-            e2e/index/job/correction
-        env:
-          POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }}
-
   e2e-agent-and-sidecar:
     name: "E2E Agent & Sidecar test"
     needs: [dump-contexts-to-log]
@@ -314,7 +278,6 @@ jobs:
       - e2e-stream-crud
       - e2e-stream-crud-for-operator
       - e2e-stream-crud-skip-exist-check
-      - e2e-jobs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

diff --git a/Makefile.d/build.mk b/Makefile.d/build.mk
@@ -209,7 +209,7 @@ cmd/manager/index/index: \
 cmd/index/job/correction/index-correction: \
 	$(GO_SOURCES_INTERNAL) \
 	$(PBGOS) \
-	$(shell find $(ROOTDIR)/cmd/index/job/correction -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \
+	$(shell find $(ROOTDIR)/cmd/index/job/correction/correction -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \
 	$(shell find $(ROOTDIR)/pkg/index/job/correction -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go')
 	$(eval CGO_ENABLED = 0)
 	CGO_ENABLED=$(CGO_ENABLED) \

diff --git a/Makefile.d/e2e.mk b/Makefile.d/e2e.mk
@@ -69,11 +69,6 @@ e2e/remove/timestamp:
 e2e/insert/search:
 	$(call run-e2e-crud-test,-run TestE2EInsertAndSearch)
 
-.PHONY: e2e/index/job/correction
-## run index correction job e2e
-e2e/index/job/correction:
-	$(call run-e2e-crud-test,-run TestE2EIndexJobCorrection)
-
 .PHONY: e2e/maxdim
 ## run e2e/maxdim
 e2e/maxdim:
@@ -84,3 +79,4 @@ e2e/maxdim:
 e2e/sidecar:
 	$(call run-e2e-sidecar-test,-run TestE2EForSidecar)
 
+
diff --git a/Makefile.d/k8s.mk b/Makefile.d/k8s.mk
@@ -23,26 +23,22 @@ k8s/manifest/clean:
 		k8s/agent \
 		k8s/discoverer \
 		k8s/gateway \
-		k8s/manager \
-		k8s/index
+		k8s/manager
 
 .PHONY: k8s/manifest/update
 ## update k8s manifests using helm templates
 k8s/manifest/update: \
 	k8s/manifest/clean
 	helm template \
-		--values $(HELM_VALUES) \
-		--set defaults.image.tag=$(VERSION) \
-		--output-dir $(TEMP_DIR) \
-		charts/vald
+	    --values $(HELM_VALUES) \
+	    --output-dir $(TEMP_DIR) \
+	    charts/vald
 	mkdir -p k8s/gateway
 	mkdir -p k8s/manager
-	mkdir -p k8s/index/job
 	mv $(TEMP_DIR)/vald/templates/agent k8s/agent
 	mv $(TEMP_DIR)/vald/templates/discoverer k8s/discoverer
 	mv $(TEMP_DIR)/vald/templates/gateway/lb k8s/gateway/lb
 	mv $(TEMP_DIR)/vald/templates/manager/index k8s/manager/index
-	mv $(TEMP_DIR)/vald/templates/index/job/correction k8s/index/job/correction
 	rm -rf $(TEMP_DIR)
 
 .PHONY: k8s/manifest/helm-operator/clean
@@ -84,7 +80,6 @@ k8s/vald/deploy:
 	kubectl apply -f $(TEMP_DIR)/vald/templates/agent || true
 	kubectl apply -f $(TEMP_DIR)/vald/templates/discoverer || true
 	kubectl apply -f $(TEMP_DIR)/vald/templates/gateway/lb || true
-	kubectl apply -f $(TEMP_DIR)/vald/templates/index/job/correction || true
 	rm -rf $(TEMP_DIR)
 	kubectl get pods -o jsonpath="{.items[*].spec.containers[*].image}" | tr " " "\n"
 
@@ -102,7 +97,6 @@ k8s/vald/delete:
 	    --set manager.index.image.repository=$(CRORG)/$(MANAGER_INDEX_IMAGE) \
 	    --output-dir $(TEMP_DIR) \
 	    charts/vald
-	kubectl delete -f $(TEMP_DIR)/vald/templates/index/job/correction
 	kubectl delete -f $(TEMP_DIR)/vald/templates/gateway/lb
 	kubectl delete -f $(TEMP_DIR)/vald/templates/manager/index
 	kubectl delete -f $(TEMP_DIR)/vald/templates/discoverer