Merge branch 'develop' into develop

netbox-community · Dec 16, 2024 · 2fbb280 · 2fbb280
2 parents f8b4628 + 70c340a
commit 2fbb280
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/charts/netbox/Chart.lock b/charts/netbox/Chart.lock
diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: netbox
-version: 5.0.0-beta.162
-appVersion: "v4.1.7"
+version: 5.0.0-beta.168
+appVersion: "v4.1.8"
 type: application
 kubeVersion: ^1.25.0-0
 description: IP address management (IPAM) and data center infrastructure management (DCIM) tool
@@ -22,11 +22,11 @@ dependencies:
     tags:
       - bitnami-common
   - name: postgresql
-    version: ^16.2.5
+    version: ^16.3.1
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql.enabled
   - name: redis
-    version: ^20.4.1
+    version: ^20.5.0
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: redis.enabled
 annotations:

diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml
@@ -97,7 +97,7 @@ spec:
               fieldPath: status.podIP
         {{- end }}
         {{- if .Values.extraEnvs }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvs "context" $) | nindent 10 }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvs "context" $) | nindent 8 }}
         {{- end }}
         {{- if or .Values.extraEnvVarsCM .Values.extraEnvVarsSecret }}
         envFrom:

diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
@@ -1250,10 +1250,10 @@ housekeeping:
   schedule: "0 0 * * *"
   ## @param housekeeping.historyLimit Number of successful finished jobs to retain
   ##
-  historyLimit: 5
+  successfulJobsHistoryLimit: 5
   ## @param housekeeping.failedHistoryLimit Number of failed finished jobs to retain
   ##
-  failedHistoryLimit: 5
+  failedJobsHistoryLimit: 5
   ## @param housekeeping.command The command to execute in the housekeeping job
   ## To append another command, e.g. in order to shut down a DB sidecar container, use something like
   ##   - /bin/bash