From 07940c889b6b83d4a3f218d2bc8b89ed6c9733c5 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Thu, 11 Dec 2025 11:25:48 +0000 Subject: [PATCH 1/6] Add argo sync-options annotation to retain PVs --- helm/blueapi/templates/volumes.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm/blueapi/templates/volumes.yaml b/helm/blueapi/templates/volumes.yaml index 6f183d0250..b931be93af 100644 --- a/helm/blueapi/templates/volumes.yaml +++ b/helm/blueapi/templates/volumes.yaml @@ -5,6 +5,7 @@ metadata: name: {{ include "blueapi.fullname" . }}-scratch-{{ .Values.image.tag | default .Chart.AppVersion }} annotations: helm.sh/resource-policy: keep + argocd.argoproj.io/sync-options: Delete=false spec: accessModes: - ReadWriteMany From 9ee3f2e2fd85a9776b7c66a8f2c26cccbab1fdb4 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Fri, 19 Dec 2025 14:56:45 +0000 Subject: [PATCH 2/6] Fix test json --- tests/unit_tests/test_helm_chart.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unit_tests/test_helm_chart.py b/tests/unit_tests/test_helm_chart.py index e37772d8b1..01cd6e612e 100644 --- a/tests/unit_tests/test_helm_chart.py +++ b/tests/unit_tests/test_helm_chart.py @@ -600,7 +600,10 @@ def test_persistent_volume_claim_exists( "kind": "PersistentVolumeClaim", "metadata": { "name": "blueapi-scratch-0.1.0", - "annotations": {"helm.sh/resource-policy": "keep"}, + "annotations": { + "helm.sh/resource-policy": "keep", + "argocd.argoproj.io/sync-options": "Delete=false", + }, }, "spec": { "accessModes": ["ReadWriteMany"], From cf650e1f9790faab40cff9c417937ecb0a0b6a2d Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Thu, 15 Jan 2026 14:11:13 +0000 Subject: [PATCH 3/6] Add spec.volumeName to volumes --- helm/blueapi/templates/volumes.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm/blueapi/templates/volumes.yaml b/helm/blueapi/templates/volumes.yaml index b931be93af..4177da0672 100644 --- a/helm/blueapi/templates/volumes.yaml +++ b/helm/blueapi/templates/volumes.yaml @@ -12,4 +12,6 @@ spec: resources: requests: storage: 1Gi + storageClassName: "" + volumeName: {{ include "blueapi.fullname" . }}-scratch-{{ .Values.image.tag | default .Chart.AppVersion }} {{- end }} From a1e6d0eb5a5ea14ebe8163df071bc4f2c7cc9f05 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Fri, 16 Jan 2026 11:36:43 +0000 Subject: [PATCH 4/6] Remove volumeName, add Prune=false argocd sync option annotation --- helm/blueapi/templates/volumes.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/helm/blueapi/templates/volumes.yaml b/helm/blueapi/templates/volumes.yaml index 4177da0672..4d87e06703 100644 --- a/helm/blueapi/templates/volumes.yaml +++ b/helm/blueapi/templates/volumes.yaml @@ -4,14 +4,11 @@ kind: PersistentVolumeClaim metadata: name: {{ include "blueapi.fullname" . }}-scratch-{{ .Values.image.tag | default .Chart.AppVersion }} annotations: - helm.sh/resource-policy: keep - argocd.argoproj.io/sync-options: Delete=false + argocd.argoproj.io/sync-options: Prune=false,Delete=false spec: accessModes: - ReadWriteMany resources: requests: storage: 1Gi - storageClassName: "" - volumeName: {{ include "blueapi.fullname" . }}-scratch-{{ .Values.image.tag | default .Chart.AppVersion }} {{- end }} From 23f5a6774ff916bdc2c56344b33cd0429abfc1a4 Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Fri, 23 Jan 2026 14:08:44 +0000 Subject: [PATCH 5/6] Add ignore extraneous argocd flag --- helm/blueapi/templates/volumes.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm/blueapi/templates/volumes.yaml b/helm/blueapi/templates/volumes.yaml index 4d87e06703..a5d9e056fe 100644 --- a/helm/blueapi/templates/volumes.yaml +++ b/helm/blueapi/templates/volumes.yaml @@ -5,6 +5,7 @@ metadata: name: {{ include "blueapi.fullname" . }}-scratch-{{ .Values.image.tag | default .Chart.AppVersion }} annotations: argocd.argoproj.io/sync-options: Prune=false,Delete=false + argocd.argoproj.io/compare-options: IgnoreExtraneous spec: accessModes: - ReadWriteMany From 61854dbdc80ba617913f85f3c6f1080134a37aad Mon Sep 17 00:00:00 2001 From: Daniel Fernandes Date: Fri, 23 Jan 2026 14:13:52 +0000 Subject: [PATCH 6/6] Make tests match helm annotations --- tests/unit_tests/test_helm_chart.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit_tests/test_helm_chart.py b/tests/unit_tests/test_helm_chart.py index 88de4b1025..f6e34ddf59 100644 --- a/tests/unit_tests/test_helm_chart.py +++ b/tests/unit_tests/test_helm_chart.py @@ -601,8 +601,8 @@ def test_persistent_volume_claim_exists( "metadata": { "name": "blueapi-scratch-0.1.0", "annotations": { - "helm.sh/resource-policy": "keep", - "argocd.argoproj.io/sync-options": "Delete=false", + "argocd.argoproj.io/sync-options": "Prune=false,Delete=false", + "argocd.argoproj.io/compare-options": "IgnoreExtraneous", }, }, "spec": {