Merge pull request #25 from aservo/feature/ldap_crowd_adapter_v7.2.0

Migrate to LDAP-Crowd-Adapter version 7.2.0
aservo · May 17, 2023 · 19a48f7 · 19a48f7
2 parents ebaa897 + 2424781
commit 19a48f7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/charts/ldap-crowd-adapter/Chart.yaml b/charts/ldap-crowd-adapter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: ldap-crowd-adapter
-version: 0.1.0  # the chart version
-appVersion: 7.1.0
+version: 0.2.0  # the chart version
+appVersion: 7.2.0
 description: A LDAP server that delegates request to Atlassian Crowd
 type: application
 sources:

diff --git a/charts/ldap-crowd-adapter/templates/configmap-env.yaml b/charts/ldap-crowd-adapter/templates/configmap-env.yaml
@@ -53,6 +53,10 @@ data:
   BACKEND_READINESS_CHECK: '{{ default "false" .Values.backend.crowd.readinessCheck }}'
   BACKEND_REST_BASE_URL: '{{ .Values.backend.crowd.adminRest.baseUrl }}'
   BACKEND_MIRROR_SYNC_PAGE_SIZE: '{{ .Values.backend.mirror.sync.pageSize }}'
+  BACKEND_MIRROR_SYNC_INITIAL_DELAY: '{{ .Values.backend.mirror.sync.initialDelay }}'
+  BACKEND_MIRROR_SYNC_PERIOD: '{{ .Values.backend.mirror.sync.period }}'
+  BACKEND_MIRROR_SYNC_USE_LOCKING: '{{ .Values.backend.mirror.sync.useLocking }}'
+  BACKEND_MIRROR_SYNC_LOCK_ID: '{{ .Values.backend.mirror.sync.lockId }}'
   BACKEND_MIRROR_AUDIT_LOG_PAGE_SIZE: '{{ .Values.backend.mirror.auditLog.pageSize }}'
   BACKEND_MIRROR_AUDIT_LOG_PAGE_LIMIT: '{{ .Values.backend.mirror.auditLog.pageLimit }}'
   BACKEND_MIRROR_FORCE_FULL_SYNC_ON_BOOT: '{{ .Values.backend.mirror.forceFullSyncOnBoot }}'
@@ -67,4 +71,6 @@ data:
   BACKEND_APPLY_NATIVE_SQL: '{{ .Values.backend.db.applyNativeSql }}'
   BACKEND_USE_MATERIALIZED_VIEWS: '{{ .Values.backend.db.useMaterializedViews }}'
   BACKEND_PASS_ACTIVE_USERS_ONLY: '{{ .Values.backend.db.passActiveUsersOnly }}'
+  BACKEND_LOCK_WAIT_TIME: '{{ .Values.backend.db.lockWaitTime }}'
+  BACKEND_LOCK_RECHECK_TIME: '{{ .Values.backend.db.lockRecheckTime }}'
   WAIT_DATABASE: '{{ default "false" .Values.waitDatabase }}'
diff --git a/charts/ldap-crowd-adapter/values.yaml b/charts/ldap-crowd-adapter/values.yaml
@@ -228,6 +228,10 @@ backend:
   mirror:
     sync:
       pageSize: 2000  # number of transferred entities per synchronization page
+      initialDelay: 3  # initial delay for synchronization job in seconds
+      period: 4  # period to wait for next synchronization job in seconds
+      useLocking: false  # use database locking for any synchronization
+      lockId: 123456  # lock ID must be shared betwenn all replicas
     auditLog:
       pageSize: 20  # number of transferred entries of the audit log
       pageLimit: 3  # maximum number of downloaded audit log pages before a full sync is performed
@@ -247,3 +251,5 @@ backend:
     applyNativeSql: false  # allow to apply native SQL queries
     useMaterializedViews: false  # use materialized views to increase performance (requires PostgreSQL)
     passActiveUsersOnly: true  # pass only active users to clients
+    lockWaitTime: 5  # time to wait to get the database lock in seconds
+    lockRecheckTime: 1  # time to wait between two tries in seconds to get the database lock