Merge branch 'develop' into feat/ghcr

Author: RangerRick

README.md

@@ -336,6 +336,13 @@ The following table lists the configurable parameters for this chart and their d
 | `reportsPersistence.selector`                   | Set the selector for PVs, if desired                                | `{}`                                         |
 | `reportsPersistence.accessMode`                 | Access mode for the volume                                          | `ReadWriteOnce`                              |
 | `reportsPersistence.size`                       | Size of persistent volume to request                                | `1Gi`                                        |
+| `scriptsPersistence.enabled`                    | Enable storage persistence for NetBox reports                       | `false`                                      |
+| `scriptsPersistence.existingClaim`              | Use an existing `PersistentVolumeClaim` instead of creating one     | `""`                                         |
+| `scriptsPersistence.subPath`                    | Mount a sub-path of the volume into the container, not the root     | `""`                                         |
+| `scriptsPersistence.storageClass`               | Set the storage class of the PVC (use `-` to disable provisioning)  | `""`                                         |
+| `scriptsPersistence.selector`                   | Set the selector for PVs, if desired                                | `{}`                                         |
+| `scriptsPersistence.accessMode`                 | Access mode for the volume                                          | `ReadWriteOnce`                              |
+| `scriptsPersistence.size`                       | Size of persistent volume to request                                | `1Gi`                                        |
 | `podAnnotations`                                | Additional annotations for NetBox pods                              | `{}`                                         |
 | `podLabels`                                     | Additional labels for NetBox pods                                   | `{}`                                         |
 | `podSecurityContext`                            | Security context for NetBox pods                                    | *see `values.yaml`*                          |

charts/netbox/templates/cronjob.yaml

@@ -87,6 +87,11 @@ spec:
               mountPath: /opt/netbox/netbox/reports
               subPath: {{ .Values.reportsPersistence.subPath | default "" | quote }}
             {{- end }}
+            {{- if .Values.scriptsPersistence.enabled }}
+            - name: scripts
+              mountPath: /opt/netbox/netbox/scripts
+              subPath: {{ .Values.scriptsPersistence.subPath | default "" | quote }}
+            {{- end }}
             {{- with .Values.housekeeping.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}

charts/netbox/templates/deployment.yaml

@@ -144,6 +144,11 @@ spec:
           mountPath: /opt/netbox/netbox/reports
           subPath: {{ .Values.reportsPersistence.subPath | default "" | quote }}
         {{- end }}
+        {{- if .Values.scriptsPersistence.enabled }}
+        - name: scripts
+          mountPath: /opt/netbox/netbox/scripts
+          subPath: {{ .Values.scriptsPersistence.subPath | default "" | quote }}
+        {{- end }}
         - name: optunit
           mountPath: /opt/unit
         - name: secrets
@@ -225,6 +230,11 @@ spec:
         persistentVolumeClaim:
           claimName: {{ .Values.reportsPersistence.existingClaim | default (printf "%s-reports" (include "common.names.fullname" .)) }}
       {{- end }}
+      {{- if .Values.scriptsPersistence.enabled }}
+      - name: scripts
+        persistentVolumeClaim:
+          claimName: {{ .Values.scriptsPersistence.existingClaim | default (printf "%s-scripts" (include "common.names.fullname" .)) }}
+      {{- end }}
       {{- with .Values.extraVolumes }}
       {{- toYaml . | nindent 6 }}
       {{- end }}

charts/netbox/templates/worker-deployment.yaml

@@ -96,6 +96,11 @@ spec:
           mountPath: /opt/netbox/netbox/reports
           subPath: {{ .Values.reportsPersistence.subPath | default "" | quote }}
         {{- end }}
+        {{- if .Values.scriptsPersistence.enabled }}
+        - name: scripts
+          mountPath: /opt/netbox/netbox/scripts
+          subPath: {{ .Values.scriptsPersistence.subPath | default "" | quote }}
+        {{- end }}
         {{- with .Values.worker.extraVolumeMounts }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/netbox/values.yaml

@@ -547,6 +547,31 @@ reportsPersistence:
   accessMode: ReadWriteOnce
   size: 1Gi
   annotations: {}
+## Enable scripts persistence using Persistent Volume Claims
+## ref: https://kubernetes.io/docs/concepts/storage/persistent-volumes/
+## @param scriptsPersistence.enabled Enable reports persistence using PVC
+## @param scriptsPersistence.storageClass PVC Storage Class for volume
+## @param scriptsPersistence.accessMode PVC Access Mode for volume
+## @param scriptsPersistence.size PVC Storage Request for volume
+## @param scriptsPersistence.subPath Existing claim's subPath to use, e.g. "media" (optional)
+## @param scriptsPersistence.existingClaim Name of an existing PVC to be used
+## @param scriptsPersistence.annotations Annotations to add to the PVC
+##
+scriptsPersistence:
+  enabled: false
+  existingClaim: ""
+  subPath: ""
+  ## Data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the defaserviceMonitorult provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  storageClass: ""
+  accessMode: ReadWriteOnce
+  size: 1Gi
+  annotations: {}
 ## @param updateStrategy.type Deployment strategy type
 ## @param updateStrategy.rollingUpdate Deployment rolling update configuration parameters
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy