Merge pull request #296 from nautobot/develop

Release v2.0.3

README.md

@@ -36,7 +36,7 @@ helm install {Release Name} {Repo Name}/{Chart Name}
 for example:
 
 ```console
-helm install nautobot nautobot/nautobot --set postgresql.auth.password="change-me" --set redis.auth.password="change-me"helm install nautobot nautobot/nautobot
+helm install nautobot nautobot/nautobot --set postgresql.auth.password="change-me" --set redis.auth.password="change-me"
 ```
 
 Please refer to the [Official Nautobot Helm Chart Documentation](https://docs.nautobot.com/projects/helm-charts/en/stable/) for additional information.

charts/nautobot/Chart.lock

@@ -1,21 +1,21 @@
 dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 17.11.3
+  version: 17.11.5
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 12.5.6
+  version: 12.5.7
 - name: postgresql-ha
   repository: https://charts.bitnami.com/bitnami
-  version: 11.7.4
+  version: 11.7.5
 - name: mariadb
   repository: https://charts.bitnami.com/bitnami
-  version: 12.2.4
+  version: 12.2.5
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
-  version: 11.16.1
+  version: 12.0.1
 - name: common
   repository: https://charts.bitnami.com/bitnami
   version: 2.4.0
-digest: sha256:51175a459e80881ef9f449ba3e2183570107fdb6f0f288681c41d5d8d296870c
-generated: "2023-06-04T15:11:05.809289-06:00"
+digest: sha256:72f85b889158c6a7bc0ce23c5e9f906e465d939be550562e878579b102a962bc
+generated: "2023-06-16T14:02:31.424918-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.20-py3.10
+      image: ghcr.io/nautobot/nautobot:1.5.21-py3.10
   artifacthub.io/links: |
     - name: Nautobot Documentation
       url: https://docs.nautobot.com/
@@ -31,10 +31,26 @@ annotations:
       url: https://raw.githubusercontent.com/nautobot/nautobot/develop/nautobot/docs/media/ss_plugin_chatops.png
   artifacthub.io/changes: |
     - kind: fixed
-      description:  Fixed #279 Using nautobot.db.password no longer supported in 2.0.1
+      description: Fixed #288 README Typo
+    - kind: fixed
+      description: Fixed #286 variable celery.concurrency not used
+    - kind: changed
+      description: #293 Allow Increasing uwsgi buffer size
+    - kind: changed
+      description: Upgraded Nautobot from 1.5.20 to 1.5.21
+    - kind: changed
+      description:  Upgraded Mariadb subchart from 12.2.4 to 12.2.5
+    - kind: changed
+      description:  Upgraded PostgreSQL subchart from 12.5.6 to 12.5.7
+    - kind: changed
+      description:  Upgraded PostgreSQL-HA subchart from 11.7.4 to 11.7.5
+    - kind: changed
+      description:  Upgraded RabbitMQ subchart from 11.16.1 to 12.0.1
+    - kind: changed
+      description:  Upgraded Redis subchart from 17.11.3 to 17.11.5
 apiVersion: "v2"
-appVersion: "1.5.20"
-version: "2.0.2"
+appVersion: "1.5.21"
+version: "2.0.3"
 dependencies:
   - condition: "redis.enabled"
     name: "redis"
@@ -56,7 +72,7 @@ dependencies:
   - condition: "rabbitmq.enabled"
     name: "rabbitmq"
     repository: "https://charts.bitnami.com/bitnami"
-    version: "11.x.x"
+    version: "12.x"
   - name: "common"
     repository: "https://charts.bitnami.com/bitnami"
     tags:

charts/nautobot/README.md.gotmpl

@@ -165,3 +165,4 @@ The `{{ $prefix }}.*` values configure the upstream chart from Bitnami.  Please
 ## Notes
 
 1. These are global values which apply to all Nautobot and Celery pods, these can not be overridden by the `nautobots` or `workers` dictionaries.
+2. Setting the `celery.concurrency` value will append it to the command defined in `celery.command`, if this is unintended set `celery.concurrency` to 0 and `celery.args` to an appropriate value

charts/nautobot/linter_values.yaml

@@ -17,6 +17,8 @@ nautobot:
     enabled: true
   nodeSelector:
     kubernetes.io/arch: "amd64"
+  uwsgi:
+    bufferSize: 65535
 
 nautobots:
   # Enable a separate deployment specifically for GraphQL requests
@@ -51,6 +53,7 @@ nautobots:
 
 workers:
   beat:
+    concurrency: 0
     extraVolumeMounts:
       - name: "gmail-auth"
         mountPath: "/opt/nautobot/circuit-maintenance-secrets"
@@ -60,6 +63,7 @@ workers:
         secret:
           secretName: "nautobot-gmail-auth"
   flower:
+    concurrency: 0
     enabled: true
     command:
       - "nautobot-server"
@@ -86,6 +90,7 @@ workers:
         memory: "1Gi"
 
 celery:
+  concurrency: 2
   autoscaling:
     enabled: true
   extraVolumeMounts:
@@ -131,3 +136,11 @@ commonAnnotations:
 serviceAccount:
   annotations:
     service_account_annotation: "only_the_sa"
+
+# Needed in this file for pre-commit hook
+postgresql:
+  auth:
+    password: "change-me"
+redis:
+  auth:
+    password: "change-me"

charts/nautobot/linter_values_existing_secret.yaml

@@ -0,0 +1,17 @@
+---
+nautobot:
+  db:
+    password: "supersecret"
+    # existingSecret: "my-secret"
+    # existingSecretPasswordKey: "postgres-password"
+  redis:
+    password: "supersecret"
+postgresql:
+  enabled: false
+  auth:
+    existingSecret: "my-secret"
+redis:
+  enabled: false
+  auth:
+    existingSecret: "my-secret"
+    existingSecretPasswordKey: "NAUTOBOT_REDIS_PASSWORD"

charts/nautobot/templates/_uwsgi.tpl

@@ -72,4 +72,8 @@ listen = {{ .Values.nautobot.uwsgi.listen }}
 ; harakiri = 65
 ; add-header = Connection: Keep-Alive
 ; http-keepalive = 1
+
+; For larger installations, certain API calls (example: Relationships, GraphQL) can have a length of query parameters that go over uWSGI default limit.
+; Setting the buffer size to larger than default (4096) can have an impact on memory utilization, but can be set as high as the header limit of 65535.
+buffer-size = {{ .Values.nautobot.uwsgi.bufferSize }}
 {{ end }}

charts/nautobot/templates/celery-deployment.yaml

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

charts/nautobot/values.schema.json

@@ -466,6 +466,29 @@
             },
             "uWSGIini": {
               "type": "string"
+            },
+            "uwsgi": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "listen": {
+                  "type": "integer",
+                  "minimum": 0
+                },
+                "processes": {
+                  "type": "integer",
+                  "minimum": 0
+                },
+                "threads": {
+                  "type": "integer",
+                  "minimum": 0
+                },
+                "bufferSize": {
+                  "type": "integer",
+                  "minimum": 0,
+                  "maximum": 65535
+                }
+              }
             }
           }
         }

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.20-py3.10"
+    tag: "1.5.21-py3.10"
     # -- [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
