diff --git a/helm-charts/bk-dbm/Chart.lock b/helm-charts/bk-dbm/Chart.lock index 489164f357..1525844df8 100644 --- a/helm-charts/bk-dbm/Chart.lock +++ b/helm-charts/bk-dbm/Chart.lock @@ -19,7 +19,7 @@ dependencies: version: 7.9.8 - name: dbm repository: file://charts/dbm - version: 0.1.32 + version: 0.1.33 - 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:cdce7dfdf738437c0905f61ac8d058a90a1740ca22ed2da5c9ab6c2e863f91d1 -generated: "2024-03-07T20:39:45.062582+08:00" +digest: sha256:bf4ff8ce83089fd40ede0edf862d7e1f1c13a8b1d63a717f6fd51cee0d3a252a +generated: "2024-03-13T16:49:07.079999+08:00" diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml index 605f0d6662..0318e0d628 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.32 + version: 0.1.33 - 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.3.0-alpha.40 -appVersion: 1.3.0-alpha.40 \ No newline at end of file +version: 1.3.0-alpha.41 +appVersion: 1.3.0-alpha.41 diff --git a/helm-charts/bk-dbm/charts/backup-server/Chart.yaml b/helm-charts/bk-dbm/charts/backup-server/Chart.yaml index 9ba1b52192..0204384e2d 100644 --- a/helm-charts/bk-dbm/charts/backup-server/Chart.yaml +++ b/helm-charts/bk-dbm/charts/backup-server/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.0.1-alpha.47 +appVersion: 0.0.1-alpha.57 description: A Helm chart for backup-server name: backup-server type: application diff --git a/helm-charts/bk-dbm/charts/dbconfig/Chart.yaml b/helm-charts/bk-dbm/charts/dbconfig/Chart.yaml index 1734df1393..846b10dcd5 100644 --- a/helm-charts/bk-dbm/charts/dbconfig/Chart.yaml +++ b/helm-charts/bk-dbm/charts/dbconfig/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.0.1-alpha.80 +appVersion: 0.0.1-alpha.81 description: A Helm chart for dbconfig name: dbconfig type: application diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml index 4559ab20d9..9c9aaa5ba6 100644 --- a/helm-charts/bk-dbm/charts/dbm/Chart.yaml +++ b/helm-charts/bk-dbm/charts/dbm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 1.3.0-alpha.489 +appVersion: 1.3.0-alpha.503 description: A Helm chart for dbm name: dbm type: application -version: 0.1.32 +version: 0.1.33 diff --git a/helm-charts/bk-dbm/charts/dbm/templates/ingress-public.yaml b/helm-charts/bk-dbm/charts/dbm/templates/ingress-public.yaml new file mode 100644 index 0000000000..50ea46e284 --- /dev/null +++ b/helm-charts/bk-dbm/charts/dbm/templates/ingress-public.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingressPublic.enabled -}} +{{- $fullName := include "bk-dbm.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingressPublic.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingressPublic.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingressPublic.annotations "kubernetes.io/ingress.class" .Values.ingressPublic.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "bk-dbm.labels" . | nindent 4 }} + {{- with .Values.ingressPublic.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingressPublic.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingressPublic.className }} + {{- end }} + {{- if .Values.ingressPublic.tls }} + tls: + {{- range .Values.ingressPublic.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- if .Values.ingressPublic.hostname }} + - host: {{ .Values.ingressPublic.hostname }} + http: + paths: + {{- range .Values.ingressPublic.paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/helm-charts/bk-dbm/charts/dbpartition/Chart.yaml b/helm-charts/bk-dbm/charts/dbpartition/Chart.yaml index 2a3065064a..2b49777fa4 100644 --- a/helm-charts/bk-dbm/charts/dbpartition/Chart.yaml +++ b/helm-charts/bk-dbm/charts/dbpartition/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.0.1-alpha.152 +appVersion: 0.0.1-alpha.154 name: dbpartition description: A Helm chart for db partition service type: application diff --git a/helm-charts/bk-dbm/values.yaml b/helm-charts/bk-dbm/values.yaml index 51e9df857e..69c5dc5c26 100644 --- a/helm-charts/bk-dbm/values.yaml +++ b/helm-charts/bk-dbm/values.yaml @@ -114,7 +114,6 @@ dbm: slowQueryParseApigwDomain: "" ingress: - # 在跨云管控场景下,需要配置公网 clb 进行访问 enabled: true className: "" annotations: @@ -125,6 +124,16 @@ dbm: pathType: ImplementationSpecific tls: [] + ingressPublic: + # 在跨云管控场景下,需要配置公网 clb 进行访问 + enabled: false + className: "" + hostname: "bkdbm-public.example.com" + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + autoscaling: enabled: false