Merge pull request #1379 from chlins/1.11.0/fix/remove-scandata-volume

[cherry-pick] fix: remove scandata volume in jobservice
goharbor · Feb 16, 2023 · fa8322a · fa8322a
2 parents acd996e + c69cdf7
commit fa8322a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -158,12 +158,6 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode`                 | The access mode of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                     | `ReadWriteOnce`                       |
 | `persistence.persistentVolumeClaim.jobservice.jobLog.size`                       | The size of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                            | `1Gi`                                 |
 | `persistence.persistentVolumeClaim.jobservice.jobLog.annotations`                | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                       |
-| `persistence.persistentVolumeClaim.jobservice.scanDataExports.existingClaim`              | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components.                                                                                                                                                                                                                                                                                                                           |                                       |
-| `persistence.persistentVolumeClaim.jobservice.scanDataExports.storageClass`               | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning                                                                                                                                                                                                                                                                                                    |                                       |
-| `persistence.persistentVolumeClaim.jobservice.scanDataExports.subPath`                    | The sub path used in the volume                                                                                                                                                                                                                                                                                                                                                                                                                                   |                                       |
-| `persistence.persistentVolumeClaim.jobservice.scanDataExports.accessMode`                 | The access mode of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                     | `ReadWriteOnce`                       |
-| `persistence.persistentVolumeClaim.jobservice.scanDataExports.size`                       | The size of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                            | `1Gi`                                 |
-| `persistence.persistentVolumeClaim.jobservice.scanDataExports.annotations`                | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                       |
 | `persistence.persistentVolumeClaim.database.existingClaim`           | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored                                                                                                                                                                                                                                                                 |                                       |
 | `persistence.persistentVolumeClaim.database.storageClass`            | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored                                                                                                                                                                                                                                         |                                       |
 | `persistence.persistentVolumeClaim.database.subPath`                 | The sub path used in the volume. If external database is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                        |                                       |

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -237,10 +237,6 @@ postgres://{{ template "harbor.database.username" . }}:{{ template "harbor.datab
   {{- printf "%s-jobservice" (include "harbor.fullname" .) -}}
 {{- end -}}
 
-{{- define "harbor.jobserviceScandata" -}}
-  {{- printf "%s-jobservice-scandata" (include "harbor.fullname" .) -}}
-{{- end -}}
-
 {{- define "harbor.registry" -}}
   {{- printf "%s-registry" (include "harbor.fullname" .) -}}
 {{- end -}}

diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml
@@ -107,9 +107,6 @@ spec:
         - name: job-logs
           mountPath: /var/log/jobs
           subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.jobLog.subPath }}
-        - name: job-scandata-exports
-          mountPath: /var/scandata_exports
-          subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanDataExports.subPath }}
         {{- if .Values.internalTLS.enabled }}
         - name: jobservice-internal-certs
           mountPath: /etc/harbor/ssl/jobservice
@@ -128,13 +125,6 @@ spec:
         {{- else }}
         emptyDir: {}
         {{- end }}
-      - name: job-scandata-exports
-        {{- if and .Values.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.scanDataExports.existingClaim | default (include "harbor.jobserviceScandata" .) }}
-        {{- else }}
-        emptyDir: {}
-        {{- end }}
       {{- if .Values.internalTLS.enabled }}
       - name: jobservice-internal-certs
         secret:

diff --git a/templates/jobservice/jobservice-pvc-scandata.yaml b/templates/jobservice/jobservice-pvc-scandata.yaml
diff --git a/values.yaml b/values.yaml
@@ -237,13 +237,6 @@ persistence:
         accessMode: ReadWriteOnce
         size: 1Gi
         annotations: {}
-      scanDataExports:
-        existingClaim: ""
-        storageClass: ""
-        subPath: ""
-        accessMode: ReadWriteOnce
-        size: 1Gi
-        annotations: {}
     # If external database is used, the following settings for database will
     # be ignored
     database: