From 94e357a549fbefbdce8da3487216e28421d27349 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:16:23 +0200 Subject: [PATCH 1/3] fix(deps): update dependency mkdocs-material to v9.5.36 (#448) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docs/requirements.txt | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 60df4ee0..2150374f 100644 --- a/docs/requirements.txt +++ b/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 diff --git a/pyproject.toml b/pyproject.toml index a05ac79c..3caec896 100644 --- a/pyproject.toml +++ b/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" From 87c6735e65292d5a5ea7cd6d2561be5aab772978 Mon Sep 17 00:00:00 2001 From: Gerasimos Tzakis Date: Tue, 24 Sep 2024 10:44:36 +0300 Subject: [PATCH 2/3] fix: remove media files `emptyDir` if persistence is not enabled (#449) --- .../templates/nautobot-deployment.yaml | 6 ++-- charts/nautobot/templates/pvc-media.yaml | 35 ------------------- .../templates/{pvc-static.yaml => pvc.yaml} | 33 +++++++++++++++++ 3 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 charts/nautobot/templates/pvc-media.yaml rename charts/nautobot/templates/{pvc-static.yaml => pvc.yaml} (51%) diff --git a/charts/nautobot/templates/nautobot-deployment.yaml b/charts/nautobot/templates/nautobot-deployment.yaml index 2cff420f..4e860c4e 100644 --- a/charts/nautobot/templates/nautobot-deployment.yaml +++ b/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: {} diff --git a/charts/nautobot/templates/pvc-media.yaml b/charts/nautobot/templates/pvc-media.yaml deleted file mode 100644 index 1e5c68d8..00000000 --- a/charts/nautobot/templates/pvc-media.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.nautobot.enabled -}} -{{- 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 -}} diff --git a/charts/nautobot/templates/pvc-static.yaml b/charts/nautobot/templates/pvc.yaml similarity index 51% rename from charts/nautobot/templates/pvc-static.yaml rename to charts/nautobot/templates/pvc.yaml index 1418857a..cd686aea 100644 --- a/charts/nautobot/templates/pvc-static.yaml +++ b/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 -}} From f89b4f4d81e3aa77e34a512f4b2cd908b279bddb Mon Sep 17 00:00:00 2001 From: Gerasimos Tzakis Date: Tue, 24 Sep 2024 10:56:38 +0300 Subject: [PATCH 3/3] chore: prepare for release `2.3.2` (#451) --- charts/nautobot/Chart.yaml | 10 ++-------- charts/nautobot/README.md | 2 +- docs/release-notes/version-2.x.md | 6 ++++++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/nautobot/Chart.yaml b/charts/nautobot/Chart.yaml index 54752165..07d0b288 100644 --- a/charts/nautobot/Chart.yaml +++ b/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" diff --git a/charts/nautobot/README.md b/charts/nautobot/README.md index ac736fe0..48a1fa7b 100644 --- a/charts/nautobot/README.md +++ b/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. diff --git a/docs/release-notes/version-2.x.md b/docs/release-notes/version-2.x.md index 689daedf..ec5072c0 100644 --- a/docs/release-notes/version-2.x.md +++ b/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