feat: 支持子域名子路径

# Reviewed, transaction id: 68710

Author: jpyoung3

support-files/kubernetes/helm/bk-nodeman/templates/_helpers.tpl

@@ -290,3 +290,28 @@ initContainers:
     resources:
       {{- toYaml .Values.migrateJob.fileSync.resources | nindent 6 }}
 {{- end }}
+
+{{- define "bk-nodeman.ingress-host" -}}
+  {{- $ingress := index . 0 -}}
+  {{- $global := index . 1 -}}
+  {{- if eq $global.bkWebSiteAccess.mode "subpath" -}}
+    {{- $global.bkDomain -}}
+  {{- else -}}
+    {{- printf "%s.%s" $ingress.name $global.bkDomain -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "bk-nodeman.ingress-url" -}}
+  {{- $ingress := index . 0 -}}
+  {{- $global := index . 1 -}}
+  {{- $host := include "bk-nodeman.ingress-host" (list $ingress $global) -}}
+  {{- if $ingress.port -}}
+    {{- $host = printf "%s:%v" $host $ingress.port -}}
+  {{- end -}}
+  {{- $scheme := $global.bkDomainScheme -}}
+  {{- if eq $global.bkWebSiteAccess.mode "subpath" -}}
+    {{- printf "%s://%s" $scheme (include "bk-nodeman.urljoin" (list $host $ingress.name $ingress.path) | trimSuffix "/") -}}
+  {{- else -}}
+    {{- printf "%s://%s" $scheme (include "bk-nodeman.urljoin" (list $host $ingress.path) | trimSuffix "/") -}}
+  {{- end -}}
+{{- end -}}

support-files/kubernetes/helm/bk-nodeman/templates/configmaps/env-configmap.yaml

@@ -59,6 +59,12 @@ data:
   BKAPP_BK_GSE_APIGATEWAY: "{{ .Values.config.bkAppBkGseApiGateway }}/"
   {{- end }}
 
+  {{- if eq .Values.global.bkWebSiteAccess.mode "subpath"}}
+  BK_NODEMAN_SUBPATH: "/bknodeman/"
+  {{- else}}
+  BK_NODEMAN_SUBPATH: "/"
+  {{- end}}
+
   BK_NODEMAN_URL: "{{ .Values.bkNodemanUrl }}"
   BKAPP_BACKEND_HOST: "{{ .Values.config.bkAppBackendHost | default .Values.bkNodemanApiUrl }}"
   BKAPP_NODEMAN_CALLBACK_URL: "{{ .Values.config.bkAppNodemanCallbackUrl | default ( printf "%s/%s" .Values.bkNodemanUrl "backend" ) }}"

support-files/kubernetes/helm/bk-nodeman/templates/ingress.yaml

@@ -11,6 +11,8 @@
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}
 {{- end }}
+{{- $subPath := .Values.ingress.path | default "" -}}
+{{- $isSubpathMode := eq .Values.global.bkWebSiteAccess.mode "subpath" -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -33,6 +35,10 @@ metadata:
     {{- range $key, $value := .Values.ingress.annotations }}
     {{ $key }}: {{ include "common.tplvalues.render" (dict "value" $value "context" $) | quote }}
     {{- end }}
+    {{- if eq .Values.global.bkWebSiteAccess.mode "subpath" }}
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+    {{- end }}
 spec:
   {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
   ingressClassName: {{ .Values.ingress.className }}
@@ -52,17 +58,25 @@ spec:
     - host: {{ .Values.ingress.hostname }}
       http:
         paths:
-          {{- if .Values.ingress.extraPaths }}
-          {{- toYaml .Values.ingress.extraPaths | nindent 10 }}
-          {{- end }}
           {{- range .Values.ingress.paths }}
-          - path: {{ .path }}
+          {{- /* 核心逻辑：判断是否拼接子路径 */ -}}
+          {{- $currentPath := .path -}}
+          {{- if $isSubpathMode }}
+            {{- /* 如果路径是 /，则直接拼接前缀；如果是其他路径如 /static/，则拼在前面 */ -}}
+            {{- if eq .path "/" }}
+              {{- $currentPath = printf "%s(/|$)(.*)" $subPath -}}
+            {{- else }}
+              {{- $currentPath = printf "%s%s(/|$)(.*)" $subPath .path -}}
+            {{- end }}
+          {{- end }}
+          - path: {{ $currentPath }}
             {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
+            {{- /* 注意：使用正则和重写时，pathType 必须为 ImplementationSpecific */ -}}
+            pathType: {{ if $isSubpathMode }}ImplementationSpecific{{ else }}{{ .pathType }}{{ end }}
             {{- end }}
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
+                {{- /* 这里保持原有的 Service 分流逻辑，使用原始的 .path 匹配 */ -}}
                 {{- if or (eq "/backend/" .path) (eq "/core/api/gray/" .path) }}
                 name: "{{ $backendApiFullName }}"
                 port:
@@ -76,18 +90,6 @@ spec:
                 port:
                   number: {{ $saasApiSvcPort }}
                 {{- end }}
-              {{- else }}
-              {{- if eq "/backend/" .path }}
-              serviceName: "{{ $backendApiFullName }}"
-              servicePort: {{ $backendApiSvcPort }}
-              {{- else if eq "/static/" .path }}
-              serviceName: "{{ $saasWebFullName }}"
-              servicePort: {{ $saasWebSvcPort }}
-              {{- else }}
-              serviceName: "{{ $saasApiFullName }}"
-              servicePort: {{ $saasApiSvcPort }}
-              {{- end }}
-              {{- end }}
           {{- end }}
     {{- end }}
   {{- if or (and .Values.ingress.tls (or (include "bk-nodeman.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}

support-files/kubernetes/helm/bk-nodeman/values.yaml

@@ -11,6 +11,8 @@ global:
   bkCryptoType: "CLASSIC"
   ## 蓝鲸主域名访问协议http/https
   bkDomainScheme: http
+  bkWebSiteAccess:
+    mode: "subdomain"
 
 nameOverride: ""
 fullnameOverride: ""
@@ -164,7 +166,9 @@ ingress:
     nginx.ingress.kubernetes.io/proxy-body-size: "1024m"
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-
+  name: "bknodeman"
+  path: "/bknodeman/"
+  port: 80
   hostname: "bknodeman.example.com"
   paths:
     - path: /