v0.31.0 removes data volume from deployment

[cterence]

Hi !
Trying to update to this new version removes my existing volume definitions in .spec.volumes in the deployment.
My updated values (I just added the new storage key, an empty existingVolumeClaim key and moved my existing data and attachments keys in it):

storage:
  ## @param existingVolumeClaim If defined, the values here will be used for the data and
  ## attachments PV's. The custom values for data and attachments will be ignored if
  ## a value is set here
  ##
  existingVolumeClaim:
    {}
    # claimName: "vaultwarden-pvc"
    # dataPath: "/data"
    # attachmentsPath: /data/attachments

  ## @param data Data directory configuration, refer to values.yaml for parameters.
  ##
  data:
    name: "vaultwarden-data"
    size: "5Gi"
    class: ""
    path: "/data"
    accessMode: "ReadWriteOnce"
    keepPvc: true

  ## @param attachments Attachments directory configuration, refer to values.yaml for parameters.
  ## By default, attachments/ is located inside the data directory.
  ##
  attachments:
    name: "vaultwarden-files"
    size: "10Gi"
    class: ""
    path: /files
    accessMode: "ReadWriteOnce"
    keepPvc: true

My diff in ArgoCD (deployment manifest):

@paimonsoror could you please help since you were the author of this change please ?

[paimonsoror]

Hey there! taking a look now. Super odd, so is it only removing your vaultwarden-data volume?

[cterence]

Yes this is the only change, if you want to take a look at my helm chart/values, it's over here.

[paimonsoror]

Yes this is the only change, if you want to take a look at my helm chart/values, it's over here.

Can you confirm that's the right values file?

https://github.com/cterence/homelab-gitops/blob/70d37df1d88f6c0cdcd10b72ffbc2ae4d2182661/k8s-apps/vaultwarden/values.yaml#L236

This and attachments should be nested under storage

[cterence]

Yes this is the correct one. It's on the previous chart version here sorry.

Here's my PR which targets the new v0.31.0 version with the updated values. This is what I previously merged and got me the ArgoCD error.

[paimonsoror]

Ok cool. I'll text your values once I get home. Thanks for the details!

[Mawarii]

I am not sure, but maybe this has to do with the changes made here:

I have also a problem with 0.31.0, because if I template it volumes: will be defined twice and therefore the deployment.yaml is not valid.

I don't know much about ArgoCD, but I could imagine that the Argo diff removes the first volumes block and therefore removes the data volume.

[santiagon610]

I don't know much about ArgoCD, but I could imagine that the Argo diff removes the first volumes block and therefore removes the data volume.

Good point. If memory serves me correctly, YAML is "last one defined wins," which means that the volumes with name: vaultwarden-files should win and the volumes with vaultwarden-data would be ignored.

[paimonsoror]

yup! i see it - ok let me work on a fix here

[paimonsoror]

got a fix ready - rebasing my local against main and then staging a PR