diff --git a/helm-charts/bk-dbm/Chart.lock b/helm-charts/bk-dbm/Chart.lock index 86caa0a60f..5bec8c68b7 100644 --- a/helm-charts/bk-dbm/Chart.lock +++ b/helm-charts/bk-dbm/Chart.lock @@ -13,13 +13,13 @@ dependencies: version: 9.15.2 - name: reloader repository: https://stakater.github.io/stakater-charts - version: 1.0.95 + version: 1.0.105 - name: grafana repository: file://./charts/grafana version: 7.9.8 - name: dbm repository: file://charts/dbm - version: 0.1.37 + version: 0.1.38 - name: dbconfig repository: file://charts/dbconfig version: 0.1.13 @@ -56,5 +56,5 @@ dependencies: - name: backup-consumer repository: file://charts/backup-consumer version: 0.0.3 -digest: sha256:aee792d18a336c888e42616e83c27b4f015baf04f9fd63c266fe0a5bf21460a3 -generated: "2024-05-10T21:15:46.7211+08:00" +digest: sha256:0e1a3f01fa52e53dc8f1e99aa53066cfd0690c7a191d992426a5386f32a799c5 +generated: "2024-06-06T18:27:24.419219+08:00" diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml index 8f59c3eb58..927dc231ef 100644 --- a/helm-charts/bk-dbm/Chart.yaml +++ b/helm-charts/bk-dbm/Chart.yaml @@ -27,7 +27,7 @@ dependencies: - condition: dbm.enabled name: dbm repository: file://charts/dbm - version: 0.1.37 + version: 0.1.38 - condition: dbconfig.enabled name: dbconfig repository: file://charts/dbconfig @@ -79,5 +79,5 @@ dependencies: description: A Helm chart for bk-dbm name: bk-dbm type: application -version: 1.4.0-alpha.53 -appVersion: 1.4.0-alpha.53 +version: 1.4.0-alpha.54 +appVersion: 1.4.0-alpha.54 diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml index c7457ce733..0857ba6348 100644 --- a/helm-charts/bk-dbm/charts/dbm/Chart.yaml +++ b/helm-charts/bk-dbm/charts/dbm/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 1.4.0-alpha.873 description: A Helm chart for dbm name: dbm type: application -version: 0.1.37 +version: 0.1.38 diff --git a/helm-charts/bk-dbm/charts/dbm/templates/_helpers.tpl b/helm-charts/bk-dbm/charts/dbm/templates/_helpers.tpl index 4689e8d988..9d583b8ee8 100644 --- a/helm-charts/bk-dbm/charts/dbm/templates/_helpers.tpl +++ b/helm-charts/bk-dbm/charts/dbm/templates/_helpers.tpl @@ -99,6 +99,10 @@ environment variables {{- printf "%s-%s-%d" (include "dbm.fullname" .) "db-ssl-init" .Release.Revision }} {{- end }} +{{- define "dbm.iamInitJobName" -}} +{{- printf "%s-%s-%d" (include "dbm.fullname" .) "db-iam-init" .Release.Revision }} +{{- end }} + {{- define "dbm.bknoticeInitJobName" -}} {{- printf "%s-%s-%d" (include "dbm.fullname" .) "db-notice-init" .Release.Revision }} {{- end }} 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 e9fc9d4a47..eec9bf8bce 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 @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ include "dbm.sslInitJobName" . }} + name: {{ include "dbm.iamInitJobName" . }} labels: {{- include "dbm.labels" . | nindent 4 }} spec: