feat(flux,source-controller): add possibility to use a pvc for 'Persi…

charts/flux2/Chart.yaml

@@ -1,11 +1,11 @@
 annotations:
   artifacthub.io/changes: |
-    - "[Chore]: Update App Version to upstream 2.6.4"
+    - "feat(flux,source-controller): add possibility to use a pvc for 'Persistent storage for Flux internal artifacts'"
 apiVersion: v2
 appVersion: 2.6.4
 description: A Helm chart for flux2
 name: flux2
 sources:
 - https://github.com/fluxcd-community/helm-charts
 type: application
-version: 2.16.4
+version: 2.17.0

charts/flux2/README.md

@@ -1,6 +1,6 @@
 # flux2
 
-![Version: 2.16.4](https://img.shields.io/badge/Version-2.16.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.4](https://img.shields.io/badge/AppVersion-2.6.4-informational?style=flat-square)
+![Version: 2.17.0](https://img.shields.io/badge/Version-2.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.4](https://img.shields.io/badge/AppVersion-2.6.4-informational?style=flat-square)
 
 A Helm chart for flux2
 
@@ -171,6 +171,10 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | sourceController.serviceAccount.annotations | object | `{}` |  |
 | sourceController.serviceAccount.automount | bool | `true` |  |
 | sourceController.serviceAccount.create | bool | `true` |  |
+| sourceController.persistentvolumeclaim.annotations | object | `{}` |  |
+| sourceController.persistentvolumeclaim.create | bool | `true` |  |
+| sourceController.persistentvolumeclaim.labels | object | `{}` |  ||
+| sourceController.persistentvolumeclaim.size | string | `"10Gi"` |  ||
 | sourceController.tag | string | `"v1.6.2"` |  |
 | sourceController.tolerations | list | `[]` |  |
 | watchAllNamespaces | bool | `true` |  |

charts/flux2/templates/source-controller-persistentvolumeclaim.yaml

@@ -0,0 +1,26 @@
+{{- if and .Values.sourceController.create .Values.sourceController.persistentvolumeclaim.create }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Namespace | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion | quote  }}
+    app.kubernetes.io/part-of: flux
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    control-plane: controller
+    {{- with .Values.sourceController.persistentvolumeclaim.labels }}{{ toYaml . | nindent 4 }}{{ end }}
+  name: source-controller
+  {{- with .Values.sourceController.persistentvolumeclaim.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  {{- with .Values.sourceController.persistentvolumeclaim.storageClassName }}
+  storageClassName: {{ . }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.sourceController.persistentvolumeclaim.size | quote }}
+{{- end }}

charts/flux2/templates/source-controller.yaml

@@ -97,12 +97,12 @@ spec:
           runAsNonRoot: true
           seccompProfile:
             type: RuntimeDefault
-        {{- end}}
+        {{- end }}
         volumeMounts:
-        - mountPath: /data
-          name: data
-        - mountPath: /tmp
-          name: tmp
+        - name: data
+          mountPath: /data
+        - name: tmp
+          mountPath: /tmp
         {{- if .Values.sourceController.volumeMounts }}
         {{- toYaml .Values.sourceController.volumeMounts | nindent 8 }}
         {{- end}}
@@ -121,10 +121,15 @@ spec:
       {{- end }}
       terminationGracePeriodSeconds: 10
       volumes:
-      - emptyDir: {}
-        name: data
-      - emptyDir: {}
-        name: tmp
+      - name: data
+        {{- if .Values.sourceController.persistentvolumeclaim.create }}
+        persistentVolumeClaim:
+          claimName: source-controller
+        {{- else }}
+        emptyDir: {}
+        {{- end }}
+      - name: tmp
+        emptyDir: {}
       {{- if .Values.sourceController.volumes }}
       {{- toYaml .Values.sourceController.volumes | nindent 6 }}
       {{- end}}

charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
         control-plane: controller
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
         labeltestkey: labeltestvalue
         labeltestkey2: labeltestvalue2
       name: helm-controller

charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
         control-plane: controller
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
       name: image-automation-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
         control-plane: controller
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
       name: image-reflector-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
       name: test1
       namespace: NAMESPACE
     type: Opaque

charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
         control-plane: controller
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
       name: kustomize-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
         control-plane: controller
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
       name: notification-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap

@@ -12,7 +12,7 @@ should match snapshot of default values:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
       name: RELEASE-NAME-flux-check
     spec:
       backoffLimit: 1
@@ -23,7 +23,7 @@ should match snapshot of default values:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/part-of: flux
             app.kubernetes.io/version: 2.6.4
-            helm.sh/chart: flux2-2.16.4
+            helm.sh/chart: flux2-2.17.0
           name: RELEASE-NAME
         spec:
           automountServiceAccountToken: true

charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/part-of: flux
         app.kubernetes.io/version: 2.6.4
         control-plane: controller
-        helm.sh/chart: flux2-2.16.4
+        helm.sh/chart: flux2-2.17.0
       name: source-controller
     spec:
       replicas: 1

charts/flux2/values.yaml

@@ -264,6 +264,12 @@ sourceController:
   service:
     labels: {}
     annotations: {}
+  persistentvolumeclaim:
+    labels: {}
+    annotations: {}
+    create: false
+    size: 10Gi
+    # storageClassName: default
   nodeSelector: {}
   affinity: {}
   tolerations: []