Skip to content

Commit

Permalink
fix: remove scandata volume in jobservice
Browse files Browse the repository at this point in the history 
Signed-off-by: chlins <chenyuzh@vmware.com>
  • Loading branch information
@chlins
chlins committed Jan 31, 2023
1 parent a658bca commit 2c9af73
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 57 deletions.
6 changes: 0 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
Expand Down
4 changes: 0 additions & 4 deletions templates/_helpers.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand Down
10 changes: 0 additions & 10 deletions templates/jobservice/jobservice-dpl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
30 changes: 0 additions & 30 deletions templates/jobservice/jobservice-pvc-scandata.yaml
View file

This file was deleted.

7 changes: 0 additions & 7 deletions values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 2c9af73

Please sign in to comment.