zot: fix htpasswd volume to avoid type conflict

services/zot/deployment.yaml

@@ -45,7 +45,7 @@ spec:
               mountPath: /etc/zot/config.json
               subPath: config.json
               readOnly: true
-            - name: htpasswd
+            - name: htpasswd-merged
               mountPath: /etc/zot/htpasswd
               subPath: htpasswd
             - name: zot-data
@@ -85,7 +85,7 @@ spec:
             - name: htpasswd-source
               mountPath: /src
               readOnly: true
-            - name: htpasswd
+            - name: htpasswd-merged
               mountPath: /merged
       volumes:
         - name: cfg
@@ -95,7 +95,7 @@ spec:
           secret:
             secretName: zot-htpasswd
             optional: true
-        - name: htpasswd
+        - name: htpasswd-merged
           emptyDir: {}
         - name: zot-data
           persistentVolumeClaim: