Merge pull request #438 from nautobot/develop

Release v2.3.0

cSpell_dict.txt

@@ -40,6 +40,7 @@ loadbalancer
 loglevel
 middlewares
 mkdocs
+mmin
 nameserver
 nautobot
 nautobots

charts/nautobot/Chart.yaml

@@ -6,7 +6,7 @@ annotations:
   artifacthub.io/prerelease: "false"
   artifacthub.io/images: |
     - name: nautobot
-      image: ghcr.io/nautobot/nautobot:2.3.1-py3.11
+      image: ghcr.io/nautobot/nautobot:2.3.2-py3.11
   artifacthub.io/links: |
     - name: Nautobot Documentation
       url: https://docs.nautobot.com/
@@ -30,17 +30,17 @@ annotations:
     - title: Chatops
       url: https://raw.githubusercontent.com/nautobot/nautobot/develop/nautobot/docs/media/ss_plugin_chatops.png
   artifacthub.io/changes: |
-    - kind: fixed
-      description: Fixed unnecessary prometheus metrics endpoint
+    - kind: added
+      description: Added annotations to the Nautobot deployment
     - kind: changed
-      description: Upgraded Nautobot from 2.2.7 to 2.3.1
+      description: Enabled celery readiness and liveliness probes by default
     - kind: changed
-      description: Upgraded Bitnami Common subchart from 2.20.3 to 2.22.0
+      description: Upgraded Nautobot from 2.3.1 to 2.3.2
     - kind: changed
-      description: Upgraded nginx-prometheus-exporter image from 1.2.0 to 1.3.0
+      description: Upgraded dependency mkdocs from 1.6.0 to 1.6.1
 apiVersion: "v2"
-appVersion: "2.3.1"
-version: "2.2.0"
+appVersion: "2.3.2"
+version: "2.3.0"
 dependencies:
   - condition: "redis.enabled"
     name: "redis"

charts/nautobot/templates/celery-deployment.yaml

@@ -12,8 +12,8 @@ metadata:
     {{- 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 }}
+  {{- if (or $celery.annotations $.Values.commonAnnotations) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" (merge $celery.annotations $.Values.commonAnnotations) "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   {{- if not $celery.autoscaling.enabled }}

charts/nautobot/templates/nautobot-deployment.yaml

@@ -12,8 +12,8 @@ metadata:
     {{- 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 }}
+  {{- if (or $nautobot.annotations $.Values.commonAnnotations) }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" (merge $nautobot.annotations $.Values.commonAnnotations) "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   {{- if not $nautobot.autoscaling.enabled }}

charts/nautobot/values.schema.json

@@ -247,6 +247,19 @@
           "type": "string",
           "pattern": "^(soft|hard|)$"
         },
+        "annotations": {
+          "additionalProperties": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations",
+          "type": [
+            "object",
+            "null"
+          ]
+        },
         "podAnnotations": {
           "additionalProperties": {
             "type": [

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.3.1-py3.11"
+    tag: "2.3.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
@@ -136,6 +136,8 @@ nautobot:
   args: []
   # -- ([]HostAlias) [[ref](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/)] Nautobot pods host aliases
   hostAliases: []
+  # -- (map[string]string) [[ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)] Annotations to be applied to Nautobot deployment resource
+  annotations: {}
   # -- (map[string]string) [[ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)] Extra labels for Nautobot pods
   podLabels: {}
   # -- (map[string]string) [[ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)] Annotations for Nautobot pods
@@ -516,13 +518,13 @@ celery:
   # -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot Celery Worker liveness probe
   # @default -- See values.yaml
   livenessProbe:
-    enabled: false
+    enabled: true
     exec:
       command:
         - "bash"
         - "-c"
         - "nautobot-server celery inspect ping --destination celery@$HOSTNAME"
-    initialDelaySeconds: 5
+    initialDelaySeconds: 10
     periodSeconds: 60
     timeoutSeconds: 10
     failureThreshold: 3
@@ -534,7 +536,7 @@ celery:
   # -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot Celery Worker readiness probe
   # @default -- See values.yaml
   readinessProbe:
-    enabled: false
+    enabled: true
     exec:
       command:
         - "bash"
@@ -600,6 +602,8 @@ celery:
   args: []
   # -- ([]HostAlias) [[ref](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/)] Nautobot Celery Worker pods host aliases
   hostAliases: []
+  # -- (map[string]string) [[ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)] Annotations to be applied to Nautobot Celery Worker deployment resource
+  annotations: {}
   # -- (map[string]string) [[ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)] Extra labels for Nautobot Celery Worker pods
   podLabels: {}
   # -- (map[string]string) [[ref](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)] Annotations for Nautobot Celery Worker pods
@@ -726,9 +730,13 @@ workers:
       - "--loglevel"
       - "$(NAUTOBOT_LOG_LEVEL)"
     livenessProbe:
-      initialDelaySeconds: 30
+      exec:
+        command:
+          - "bash"
+          - "-c"
+          - "[ $(find /tmp/nautobot_celery_beat_heartbeat -mmin -0.1 | wc -l) -eq 1 ] || false"
     readinessProbe:
-      initialDelaySeconds: 30
+      enabled: false
     resources:
       requests:
         cpu: "5m"