First pass v2.5.1 (#62)

Signed-off-by: Michael Mattsson <[email protected]>

Dockerfile

@@ -1,8 +1,8 @@
-FROM alpine:3
+FROM alpine:3.20.2
 ADD requirements.txt /
 RUN apk add --no-cache python3 py3-pip && \
     python3 -m venv /app && \
     /app/bin/pip install -r requirements.txt
 ADD truenascsp/*.py /app/
 WORKDIR /app
-ENTRYPOINT [ "/app/bin/gunicorn", "--workers", "3", "--bind", "0.0.0.0:8080", "--timeout", "180", "csp:SERVE" ]
+ENTRYPOINT [ "/app/bin/gunicorn", "--workers", "3", "--bind", "0.0.0.0:8080", "--timeout", "180", "--preload", "csp:SERVE" ]

Makefile

@@ -50,7 +50,7 @@ test:
 		$(csp)/containers/v1/volumes/tank_my-new-volume16 -f
 
 	# Delete thick volume
-	$(curl) $(curl_args) -XDELETE -H 'Content-Type: application/json' \
+	- $(curl) $(curl_args) -XDELETE -H 'Content-Type: application/json' \
 		-H 'X-Auth-Token: $(password)' -H 'X-Array-IP: $(backend)' \
 		$(csp)/containers/v1/volumes/tank_my-new-volume18 -f
 
@@ -85,8 +85,6 @@ test:
 		-H 'X-Auth-Token: $(password)' -H 'X-Array-IP: $(backend)' \
 		$(csp)/containers/v1/volumes -f
 
-	sleep 120
-
 	# Get volume
 	$(curl) $(curl_args) -XGET -H 'X-Auth-Token: $(password)' -H 'X-Array-IP: $(backend)' \
 		$(csp)/containers/v1/volumes?name=my-new-volume16 -f
@@ -166,11 +164,11 @@ test:
 		$(csp)/containers/v1/volumes/tank_my-new-volume18 -f
 
 	# Delete host 1
-	$(curl) $(curl_args) -XDELETE -H 'Content-Type: application/json' \
+	- $(curl) $(curl_args) -XDELETE -H 'Content-Type: application/json' \
 		-H 'X-Auth-Token: $(password)' -H 'X-Array-IP: $(backend)' \
 		$(csp)/containers/v1/hosts/41302701-0196-420f-b319-834a79891db0 -f
 
 	# Delete host 2
-	$(curl) $(curl_args) -XDELETE -H 'Content-Type: application/json' \
+	- $(curl) $(curl_args) -XDELETE -H 'Content-Type: application/json' \
 		-H 'X-Auth-Token: $(password)' -H 'X-Array-IP: $(backend)' \
 		$(csp)/containers/v1/hosts/41302701-0196-420f-b319-834a79891db1 -f

e2e/job-rwo.yaml

@@ -11,7 +11,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: csi-e2e
-          image: quay.io/datamattsson/csi-e2e:v2.4.0
+          image: quay.io/datamattsson/csi-e2e:v2.5.0
           command:
           - runner.sh
           args:

requirements.txt

@@ -1,3 +1,3 @@
 falcon==2.0.0
-gunicorn
-requests
+gunicorn==23.0.0
+requests==2.32.3