From c9d535f3e24c0416a2dbf097532b819169436735 Mon Sep 17 00:00:00 2001 From: iSecloud <869820505@qq.com> Date: Tue, 28 May 2024 14:55:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E8=A1=A5=E5=85=85iam=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=20#4637?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helm-charts/bk-dbm/charts/dbm/templates/jobs/iam-init-job.yaml | 2 +- helm-charts/bk-dbm/templates/configmaps/dbm-configmap.yaml | 1 + helm-charts/bk-dbm/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/helm-charts/bk-dbm/charts/dbm/templates/jobs/iam-init-job.yaml b/helm-charts/bk-dbm/charts/dbm/templates/jobs/iam-init-job.yaml index d15fb7e254..e9fc9d4a47 100644 --- a/helm-charts/bk-dbm/charts/dbm/templates/jobs/iam-init-job.yaml +++ b/helm-charts/bk-dbm/charts/dbm/templates/jobs/iam-init-job.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceInit.sslEnabled -}} +{{- if .Values.serviceInit.iamEnabled -}} apiVersion: batch/v1 kind: Job metadata: diff --git a/helm-charts/bk-dbm/templates/configmaps/dbm-configmap.yaml b/helm-charts/bk-dbm/templates/configmaps/dbm-configmap.yaml index 5b9dc49fa4..3383af6fc8 100644 --- a/helm-charts/bk-dbm/templates/configmaps/dbm-configmap.yaml +++ b/helm-charts/bk-dbm/templates/configmaps/dbm-configmap.yaml @@ -62,6 +62,7 @@ data: BK_IAM_SKIP: "{{ .Values.bk.bkIamSkipMigrate }}" IAM_APP_URL: "{{ .Values.bk.bkIamUrl }}" BK_IAM_APIGATEWAY: "{{ .Values.bk.bkIamApiUrl }}" + BK_IAM_RESOURCE_API_HOST: "{{ .Values.bk.bkIamResourceApiHost }}" # 蓝鲸监控平台 GRAFANA_URL: "{{ .Values.bk.grafanaUrl }}" BKMONITOR_URL: "{{ .Values.bk.bkMonitorUrl }}" diff --git a/helm-charts/bk-dbm/values.yaml b/helm-charts/bk-dbm/values.yaml index f04511dcce..114e81020f 100644 --- a/helm-charts/bk-dbm/values.yaml +++ b/helm-charts/bk-dbm/values.yaml @@ -44,6 +44,7 @@ bk: bkIamSkipMigrate: false bkIamUrl: "https://bkiam.example.com" bkIamApiUrl: "https://bkiam-api.example.com" + bkIamResourceApiHost: "https://bkdbm.example.com" # 蓝鲸监控平台 grafanaUrl: "http://bk-dbm-grafana:3000" bkMonitorUrl: "https://bk_monitor.example.com" @@ -67,6 +68,7 @@ dbm: enabled: true serviceInit: itsmEnabled: true + iamEnabled: true apigwEnabled: true bklogEnabled: true bkccEnabled: true