Merge pull request #319 from nautobot/develop

Release v2.0.4

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 0
 
@@ -70,7 +70,7 @@ jobs:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
       - uses: "azure/setup-helm@v3"
       - run: "mkdir template_output"
       - run: "helm repo add bitnami https://charts.bitnami.com/bitnami"
@@ -106,7 +106,7 @@ jobs:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
       - uses: "azure/setup-helm@v3"
       - name: "Install Kubescape"
         run: "curl -s https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash"

.github/workflows/release-chart.yaml

@@ -8,7 +8,7 @@ jobs:
   release:
     runs-on: "ubuntu-22.04"
     steps:
-      - uses: "actions/checkout@v3"
+      - uses: "actions/checkout@v4"
       - name: "Publish Helm charts"
         uses: "stefanprodan/[email protected]"
         with:

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
           - "--no-sort-keys"
 
   - repo: "https://github.com/Lucas-C/pre-commit-hooks"
-    rev: "v1.5.1"
+    rev: "v1.5.4"
     hooks:
       - id: "remove-crlf"
       - id: "remove-tabs"
@@ -32,7 +32,7 @@ repos:
           - "docs/"
 
   - repo: "https://github.com/streetsidesoftware/cspell-cli"
-    rev: "v6.31.0"
+    rev: "v7.3.0"
     hooks:
       - id: "cspell"
 
@@ -72,7 +72,7 @@ repos:
   #         - "console,checkov.sarif"
 
   - repo: "https://github.com/norwoodj/helm-docs"
-    rev: "v1.11.0"
+    rev: "v1.11.2"
     hooks:
       - id: "helm-docs"
         args:
@@ -83,7 +83,7 @@ repos:
           - "--template-files=README.md.gotmpl"
 
   - repo: "https://github.com/norwoodj/helm-docs"
-    rev: "v1.11.0"
+    rev: "v1.11.2"
     hooks:
       - id: "helm-docs"
         args:

.readthedocs.yaml

@@ -10,7 +10,7 @@ version: 2
 build:
   os: "ubuntu-22.04"
   tools:
-    python: "3.10"
+    python: "3.11"
 
 mkdocs:
   configuration: "mkdocs.yml"

cSpell_dict.txt

@@ -6,6 +6,7 @@ artifacthub
 automount
 autoscaler
 bitnami
+bitnamicharts
 cacheops
 chatops
 codeql

charts/nautobot/Chart.lock

@@ -1,21 +1,21 @@
 dependencies:
 - name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 17.11.5
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 18.0.4
 - name: postgresql
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.5.7
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 12.12.4
 - name: postgresql-ha
-  repository: https://charts.bitnami.com/bitnami
-  version: 11.7.5
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 11.9.4
 - name: mariadb
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.2.5
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 13.1.3
 - name: rabbitmq
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.0.1
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 12.1.5
 - name: common
-  repository: https://charts.bitnami.com/bitnami
-  version: 2.4.0
-digest: sha256:72f85b889158c6a7bc0ce23c5e9f906e465d939be550562e878579b102a962bc
-generated: "2023-06-16T14:02:31.424918-06:00"
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 2.11.1
+digest: sha256:3806eb6003a65f010929a2d51fda545f976ffaaa21ba20ec4de39c69cffb88df
+generated: "2023-09-21T07:38:38.691332-06:00"

charts/nautobot/Chart.yaml

@@ -6,7 +6,7 @@ annotations:
   artifacthub.io/prerelease: "false"
   artifacthub.io/images: |
     - name: nautobot
-      image: ghcr.io/nautobot/nautobot:1.5.21-py3.10
+      image: ghcr.io/nautobot/nautobot:1.6.2-py3.11
   artifacthub.io/links: |
     - name: Nautobot Documentation
       url: https://docs.nautobot.com/
@@ -31,50 +31,50 @@ annotations:
       url: https://raw.githubusercontent.com/nautobot/nautobot/develop/nautobot/docs/media/ss_plugin_chatops.png
   artifacthub.io/changes: |
     - kind: fixed
-      description: Fixed #288 README Typo
+      description: Fixed #306 Bug: configured prometheus backend not possible
     - kind: fixed
-      description: Fixed #286 variable celery.concurrency not used
-    - kind: changed
-      description: #293 Allow Increasing uwsgi buffer size
+      description: Fixed #316 Concurrency int breaks deployment
+    - kind: fixed
+      description: Fixed #255 Switch dependencies to OCI
     - kind: changed
-      description: Upgraded Nautobot from 1.5.20 to 1.5.21
+      description: Upgraded Nautobot from 1.5.23 to 1.6.2
     - kind: changed
-      description:  Upgraded Mariadb subchart from 12.2.4 to 12.2.5
+      description:  Upgraded Mariadb subchart from 12.2.5 to 13.1.3
     - kind: changed
-      description:  Upgraded PostgreSQL subchart from 12.5.6 to 12.5.7
+      description:  Upgraded PostgreSQL subchart from 12.5.7 to 12.12.4
     - kind: changed
