Merge pull request #452 from nautobot/develop

Release v2.3.2

charts/nautobot/Chart.yaml

@@ -30,17 +30,11 @@ annotations:
     - title: Chatops
       url: https://raw.githubusercontent.com/nautobot/nautobot/develop/nautobot/docs/media/ss_plugin_chatops.png
   artifacthub.io/changes: |
-    - kind: added
-      description: Added additional properties in the root of values json schema
-    - kind: changed
-      description: Upgraded Nautobot from 2.3.2 to 2.3.4
-    - kind: changed
-      description: Upgraded Bitnami common subchart from 2.22.0 to 2.23.0
     - kind: fixed
-      description: Documentation for persistent static and media files
+      description: Media files directory being overwritten by volumeMount
 apiVersion: "v2"
 appVersion: "2.3.4"
-version: "2.3.1"
+version: "2.3.2"
 dependencies:
   - condition: "redis.enabled"
     name: "redis"

charts/nautobot/README.md

@@ -1,6 +1,6 @@
 # nautobot
 
-![Version: 2.3.1](https://img.shields.io/badge/Version-2.3.1-informational?style=flat-square) ![AppVersion: 2.3.4](https://img.shields.io/badge/AppVersion-2.3.4-informational?style=flat-square)
+![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square) ![AppVersion: 2.3.4](https://img.shields.io/badge/AppVersion-2.3.4-informational?style=flat-square)
 
 Nautobot is a Network Source of Truth and Network Automation Platform.
 

charts/nautobot/templates/nautobot-deployment.yaml

@@ -280,8 +280,10 @@ spec:
           volumeMounts:
             - name: "nautobot-static"
               mountPath: "/opt/nautobot/static"
+            {{- if $nautobot.persistenceMediaFiles.enabled }}
             - name: "nautobot-media"
               mountPath: "/opt/nautobot/media"
+            {{- end }}
             - name: "git-repos"
               mountPath: "/opt/nautobot/git"
             - name: "nautobot-config"
@@ -416,12 +418,10 @@ spec:
         {{- else }}
           emptyDir: {}
         {{- end }}
-        - name: "nautobot-media"
         {{- if $nautobot.persistenceMediaFiles.enabled }}
+        - name: "nautobot-media"
           persistentVolumeClaim:
             claimName: {{ include "common.names.fullname" $ }}-media
-        {{- else }}
-          emptyDir: {}
         {{- end }}
         - name: "git-repos"
           emptyDir: {}

charts/nautobot/templates/pvc-static.yaml → charts/nautobot/templates/pvc.yaml

@@ -32,4 +32,37 @@ spec:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 {{ end -}}
+{{- if .Values.nautobot.persistenceMediaFiles.enabled -}}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "common.names.fullname" $ }}-media
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" $ | nindent 4 }}
+    app.kubernetes.io/component: nautobot-media-pvc
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.nautobot.persistenceMediaFiles.storageClassName }}
+  {{- if (eq "-" .Values.nautobot.persistenceMediaFiles.storageClassName) }}
+  storageClassName: ""
+  {{- else }}
+  storageClassName: {{ .Values.nautobot.persistenceMediaFiles.storageClassName | quote }}
+  {{- end }}
+  {{- end }}
+  accessModes:
+  - {{ .Values.nautobot.persistenceMediaFiles.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.nautobot.persistenceMediaFiles.size | quote }}
+  {{- with .Values.nautobot.persistenceMediaFiles.selector }}
+  selector:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{ end -}}
 {{ end -}}

docs/release-notes/version-2.x.md

@@ -3,6 +3,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.3.2 - 2024-09-24
+
+### Fixed
+
+* [#445](https://github.com/nautobot/helm-charts/issues/445) Fix Media files directory being overwritten by volumeMount.
+
 ## 2.3.1 - 2024-09-20
 
 ### Added

docs/requirements.txt

@@ -1,3 +1,3 @@
 mkdocs==1.6.1
-mkdocs-material==9.5.35
+mkdocs-material==9.5.36
 mkdocs-version-annotations==1.0.0

pyproject.toml

@@ -11,7 +11,7 @@ invoke = "*"
 # Rendering docs to HTML
 mkdocs = "~1.6.0"
 # Material for MkDocs theme
-mkdocs-material = "9.5.35"
+mkdocs-material = "9.5.36"
 # Render custom markdown for version added/changed/remove notes
 mkdocs-version-annotations = "1.0.0"