Rebase main

.github/workflows/release-chart.yaml

@@ -18,12 +18,13 @@ jobs:
   publish-oci:
     runs-on: "ubuntu-22.04"
     steps:
+      - uses: "actions/checkout@v4"
       - name: "Publish Helm charts to OCI"
-        uses: "appany/[email protected].1"
+        uses: "appany/[email protected].2"
         with:
           name: "nautobot"
           repository: "nautobot/helm-charts"
-          tag: "${{ github.ref }}"
+          tag: "${{ github.ref_name }}"
           path: "charts/nautobot"
           registry: "ghcr.io"
           registry_username: "${{ secrets.REGISTRY_USERNAME }}"

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
           - "docs/"
 
   - repo: "https://github.com/streetsidesoftware/cspell-cli"
-    rev: "v8.8.2"
+    rev: "v8.13.3"
     hooks:
       - id: "cspell"
 
@@ -73,7 +73,7 @@ repos:
   #         - "console,checkov.sarif"
 
   - repo: "https://github.com/norwoodj/helm-docs"
-    rev: "v1.13.1"
+    rev: "v1.14.2"
     hooks:
       - id: "helm-docs"
         args:
@@ -84,7 +84,7 @@ repos:
           - "--template-files=README.md.gotmpl"
 
   - repo: "https://github.com/norwoodj/helm-docs"
-    rev: "v1.13.1"
+    rev: "v1.14.2"
     hooks:
       - id: "helm-docs"
         args:

charts/nautobot/Chart.lock

@@ -16,6 +16,6 @@ dependencies:
   version: 12.15.0
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.19.2
-digest: sha256:cf14954d4eece195f0719a1b919964d2d70dd39ac8c0ae2e6d4629c94499fe44
-generated: "2024-05-13T13:03:35.824684885+03:00"
+  version: 2.22.0
+digest: sha256:9ddc9c48a15e11b68e4ec2d705981f362f368b895a26a34d796398d20b21c532
+generated: "2024-08-23T10:15:05.102339736+03:00"

charts/nautobot/Chart.yaml

@@ -6,7 +6,7 @@ annotations:
   artifacthub.io/prerelease: "false"
   artifacthub.io/images: |
     - name: nautobot
-      image: ghcr.io/nautobot/nautobot:2.2.5-py3.11
+      image: ghcr.io/nautobot/nautobot:2.3.1-py3.11
   artifacthub.io/links: |
     - name: Nautobot Documentation
       url: https://docs.nautobot.com/
@@ -30,21 +30,17 @@ 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 #391 option for persistent volume claim for media files
     - kind: fixed
-      description: Fixed #398 documentation to include Persistent volume changes
+      description: Fixed unnecessary prometheus metrics endpoint
     - kind: changed
-      description: Upgraded Nautobot from 2.2.2 to 2.2.5
+      description: Upgraded Nautobot from 2.2.7 to 2.3.1
     - kind: changed
-      description: Upgraded nginx-prometheus-exporter image from 0.11.0 to 1.1.0
+      description: Upgraded Bitnami Common subchart from 2.20.3 to 2.22.0
     - kind: changed
-      description: Upgraded Bitnami Common subchart from 2.19.1 to 2.19.2
-    - kind: changed
-      description: Upgraded dependency mkdocs-material from 9.5.18 to 9.5.22
+      description: Upgraded nginx-prometheus-exporter image from 1.2.0 to 1.3.0
 apiVersion: "v2"
-appVersion: "2.2.5"
-version: "2.1.2"
+appVersion: "2.3.1"
+version: "2.2.0"
 dependencies:
   - condition: "redis.enabled"
     name: "redis"

charts/nautobot/README.md

@@ -1,6 +1,6 @@
 # nautobot
 
