chore(update): sync with upstream/development

TencentBlueKing · May 19, 2022 · dd85e5a · dd85e5a
2 parents f05c1d9 + eec0541
commit dd85e5a
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/deploy/helm/bk-user/Chart.yaml b/deploy/helm/bk-user/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: bk-user
 description: A Helm chart for bk-user
 type: application
-version: 1.2.13
-appVersion: "v2.3.4-beta.21"
+version: 1.2.14
+appVersion: "v2.3.4-beta.22"
 
 dependencies:
 

diff --git a/deploy/helm/bk-user/charts/api/Chart.yaml b/deploy/helm/bk-user/charts/api/Chart.yaml
@@ -3,4 +3,4 @@ name: api
 description: Api module for bk-user
 type: application
 version: 1.0.0
-appVersion: "v2.3.4-beta.21"
+appVersion: "v2.3.4-beta.22"
diff --git a/deploy/helm/bk-user/charts/api/values.yaml b/deploy/helm/bk-user/charts/api/values.yaml
@@ -89,7 +89,7 @@ image:
   registry: hub.bktencent.com
   repository: blueking/bk-user-api
   pullPolicy: IfNotPresent
-  tag: "v2.3.4-beta.21"
+  tag: "v2.3.4-beta.22"
 
 nameOverride: ""
 fullnameOverride: ""

diff --git a/deploy/helm/bk-user/charts/login/Chart.yaml b/deploy/helm/bk-user/charts/login/Chart.yaml
@@ -3,4 +3,4 @@ name: login
 description: login module for blueking
 type: application
 version: 1.0.0
-appVersion: "v2.3.4-beta.21"
+appVersion: "v2.3.4-beta.22"
diff --git a/deploy/helm/bk-user/charts/login/values.yaml b/deploy/helm/bk-user/charts/login/values.yaml
@@ -83,7 +83,7 @@ image:
   registry: hub.bktencent.com
   repository: blueking/bk-login
   pullPolicy: IfNotPresent
-  tag: "v2.3.4-beta.21"
+  tag: "v2.3.4-beta.22"
 
 nameOverride: ""
 fullnameOverride: ""

diff --git a/deploy/helm/bk-user/charts/saas/Chart.yaml b/deploy/helm/bk-user/charts/saas/Chart.yaml
@@ -3,4 +3,4 @@ name: saas
 description: SaaS module for bk-user
 type: application
 version: 1.0.0
-appVersion: "v2.3.4-beta.21"
+appVersion: "v2.3.4-beta.22"
diff --git a/deploy/helm/bk-user/charts/saas/values.yaml b/deploy/helm/bk-user/charts/saas/values.yaml
@@ -81,7 +81,7 @@ image:
   registry: hub.bktencent.com
   repository: blueking/bk-user-saas
   pullPolicy: IfNotPresent
-  tag: "v2.3.4-beta.21"
+  tag: "v2.3.4-beta.22"
 
 command: []
 args: []

diff --git a/src/api/bkuser_core/user_settings/migrations/0007_auto_20210703_2020.py b/src/api/bkuser_core/user_settings/migrations/0007_auto_20210703_2020.py
@@ -21,7 +21,7 @@ def forwards_func(apps, schema_editor):
     need_connect_types = [CategoryType.MAD.value, CategoryType.LDAP.value]
     new_setting_meta_map = {}
     for category_type in need_connect_types:
-        meta = SettingMeta.objects.get_or_create(
+        meta, _ = SettingMeta.objects.get_or_create(
             namespace=SettingsEnableNamespaces.FIELDS.value,
             region="group",
             category_type=category_type,

diff --git a/src/api/poetry.lock b/src/api/poetry.lock
diff --git a/src/api/pyproject.toml b/src/api/pyproject.toml
@@ -15,7 +15,7 @@ dataclasses = "0.7"
 django-mptt = "0.12.0"
 jsonfield = "3.1.0"
 gunicorn = "19.9.0"
-ldap3 = "2.6.1"
+ldap3 = "^2.9.1"
 PyMySQL = "1.0.2"
 phonenumbers = "8.11.0"
 whitenoise = "5.2.0"