Skip to content

Commit

Permalink
Merge pull request #458 from nautobot/develop
Browse files Browse the repository at this point in the history
Release v2.3.3
  • Loading branch information
gertzakis authored Oct 4, 2024
2 parents 1a7cc23 + 586f323 commit 0a19535
Show file tree
Hide file tree
Showing 12 changed files with 514 additions and 478 deletions.
6 changes: 3 additions & 3 deletions charts/nautobot/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ dependencies:
version: 12.15.0
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.23.0
digest: sha256:832104a045d59a0652042ff20e752a253feed32e2d9e78034568363c47187f27
generated: "2024-09-20T09:55:20.803459957+03:00"
version: 2.24.0
digest: sha256:c0cc4595318db77612190a6292acf204b823b0dd184fc2acaabbb7c3fd3f4966
generated: "2024-10-04T09:07:04.75102425+03:00"
14 changes: 9 additions & 5 deletions charts/nautobot/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
artifacthub.io/prerelease: "false"
artifacthub.io/images: |
- name: nautobot
image: ghcr.io/nautobot/nautobot:2.3.4-py3.11
image: ghcr.io/nautobot/nautobot:2.3.6-py3.11
artifacthub.io/links: |
- name: Nautobot Documentation
url: https://docs.nautobot.com/
Expand All @@ -30,11 +30,15 @@ annotations:
- title: Chatops
url: https://raw.githubusercontent.com/nautobot/nautobot/develop/nautobot/docs/media/ss_plugin_chatops.png
artifacthub.io/changes: |
- kind: fixed
description: Media files directory being overwritten by volumeMount
- kind: added
description: Added startupProbe for Nautobot deployment
- kind: changed
description: Upgraded Nautobot from 2.3.4 to 2.3.6
- kind: changed
description: Upgraded Bitnami common subchart from 2.23.0 to 2.24.0
apiVersion: "v2"
appVersion: "2.3.4"
version: "2.3.2"
appVersion: "2.3.6"
version: "2.3.3"
dependencies:
- condition: "redis.enabled"
name: "redis"
Expand Down
459 changes: 230 additions & 229 deletions charts/nautobot/README.md

Large diffs are not rendered by default.

Binary file removed charts/nautobot/charts/common-2.23.0.tgz
Binary file not shown.
Binary file added charts/nautobot/charts/common-2.24.0.tgz
Binary file not shown.
3 changes: 3 additions & 0 deletions charts/nautobot/templates/nautobot-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,9 @@ spec:
{{- if $nautobot.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit $nautobot.readinessProbe "enabled") "context" $) | nindent 12 }}
{{- end }}
{{- if $nautobot.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit $nautobot.startupProbe "enabled") "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
- name: "nautobot-static"
mountPath: "/opt/nautobot/static"
Expand Down
3 changes: 3 additions & 0 deletions charts/nautobot/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,9 @@
"readinessProbe": {
"$ref": "#/$defs/probe"
},
"startupProbe": {
"$ref": "#/$defs/probe"
},
"replicaCount": {
"type": "integer",
"minimum": 0
Expand Down
35 changes: 24 additions & 11 deletions charts/nautobot/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4-py3.11"
tag: "2.3.6-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
Expand All @@ -55,7 +55,7 @@ nautobot:
# -- [[ref](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy)] Number of old ReplicaSets to retain
revisionHistoryLimit: 3

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot liveness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] Nautobot liveness probe
# @default -- See values.yaml
livenessProbe:
# -- Enable the Nautobot Liveness Probe
Expand All @@ -74,7 +74,7 @@ nautobot:
# -- [[ref](https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/)] Termination Grace Period Seconds
terminationGracePeriodSeconds: 30

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot readiness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] Nautobot readiness probe
# @default -- See values.yaml
readinessProbe:
enabled: true
Expand All @@ -87,6 +87,19 @@ nautobot:
failureThreshold: 3
successThreshold: 1

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] Nautobot startup probe
# @default -- See values.yaml
startupProbe:
enabled: false
httpGet:
path: "/health/"
port: "http"
initialDelaySeconds: 3
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 30
successThreshold: 1

# -- (ResourceRequirements) (ResourceRequirements) [[ref](http://kubernetes.io/docs/user-guide/compute-resources/)] Nautobot resource requests and limits
# @default -- See values.yaml
resources:
Expand Down Expand Up @@ -322,7 +335,7 @@ nautobot:
# -- ([]string) List of names of existing Secrets containing extra env vars for the NGINX containers
extraEnvVarsSecret: []

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX liveness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] NGINX liveness probe
# @default -- See values.yaml
livenessProbe:
enabled: true
Expand All @@ -334,7 +347,7 @@ nautobot:
failureThreshold: 3
successThreshold: 1

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX readiness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] NGINX readiness probe
# @default -- See values.yaml
readinessProbe:
enabled: true
Expand Down Expand Up @@ -515,7 +528,7 @@ celery:
# -- [[ref](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy)] Number of old ReplicaSets to retain
revisionHistoryLimit: 3

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot Celery Worker liveness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] Nautobot Celery Worker liveness probe
# @default -- See values.yaml
livenessProbe:
enabled: true
Expand All @@ -533,7 +546,7 @@ celery:
# -- [[ref](https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/)] Termination Grace Period Seconds
terminationGracePeriodSeconds: 30

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] Nautobot Celery Worker readiness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] Nautobot Celery Worker readiness probe
# @default -- See values.yaml
readinessProbe:
enabled: true
Expand Down Expand Up @@ -869,7 +882,7 @@ metrics:
cpu: ".5"
memory: "128Mi"

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX Exporter liveness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] NGINX Exporter liveness probe
# @default -- See values.yaml
livenessProbe:
enabled: true
Expand All @@ -882,7 +895,7 @@ metrics:
failureThreshold: 3
successThreshold: 1

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] NGINX Exporter readiness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] NGINX Exporter readiness probe
# @default -- See values.yaml
readinessProbe:
enabled: true
Expand Down Expand Up @@ -935,7 +948,7 @@ metrics:
cpu: ".01"
memory: "128Mi"

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] uWSGI Exporter liveness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] uWSGI Exporter liveness probe
# @default -- See values.yaml
livenessProbe:
enabled: true
Expand All @@ -948,7 +961,7 @@ metrics:
failureThreshold: 3
successThreshold: 1

# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)] uWSGI Exporter readiness probe
# -- (Probe) [[ref](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes)] uWSGI Exporter readiness probe
# @default -- See values.yaml
readinessProbe:
enabled: true
Expand Down
Loading

0 comments on commit 0a19535

Please sign in to comment.