-![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![AppVersion: 2.2.5](https://img.shields.io/badge/AppVersion-2.2.5-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
 
 Nautobot is a Network Source of Truth and Network Automation Platform.
 
@@ -215,7 +215,7 @@ The `mariadb.*` values configure the upstream chart from Bitnami.  Please see th
 | <a name="metrics.nginxExporter.image.pullSecrets">[metrics.nginxExporter.image.pullSecrets](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L837)</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="metrics.nginxExporter.image.registry">[metrics.nginxExporter.image.registry](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L829)</a> | string | `"docker.io"` | NGINX Exporter image registry |
 | <a name="metrics.nginxExporter.image.repository">[metrics.nginxExporter.image.repository](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L831)</a> | string | `"nginx/nginx-prometheus-exporter"` | NGINX Exporter image name |
-| <a name="metrics.nginxExporter.image.tag">[metrics.nginxExporter.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L833)</a> | string | `"1.1.0"` | NGINX Exporter image tag |
+| <a name="metrics.nginxExporter.image.tag">[metrics.nginxExporter.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L833)</a> | string | `"1.3.0"` | NGINX Exporter image tag |
 | <a name="metrics.nginxExporter.livenessProbe">[metrics.nginxExporter.livenessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L866)</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)] NGINX Exporter liveness probe |
 | <a name="metrics.nginxExporter.readinessProbe">[metrics.nginxExporter.readinessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L879)</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)] NGINX Exporter readiness probe |
 | <a name="metrics.nginxExporter.resources">[metrics.nginxExporter.resources](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L856)</a> | [ResourceRequirements](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources) | See values.yaml | [[ref](http://kubernetes.io/docs/user-guide/compute-resources/)] NGINX Exporter resource requests and limits |
@@ -273,7 +273,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#L48)</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#L40)</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#L42)</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#L44)</a> | string | `"2.2.5-py3.11"` | 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#L44)</a> | string | `"2.3.1-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#L204)</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#L176)</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#L60)</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 |
@@ -290,7 +290,7 @@ The `mariadb.*` values configure the upstream chart from Bitnami.  Please see th
 | <a name="nautobot.nginx.image.pullSecrets">[nautobot.nginx.image.pullSecrets](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L289)</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.nginx.image.registry">[nautobot.nginx.image.registry](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L281)</a> | string | `"docker.io"` | NGINX image registry |
 | <a name="nautobot.nginx.image.repository">[nautobot.nginx.image.repository](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L283)</a> | string | `"nginxinc/nginx-unprivileged"` | NGINX image name |
-| <a name="nautobot.nginx.image.tag">[nautobot.nginx.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L285)</a> | string | `"1.26"` | NGINX image tag |
+| <a name="nautobot.nginx.image.tag">[nautobot.nginx.image.tag](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L285)</a> | string | `"1.27"` | NGINX image tag |
 | <a name="nautobot.nginx.lifecycleHooks">[nautobot.nginx.lifecycleHooks](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L295)</a> | [Lifecycle](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle) | `{}` | lifecycleHooks for the NGINX container(s) to automate configuration before or after startup |
 | <a name="nautobot.nginx.livenessProbe">[nautobot.nginx.livenessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L325)</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)] NGINX liveness probe |
 | <a name="nautobot.nginx.readinessProbe">[nautobot.nginx.readinessProbe](https://github.com/nautobot/helm-charts/blob/main/charts/nautobot/values.yaml#L337)</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)] NGINX readiness probe |

charts/nautobot/templates/nautobot-deployment.yaml

@@ -68,9 +68,6 @@ spec:
         - name: nautobot-init
           image: {{ include "nautobot.image" $ }}
           imagePullPolicy: {{ $nautobot.image.pullPolicy }}
-          {{- if $nautobot.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" $nautobot.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
           {{- if $nautobot.containerSecurityContext.enabled }}
           securityContext: {{- omit $nautobot.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
@@ -154,9 +151,6 @@ spec:
         - name: nautobot-certs
           image: {{ include "nautobot.image" $ }}
           imagePullPolicy: {{ $nautobot.image.pullPolicy }}
-          {{- if $nautobot.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" $nautobot.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
           command:
             - "/bin/bash"
           args:
@@ -359,9 +353,9 @@ spec:
               mountPath: "/opt/nautobot_certs"
               readOnly: true
           ports:
-            - name: "https"
+            - name: "https-nginx"
               containerPort: 8443
-            - name: "http"
+            - name: "http-nginx"
               containerPort: 8080
             - name: "metrics"
               containerPort: 8002

charts/nautobot/templates/service.yaml

@@ -32,14 +32,14 @@ spec:
   ports:
     - protocol: "TCP"
       port: {{ $.Values.service.httpsPort }}
-      targetPort: "https"
+      targetPort: {{- if $nautobot.nginx.enabled }} "https-nginx" {{- else }} "https" {{- end }}
       name: "https"
       {{- if (and (eq $.Values.service.type "NodePort") (not (empty $.Values.service.nodePorts.https))) }}
       nodePort: {{ $.Values.service.nodePorts.https }}
       {{- end }}
     - protocol: "TCP"
       port: {{ $.Values.service.port }}
-      targetPort: "http"
+      targetPort: {{- if $nautobot.nginx.enabled }} "http-nginx" {{- else }} "http" {{- end }}
       name: "http"
       {{- if (and (eq $.Values.service.type "NodePort") (not (empty $.Values.service.nodePorts.http))) }}
       nodePort: {{ $.Values.service.nodePorts.http }}

charts/nautobot/templates/servicemonitor.yaml

@@ -25,10 +25,6 @@ spec:
       scrapeTimeout: {{ $.Values.metrics.serviceMonitor.scrapeTimeout }}
     {{- end }}
     {{- if (and $.Values.metrics.capacityMetrics.enabled (eq $.Values.metrics.capacityMetrics.nautobot $nautobotName)) }}
-    - port: http
-      interval: {{ $.Values.metrics.serviceMonitor.interval }}
-      scrapeTimeout: {{ $.Values.metrics.serviceMonitor.scrapeTimeout }}
-      path: "/api/plugins/capacity-metrics/rq-metrics"
     - port: http
       interval: {{ $.Values.metrics.capacityMetrics.interval }}
       scrapeTimeout: {{ $.Values.metrics.capacityMetrics.scrapeTimeout }}

charts/nautobot/values.yaml

@@ -41,7 +41,7 @@ nautobot:
     # -- Nautobot image name, common to all deployments
     repository: "nautobot/nautobot"
     # -- Nautobot image tag, common to all deployments
-    tag: "2.2.5-py3.11"
+    tag: "2.3.1-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
@@ -282,7 +282,7 @@ nautobot:
       # -- NGINX image name
       repository: "nginxinc/nginx-unprivileged"
       # -- NGINX image tag
-      tag: "1.26"
+      tag: "1.27"
       # -- [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
@@ -830,7 +830,7 @@ metrics:
       # -- NGINX Exporter image name
       repository: "nginx/nginx-prometheus-exporter"
       # -- NGINX Exporter image tag
-      tag: "1.1.0"
+      tag: "1.3.0"
       # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/) 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