test

minio · Oct 1, 2024 · feb7980 · feb7980
1 parent 14c5b8e
commit feb7980
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 165 deletions.
diff --git a/functests/base/kustomize-template.yaml b/functests/base/kustomize-template.yaml
diff --git a/functests/common.sh b/functests/common.sh
@@ -142,7 +142,19 @@ function install_directpv_kustomize() {
     directpv_client="$1"
     echo "* Installing DirectPV via kustomize"
 
-    kubectl apply -k base/
+    cat > kustomization.yaml <<EOF
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../resources/base
+
+images:
+  - name: quay.io/minio/directpv
+    newTag: ${VERSION}
+EOF
+
+    kubectl kustomize | kubectl apply -f -
 
     required_count="$2"
     running_count=0
@@ -183,15 +195,24 @@ function uninstall_directpv() {
     return 0
 }
 
-# uninstall_directpv_kustomize <plugin> <pod_count>
+# uninstall_directpv_kustomize  <pod_count>
 function uninstall_directpv_kustomize() {
-    directpv_client="$1"
-
     echo "* Uninstalling DirectPV via kustomize"
 
-    # delete hangs sometimes even after the resources are deleted
-    timeout 15s kubectl delete -k base/
+    cat > kustomization.yaml <<EOF
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../resources/base
 
+images:
+  - name: quay.io/minio/directpv
+    newTag: ${VERSION}
+EOF
+    # delete hangs sometimes even after the resources are deleted
+    kubectl kustomize | timeout 15s kubectl delete -f -
+
     pending="$2"
     while [[ $pending -gt 0 ]]; do
         echo "  ...waiting for ${pending} DirectPV pods to go down"

diff --git a/functests/kustomize-tests.sh b/functests/kustomize-tests.sh
diff --git a/functests/legacy/kustomize-template.yaml b/functests/legacy/kustomize-template.yaml
diff --git a/functests/migration-tests-kustomize.sh b/functests/migration-tests-kustomize.sh
diff --git a/functests/run-tests-kustomize.sh b/functests/run-tests-kustomize.sh
diff --git a/functests/tests.sh b/functests/tests.sh
@@ -25,7 +25,11 @@ function run_tests() {
     setup_lvm
     setup_luks
     pod_count=$(( 3 + ACTIVE_NODES ))
-    install_directpv "${DIRECTPV_DIR}/kubectl-directpv" "${pod_count}"
+    if [ "${KUSTOMIZE}" == "true" ]; then
+        install_directpv_kustomize "${DIRECTPV_DIR}/kubectl-directpv" "${pod_count}"
+    else
+        install_directpv "${DIRECTPV_DIR}/kubectl-directpv" "${pod_count}"
+    fi
     add_drives "${DIRECTPV_DIR}/kubectl-directpv"
     deploy_minio minio.yaml
     test_force_delete
@@ -34,7 +38,11 @@ function run_tests() {
     uninstall_minio "${DIRECTPV_DIR}/kubectl-directpv" minio.yaml
     test_volume_expansion "${DIRECTPV_DIR}/kubectl-directpv" sleep.yaml
     remove_drives "${DIRECTPV_DIR}/kubectl-directpv"
-    uninstall_directpv "${DIRECTPV_DIR}/kubectl-directpv" "${pod_count}"
+    if [ "${KUSTOMIZE}" == "true" ]; then
+        uninstall_directpv_kustomize  "${pod_count}"
+    else
+        uninstall_directpv "${DIRECTPV_DIR}/kubectl-directpv" "${pod_count}"    
+    fi
     unmount_directpv
     remove_luks
     remove_lvm