Merge branch 'develop' into ranger/big-tests

netbox-community · Dec 16, 2024 · 992c015 · 992c015
2 parents a9453e1 + 344f8be
commit 992c015
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 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,6 +1,6 @@
 apiVersion: v2
 name: netbox
-version: 5.0.0-beta.166
+version: 5.0.0-beta.169
 appVersion: "v4.1.8"
 type: application
 kubeVersion: ^1.25.0-0
@@ -22,7 +22,7 @@ dependencies:
     tags:
       - bitnami-common
   - name: postgresql
-    version: ^16.3.0
+    version: ^16.3.1
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql.enabled
   - name: redis

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.schema.json b/charts/netbox/values.schema.json
@@ -1021,7 +1021,7 @@
               "type": "string"
             },
             "userDnTemplate": {
-              "type": "null"
+              "type": "string"
             },
             "userSearchBaseDn": {
               "type": "string"
@@ -1063,7 +1063,7 @@
               "type": "boolean"
             },
             "mirrorGroupsExcept": {
-              "type": "null"
+              "type": "string"
             },
             "cacheTimeout": {
               "type": "integer"
@@ -1364,7 +1364,7 @@
       "type": "object"
     },
     "terminationGracePeriodSeconds": {
-      "type": "null"
+      "type": ["null", "number"]
     },
     "test": {
       "properties": {
@@ -1610,7 +1610,7 @@
           "type": "array"
         },
         "terminationGracePeriodSeconds": {
-          "type": "null"
+          "type": ["null", "number"]
         },
         "tolerations": {
           "type": "array"

diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
@@ -387,7 +387,7 @@ remoteAuth:
     caCertData: ""
     bindDn: CN=Netbox,OU=EmbeddedDevices,OU=MyCompany,DC=example,dc=com
     bindPassword: ""
-    userDnTemplate: null
+    userDnTemplate: ""
     userSearchBaseDn: OU=Users,OU=MyCompany,DC=example,dc=com
     userSearchAttr: sAMAccountName
     groupSearchBaseDn: OU=Groups,OU=MyCompany,DC=example,dc=com
@@ -402,7 +402,7 @@ remoteAuth:
       - CN=Domain Admins,CN=Users,DC=example,dc=com
     findGroupPerms: true
     mirrorGroups: true
-    mirrorGroupsExcept: null
+    mirrorGroupsExcept: ""
     cacheTimeout: 3600
     attrFirstName: givenName
     attrLastName: sn