Improve agent sts pvc tests (#185)

Co-authored-by: Robert Kaussow <[email protected]>
woodpecker-ci · Apr 18, 2024 · 092e60e · 092e60e
1 parent 8319618
commit 092e60e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/charts/woodpecker/charts/agent/templates/statefulset.yaml b/charts/woodpecker/charts/agent/templates/statefulset.yaml
@@ -88,7 +88,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if or (.Values.persistence.enabled) (.Values.extraVolumeMounts) }}
+      {{- if or (and (.Values.persistence.enabled) (.Values.persistence.existingClaim)) (.Values.extraVolumeMounts) }}
       volumes:
         {{- if .Values.persistence.enabled }}
         {{- if .Values.persistence.existingClaim }}
@@ -130,7 +130,4 @@ spec:
         resources:
           requests:
             storage: {{ .Values.persistence.size }}
-{{- else if (not .Values.persistence.enabled) }}
-        - name: data
-          emptyDir: {}
 {{- end }}
diff --git a/charts/woodpecker/charts/agent/unittests/statefulset/pvc.yaml b/charts/woodpecker/charts/agent/unittests/statefulset/pvc.yaml
@@ -2,27 +2,39 @@ suite: test deployment
 templates:
   - templates/statefulset.yaml
 tests:
-  - it: persistence is enabled
+  - it: persistence enabled
     set:
       persistence:
         enabled: true
     asserts:
       - equal:
           path: spec.volumeClaimTemplates[0].spec.accessModes[0]
           value: 'ReadWriteOnce'
-      # this should only exist with existingClaim and is otherwise taken care of automatically
-      - equal:
-          path: spec.template.spec.volumes
-          value: null
-  - it: persistence with existingClaim
+  - it: persistence enabled with existingClaim
     set:
       persistence:
         enabled: true
-        existingClaim: foo
+        existingClaim: 'my-claim'
     asserts:
+      - notExists:
+          path: spec.volumeClaimTemplates[0].spec.accessModes[0]
       - equal:
           path: spec.template.spec.volumes
           value:
-            - persistentVolumeClaim:
-                claimName: foo
-              name: agent-config
+            - name: agent-config
+              persistentVolumeClaim:
+                claimName: my-claim
+  - it: persistence disabled
+    set:
+      persistence:
+        enabled: false
+    asserts:
+      - notExists:
+          path: spec.template.spec.volumes
+      - notExists:
+          path: spec.template.spec.containers[0].volumeMounts
+          value:
+            - mountPath: /data
+              name: data
+      - notExists:
+          path: spec.volumeClaimTemplates