Skip to content

Commit 6c7ea68

Browse files
kkubicki-ecovadiskkubicki-ecovadis
authored
Merge pull request #199 from EcovadisCode/feat/pvc
Feat/pvc
2 parents dcf2a8c + b5ee654 commit 6c7ea68

9 files changed

Lines changed: 77 additions & 9 deletions

File tree

‎charts/core/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v2
22
name: charts-core
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 2.6.0
5+
version: 2.7.0

‎charts/core/templates/persistent-volume-claim.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{{- range .Values.global.persistentVolumes }}
2+
---
3+
apiVersion: v1
4+
kind: PersistentVolumeClaim
5+
metadata:
6+
namespace: {{ $.Release.Namespace }}
7+
name: {{ include "charts-core.fullname" $ }}-{{ .name }}-pvc
8+
spec:
9+
accessModes:
10+
- {{ .accessMode | default "ReadWriteMany" }}
11+
volumeMode: Filesystem
12+
resources:
13+
requests:
14+
storage: {{ .size | default "1Gi" }}
15+
storageClassName: {{ .storageClassName | default "azurefile-csi" }}
16+
{{- end }}

‎charts/core/values.yaml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,14 @@ global:
150150
# Optional: override regex pattern for finding secrets in Key Vault (default: .*)
151151
findRegex: ".*"
152152
# Optional: override conversion strategy (default: Unicode)
153-
conversionStrategy: "Unicode"
153+
conversionStrategy: "Unicode"
154+
155+
# Setting to enable or disable creation of Persistent Volume Claims
156+
# Each entry creates a separate PVC and a corresponding volume mount in the deployment.
157+
# persistentVolumes:
158+
# - name: data # required – used as the volume/mount name suffix and PVC name suffix
159+
# mountPath: /mnt/data # required – path inside the container
160+
# accessMode: ReadWriteMany
161+
# storageClassName: azurefile-csi
162+
# size: 1Gi
163+
persistentVolumes: []

‎charts/dotnet-core/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
description: EcoVadis Helm chart for .Net Core app
33
name: charts-dotnet-core
44
type: application
5-
version: 4.7.2
5+
version: 4.8.0
66
dependencies:
77
- name: charts-core
8-
version: "2.6.0"
8+
version: "2.7.0"
99
repository: "https://ecovadiscode.github.io/charts/"

‎charts/dotnet-core/templates/deployment.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,12 @@ spec:
191191
fieldPath: metadata.name
192192
resources:
193193
{{- toYaml .Values.global.resources | nindent 12 }}
194-
{{- if or .Values.global.appConfigFilesEnabled .Values.global.additionalVolumesEnabled .Values.global.eso.enabled .Values.global.certificate.enabled }}
194+
{{- if or .Values.global.persistentVolumes .Values.global.appConfigFilesEnabled .Values.global.additionalVolumesEnabled .Values.global.eso.enabled .Values.global.certificate.enabled }}
195195
volumeMounts:
196+
{{- range .Values.global.persistentVolumes }}
197+
- mountPath: {{ .mountPath }}
198+
name: pvc-{{ .name }}
199+
{{- end }}
196200
{{- if .Values.global.eso.enabled }}
197201
- mountPath: /var/run/secrets/app
198202
name: app-secrets-vol
@@ -272,6 +276,11 @@ spec:
272276
{{- end }}
273277
{{- end }}
274278
volumes:
279+
{{- range .Values.global.persistentVolumes }}
280+
- name: pvc-{{ .name }}
281+
persistentVolumeClaim:
282+
claimName: {{ include "charts-dotnet-core.fullname" $ }}-{{ .name }}-pvc
283+
{{- end }}
275284
{{- if .Values.global.eso.enabled }}
276285
- name: app-secrets-vol
277286
secret:

‎charts/dotnet-core/values.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,15 @@ global:
322322
# Set to empty string "" to enable for all environments
323323
# Can be comma-separated: "Develop,ReleaseCandidate,Hotfix"
324324
environments: "#{reloader_envs}#"
325+
326+
# Setting to enable or disable creation of Persistent Volume Claims
327+
# Each entry creates a separate PVC and a corresponding volume mount in the deployment.
328+
# persistentVolumes:
329+
# - name: data # required – used as the volume/mount name suffix and PVC name suffix
330+
# mountPath: /mnt/data # required – path inside the container
331+
# accessMode: ReadWriteMany
332+
# storageClassName: azurefile-csi
333+
# size: 1Gi
334+
persistentVolumes: []
335+
336+
persistentVolumesSkuName: Standard_LRS # default sku name for azure file, used when storageClassName is not specified in persistentVolumes configuration

‎charts/event-worker/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
description: EcoVadis Helm chart for K8s Event driven Deployment
33
name: charts-event-worker
44
type: application
5-
version: 1.4.1
5+
version: 1.5.0
66
dependencies:
77
- name: charts-core
8-
version: 2.4.2
8+
version: 2.7.0
99
repository: "https://ecovadiscode.github.io/charts/"

‎charts/event-worker/templates/deployment.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,12 @@ spec:
9898
fieldPath: metadata.name
9999
resources:
100100
{{- toYaml .Values.global.resources | nindent 12 }}
101-
{{- if or .Values.global.appConfigFilesEnabled .Values.global.additionalVolumesEnabled }}
101+
{{- if or .Values.global.persistentVolumes .Values.global.appConfigFilesEnabled .Values.global.additionalVolumesEnabled .Values.global.monitoring.metrics.enabled }}
102102
volumeMounts:
103+
{{- range .Values.global.persistentVolumes }}
104+
- mountPath: {{ .mountPath }}
105+
name: pvc-{{ .name }}
106+
{{- end }}
103107
{{- if .Values.global.monitoring.metrics.enabled }}
104108
- mountPath: "{{- .Values.global.monitoring.metricsServer.dir }}"
105109
name: metrics-volume
@@ -163,6 +167,11 @@ spec:
163167
name: metrics-volume
164168
{{- end }}
165169
volumes:
170+
{{- range .Values.global.persistentVolumes }}
171+
- name: pvc-{{ .name }}
172+
persistentVolumeClaim:
173+
claimName: {{ include "charts-event-worker.fullname" $ }}-{{ .name }}-pvc
174+
{{- end }}
166175
{{- if .Values.global.monitoring.metrics.enabled }}
167176
- name: "metrics-volume"
168177
emptyDir:

‎charts/event-worker/values.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,16 @@ global:
183183
topicName: # Optional. ServiceBus Topic name
184184
subscriptionName: # Optional. Required if topic is specified. ServiceBus Subscripion name
185185
messageCount: 5 # Optional. Count of messages to trigger scaling out: 1 -> N. Default: 5 messages
186-
activationMessageCount: # Target value for activating the scaler: 0 -> 1. Default: 0
186+
activationMessageCount: # Target value for activating the scaler: 0 -> 1. Default: 0
187+
188+
# Setting to enable or disable creation of Persistent Volume Claims
189+
# Each entry creates a separate PVC and a corresponding volume mount in the deployment.
190+
# persistentVolumes:
191+
# - name: data # required – used as the volume/mount name suffix and PVC name suffix
192+
# mountPath: /mnt/data # required – path inside the container
193+
# accessMode: ReadWriteMany
194+
# storageClassName: azurefile-csi
195+
# size: 1Gi
196+
persistentVolumes: []
197+
198+
persistentVolumesSkuName: Standard_LRS # default sku name for azure file, used when storageClassName is not specified in persistentVolumes configuration

0 commit comments

Comments
 (0)