From fe9247fcf2ec33d38c5c115f874de4bfac85310f Mon Sep 17 00:00:00 2001 From: Kosuke Morimoto Date: Tue, 17 Dec 2024 15:35:21 +0900 Subject: [PATCH] fix --- .github/workflows/e2e.yaml | 14 +++++++------- Makefile.d/e2e.mk | 8 ++++---- Makefile.d/k8s.mk | 8 ++------ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index a5b41c79a4..69a0635969 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -316,13 +316,6 @@ jobs: with: require_k3d: "false" require_kind: "true" - - 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-readreplica.yaml - wait_for_selector: app=vald-agent - name: Deploy Vald Read Replica id: deploy_vald_readreplica uses: ./.github/actions/e2e-deploy-vald-readreplica @@ -330,6 +323,13 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-readreplica.yaml wait_for_selector: app=vald-lb-gateway + - 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-readreplica.yaml + wait_for_selector: app=vald-agent - name: Run E2E CRUD with read replica rotation run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} diff --git a/Makefile.d/e2e.mk b/Makefile.d/e2e.mk index ad38fcda82..92c74f3dcf 100644 --- a/Makefile.d/e2e.mk +++ b/Makefile.d/e2e.mk @@ -151,14 +151,14 @@ e2e/actions/run/readreplica: \ kubectl wait -n kube-system --for=condition=Ready pod -l app.kubernetes.io/name=metrics-server --timeout=$(E2E_WAIT_FOR_START_TIMEOUT) kubectl wait -n kube-system --for=condition=ContainersReady pod -l app.kubernetes.io/name=metrics-server --timeout=$(E2E_WAIT_FOR_START_TIMEOUT) sleep 3 + $(MAKE) k8s/vald-readreplica/deploy \ + HELM_VALUES=$(ROOTDIR)/.github/helm/values/values-readreplica.yaml + sleep 3 $(MAKE) k8s/vald/deploy \ HELM_VALUES=$(ROOTDIR)/.github/helm/values/values-readreplica.yaml sleep 20 kubectl wait --for=condition=Ready pod -l "app=$(AGENT_IMAGE)" --timeout=$(E2E_WAIT_FOR_START_TIMEOUT) kubectl wait --for=condition=ContainersReady pod -l "app=$(AGENT_IMAGE)" --timeout=$(E2E_WAIT_FOR_START_TIMEOUT) - $(MAKE) k8s/vald-readreplica/deploy \ - HELM_VALUES=$(ROOTDIR)/.github/helm/values/values-readreplica.yaml - sleep 3 kubectl wait --for=condition=Ready pod -l "app=$(LB_GATEWAY_IMAGE)" --timeout=$(E2E_WAIT_FOR_START_TIMEOUT) kubectl wait --for=condition=ContainersReady pod -l "app=$(LB_GATEWAY_IMAGE)" --timeout=$(E2E_WAIT_FOR_START_TIMEOUT) kubectl get pods @@ -166,7 +166,7 @@ e2e/actions/run/readreplica: \ echo $$pod_name; \ $(MAKE) E2E_TARGET_POD_NAME=$$pod_name e2e/readreplica $(MAKE) k8s/vald/delete - $(MAKE) minikube/delete + $(MAKE) kind/vs/stop .PHONY: e2e/actions/run/stream/crud/skip ## run GitHub Actions E2E test (Stream CRUD with SkipExistsCheck = true) diff --git a/Makefile.d/k8s.mk b/Makefile.d/k8s.mk index 19c36e78f1..dfd1522718 100644 --- a/Makefile.d/k8s.mk +++ b/Makefile.d/k8s.mk @@ -263,13 +263,9 @@ k8s/vald-readreplica/deploy: charts/vald-readreplica kubectl apply -f $(TEMP_DIR)/vald-readreplica/templates sleep 5 - kubectl get pods - kubectl delete pod --selector=app=vald-lb-gateway - sleep 5 - - kubectl get pods - kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=vald-readreplica --timeout=1200s + # kubectl get pods + # kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=vald-readreplica --timeout=600s .PHONY: k8s/vald-readreplica/delete ## delete vald-helm-operator from k8s