-      description:  Upgraded PostgreSQL-HA subchart from 11.7.4 to 11.7.5
+      description:  Upgraded PostgreSQL-HA subchart from 11.7.5 to 11.9.4
     - kind: changed
-      description:  Upgraded RabbitMQ subchart from 11.16.1 to 12.0.1
+      description:  Upgraded RabbitMQ subchart from 12.0.1 to 12.1.5
     - kind: changed
-      description:  Upgraded Redis subchart from 17.11.3 to 17.11.5
+      description:  Upgraded Redis subchart from 17.11.5 to 18.0.4
 apiVersion: "v2"
-appVersion: "1.5.21"
-version: "2.0.3"
+appVersion: "1.6.2"
+version: "2.0.4"
 dependencies:
   - condition: "redis.enabled"
     name: "redis"
-    repository: "https://charts.bitnami.com/bitnami"
-    version: "17.x.x"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    version: "18.x.x"
   - condition: "postgresql.enabled"
     name: "postgresql"
-    repository: "https://charts.bitnami.com/bitnami"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
     version: "12.x.x"
   - condition: "postgresqlha.enabled"
     name: "postgresql-ha"
-    repository: "https://charts.bitnami.com/bitnami"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
     version: "11.x.x"
     alias: "postgresqlha"
   - condition: "mariadb.enabled"
     name: "mariadb"
-    repository: "https://charts.bitnami.com/bitnami"
-    version: "12.x"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    version: "13.x"
   - condition: "rabbitmq.enabled"
     name: "rabbitmq"
-    repository: "https://charts.bitnami.com/bitnami"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
     version: "12.x"
   - name: "common"
-    repository: "https://charts.bitnami.com/bitnami"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
     tags:
       - "bitnami-common"
     version: "2.x.x"

charts/nautobot/README.md

@@ -1,6 +1,6 @@
 # nautobot
 
