fix unintended ignore directory

vdaas · Dec 17, 2024 · 4fc3c91 · 4fc3c91
1 parent 75fabd9
commit 4fc3c91
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 22 deletions.
diff --git a/.github/actions/e2e-deploy-vald-readreplica/action.yaml b/.github/actions/e2e-deploy-vald-readreplica/action.yaml
@@ -69,8 +69,6 @@ runs:
 
         sleep 3
 
-        kubectl wait --for=condition=ready pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
-
         kubectl get pods
 
         podname=`kubectl get pods --selector=${WAIT_FOR_SELECTOR} | tail -1 | awk '{print $1}'`
@@ -89,8 +87,6 @@ runs:
 
         sleep 3
 
-        kubectl wait --for=condition=ready pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
-
         kubectl get pods
 
         podname=`kubectl get pods --selector=${WAIT_FOR_SELECTOR} | tail -1 | awk '{print $1}'`

diff --git a/.github/actions/e2e-deploy-vald/action.yaml b/.github/actions/e2e-deploy-vald/action.yaml
@@ -79,7 +79,8 @@ runs:
 
         sleep 3
 
-        kubectl wait --for=condition=ready pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
+        kubectl wait --for=condition=Ready pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
+        kubectl wait --for=condition=ContainersReady pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
 
         kubectl get pods
 
@@ -99,7 +100,8 @@ runs:
 
         sleep 3
 
-        kubectl wait --for=condition=ready pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
+        kubectl wait --for=condition=Ready pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
+        kubectl wait --for=condition=ContainersReady pod -l ${WAIT_FOR_SELECTOR} --timeout=${WAIT_FOR_TIMEOUT}
 
         kubectl get pods
 

diff --git a/.github/helm/values/values-readreplica.yaml b/.github/helm/values/values-readreplica.yaml
@@ -59,6 +59,8 @@ agent:
     snapshot_classname: "csi-hostpath-snapclass"
     hpa:
       enabled: true
+    name: vald-agent-readreplica
+    volume_name: vald-agent-readreplica-pvc
 discoverer:
   minReplicas: 1
   hpa:

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -316,16 +316,15 @@ 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
+        with:
+          helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }}
+          values: .github/helm/values/values-readreplica.yaml
+      - 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
@@ -347,7 +346,7 @@ jobs:
             E2E_TARGET_NAMESPACE=default \
             e2e/readreplica
         env:
-          POD_NAME: ${{ steps.deploy_vald_readreplica.outputs.POD_NAME }}
+          POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }}
   e2e-stream-crud-with-mirror:
     name: "E2E test (Stream CRUD) with mirror"
     needs: [detect-ci-container]

diff --git a/.gitignore b/.gitignore
@@ -59,8 +59,8 @@ telepresence.log
 
 # Generated by Cargo
 # will have compiled files and executables
-debug/
-target/
+rust/debug/
+rust/target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

diff --git a/Makefile.d/e2e.mk b/Makefile.d/e2e.mk
@@ -151,22 +151,22 @@ 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
 	pod_name=$$(kubectl get pods --selector="app=$(LB_GATEWAY_IMAGE)" | tail -1 | awk '{print $$1}'); \
 	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
@@ -262,8 +262,10 @@ k8s/vald-readreplica/deploy:
 		--output-dir $(TEMP_DIR) \
 		charts/vald-readreplica
 	kubectl apply -f $(TEMP_DIR)/vald-readreplica/templates
-	sleep 2
-	kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=vald-readreplica --timeout=600s
+	sleep 5
+
+	# 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

diff --git a/k8s/debug/kind/e2e.yaml b/k8s/debug/kind/e2e.yaml
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2019-2024 vdaas.org vald team <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  apiServerAddress: "127.0.0.1"
+  apiServerPort: 6443