@@ -401,6 +401,8 @@ nautobot:
     processes: 3
     # -- [[ref](https://uwsgi-docs.readthedocs.io/en/latest/Options.html#threads)] Run each worker in prethreaded mode with the specified number of threads<sup>[1](#notes)</sup>
     threads: 2
+    # -- [[ref](https://uwsgi-docs.readthedocs.io/en/latest/Options.html#buffer-size)] Set the max size of a request (request-body excluded), this generally maps to the size of request headers. By default it is 4k. If you receive a bigger request (for example with big cookies or query string) you may need to increase it. It is a security measure too, so adapt to your app needs instead of maxing it out.<sup>[1](#notes)</sup>
+    bufferSize: 4096
 
   # -- ([]map[name,value]string)An array of environment variable objects (`name` and `value` are required) to add to ALL Nautobot and Nautobot Worker related deployments<sup>[1](#notes)</sup>
   extraVars: []  # https://docs.nautobot.com/projects/core/en/stable/configuration/optional-settings/
@@ -452,7 +454,7 @@ celery:
   # -- Enables the default Celery Worker for Nautobot
   enabled: true
 
-  # -- [[ref](https://docs.nautobot.com/projects/core/en/stable/administration/celery-queues/#concurrency-setting)]Concurrency Setting (0: use the default which is the number of CPUs available on your system)
+  # -- [[ref](https://docs.nautobot.com/projects/core/en/stable/administration/celery-queues/#concurrency-setting)]Concurrency Setting (0: use the default which is the number of CPUs available on your system)<sup>[2](#notes)</sup>
   concurrency: 0
   # -- Number of Nautobot Celery Workers replicas to deploy
   replicaCount: 2
@@ -663,6 +665,7 @@ workers:
   # @default -- See values.yaml
   beat:
     enabled: true
+    concurrency: 0
     replicaCount: 1  # Beat can have a max replicaCount of 1
     command:
       - "nautobot-server"