-![Version: 2.0.3](https://img.shields.io/badge/Version-2.0.3-informational?style=flat-square) ![AppVersion: 1.5.21](https://img.shields.io/badge/AppVersion-1.5.21-informational?style=flat-square)
+![Version: 2.0.4](https://img.shields.io/badge/Version-2.0.4-informational?style=flat-square) ![AppVersion: 1.6.2](https://img.shields.io/badge/AppVersion-1.6.2-informational?style=flat-square)
 
 Nautobot is a Network Source of Truth and Network Automation Platform.
 
@@ -89,12 +89,12 @@ See [Uninstall](https://docs.nautobot.com/projects/helm-charts/en/stable/operati
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.bitnami.com/bitnami | common | 2.x.x |
-| https://charts.bitnami.com/bitnami | mariadb | 12.x |
-| https://charts.bitnami.com/bitnami | postgresql | 12.x.x |
-| https://charts.bitnami.com/bitnami | postgresqlha(postgresql-ha) | 11.x.x |
-| https://charts.bitnami.com/bitnami | rabbitmq | 12.x |
-| https://charts.bitnami.com/bitnami | redis | 17.x.x |
+| oci://registry-1.docker.io/bitnamicharts | common | 2.x.x |
+| oci://registry-1.docker.io/bitnamicharts | mariadb | 13.x |
+| oci://registry-1.docker.io/bitnamicharts | postgresql | 12.x.x |
+| oci://registry-1.docker.io/bitnamicharts | postgresqlha(postgresql-ha) | 11.x.x |
+| oci://registry-1.docker.io/bitnamicharts | rabbitmq | 12.x |
+| oci://registry-1.docker.io/bitnamicharts | redis | 18.x.x |
 
 <!-- This section is a duplicate of docs/configuration/reference.md.gotmpl -->
 
@@ -270,7 +270,7 @@ The `mariadb.*` values configure the upstream chart from Bitnami.  Please see th
 | <a name="nautobot.image.pullSecrets">[nautobot.image.pullSecrets](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L49)</a> | []string | `[]` | List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments |
 | <a name="nautobot.image.registry">[nautobot.image.registry](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L41)</a> | string | `"ghcr.io"` | Nautobot image registry, common to all deployments |
 | <a name="nautobot.image.repository">[nautobot.image.repository](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L43)</a> | string | `"nautobot/nautobot"` | Nautobot image name, common to all deployments |
-| <a name="nautobot.image.tag">[nautobot.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L45)</a> | string | `"1.5.21-py3.10"` | Nautobot image tag, common to all deployments |
+| <a name="nautobot.image.tag">[nautobot.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L45)</a> | string | `"1.6.2-py3.11"` | Nautobot image tag, common to all deployments |
 | <a name="nautobot.initContainers">[nautobot.initContainers](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L203)</a> | [][Container](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Container) | `[]` | [[ref](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)] Add additional init containers to the Nautobot server pods |
 | <a name="nautobot.lifecycleHooks">[nautobot.lifecycleHooks](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L175)</a> | [Lifecycle](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle) | `{}` | lifecycleHooks for the Nautobot container(s) to automate configuration before or after startup |
 | <a name="nautobot.livenessProbe">[nautobot.livenessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L61)</a> | [Probe](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1) | See values.yaml | [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot liveness probe |

charts/nautobot/templates/celery-deployment.yaml

@@ -82,7 +82,7 @@ spec:
           {{- end }}
           {{- if (ne (int $celery.concurrency) 0) }}
             - --concurrency
-            - {{ $celery.concurrency }}
+            - {{ $celery.concurrency | quote }}
           {{- end }}
           {{- if $celery.args }}
           args: {{- include "common.tplvalues.render" (dict "value" $celery.args "context" $) | nindent 12 }}

charts/nautobot/values.schema.json

@@ -294,7 +294,7 @@
               "properties": {
                 "engine": {
                   "type": "string",
-                  "pattern": "^(django\\.db\\.backends\\.postgresql|django\\.db\\.backends\\.mysql)$"
+                  "pattern": "^(django\\.db\\.backends\\.postgresql|django\\.db\\.backends\\.mysql|django_prometheus\\.db\\.backends\\.postgresql|django_prometheus\\.db\\.backends\\.mysql)$"
                 },
                 "existingSecret": {
                   "type": "string"

charts/nautobot/values.yaml

@@ -42,7 +42,7 @@ nautobot:
     # -- Nautobot image name, common to all deployments
     repository: "nautobot/nautobot"
     # -- Nautobot image tag, common to all deployments
-    tag: "1.5.21-py3.10"
+    tag: "1.6.2-py3.11"
     # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/), common to all deployments valid values: `Always`, `Never`, or `IfNotPresent`
     pullPolicy: "Always"
     # -- ([]string) List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments

docs/advanced-features/custom-image.md

@@ -7,7 +7,7 @@ nautobot:
   image:
     registry: "ghcr.io"
     repository: "nautobot/nautobot"
-    tag: "1.5.17-py3.10"
+    tag: "1.6.2-py3.11"
     pullPolicy: "Always"
     pullSecrets:
       - ghcr-pull-secret

docs/configuration/reference.md

@@ -176,7 +176,7 @@ The `mariadb.*` values configure the upstream chart from Bitnami.  Please see th
 | <a name="nautobot.image.pullSecrets">[nautobot.image.pullSecrets](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L49)</a> | []string | `[]` | List of secret names to be used as image [pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/), common to all deployments |
 | <a name="nautobot.image.registry">[nautobot.image.registry](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L41)</a> | string | `"ghcr.io"` | Nautobot image registry, common to all deployments |
 | <a name="nautobot.image.repository">[nautobot.image.repository](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L43)</a> | string | `"nautobot/nautobot"` | Nautobot image name, common to all deployments |
-| <a name="nautobot.image.tag">[nautobot.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L45)</a> | string | `"1.5.21-py3.10"` | Nautobot image tag, common to all deployments |
+| <a name="nautobot.image.tag">[nautobot.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L45)</a> | string | `"1.6.2-py3.11"` | Nautobot image tag, common to all deployments |
 | <a name="nautobot.initContainers">[nautobot.initContainers](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L203)</a> | [][Container](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Container) | `[]` | [[ref](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)] Add additional init containers to the Nautobot server pods |
 | <a name="nautobot.lifecycleHooks">[nautobot.lifecycleHooks](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L175)</a> | [Lifecycle](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle) | `{}` | lifecycleHooks for the Nautobot container(s) to automate configuration before or after startup |
 | <a name="nautobot.livenessProbe">[nautobot.livenessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L61)</a> | [Probe](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1) | See values.yaml | [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot liveness probe |

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

@@ -3,6 +3,23 @@
 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.0.4 - 2023-09-21
+
+### Fixed
+
+* [#306](https://github.com/nautobot/helm-charts/issues/306) Bug: configured prometheus backend not possible
+* [#316](https://github.com/nautobot/helm-charts/issues/316) Concurrency int breaks deployment
+* [#255](https://github.com/nautobot/helm-charts/issues/255) Switch dependencies to OCI
+
+### Changed
+
+* Upgraded Nautobot from 1.5.23 to 1.6.2
+* Upgraded Mariadb subchart from 12.2.5 to 13.1.3
+* Upgraded PostgreSQL subchart from 12.5.7 to 12.12.4
+* Upgraded PostgreSQL-HA subchart from 11.7.5 to 11.9.4
+* Upgraded RabbitMQ subchart from 12.0.1 to 12.1.5
+* Upgraded Redis subchart from 17.11.5 to 18.0.4
+
 ## 2.0.3 - 2023-06-16
 
 ### Fixed

docs/requirements.txt

@@ -1,3 +1,3 @@
-mkdocs==1.4.3
-mkdocs-material==9.1.16
+mkdocs==1.5.3
+mkdocs-material==9.3.2
 mkdocs-version-annotations==1.0.0

pyproject.toml

@@ -9,9 +9,9 @@ readme = "README.md"
 python = "^3.8"
 invoke = "*"
 # Rendering docs to HTML
-mkdocs = "~1.4.2"
+mkdocs = "~1.5.3"
 # Material for MkDocs theme
-mkdocs-material = "9.1.16"
+mkdocs-material = "9.3.2"
 # Render custom markdown for version added/changed/remove notes
 mkdocs-version-annotations = "1.0.0"