jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-26 02:35:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

support configuration domain suffix (#460) (#463)

Browse Source 
Co-authored-by: 澄潭 <zty98751@alibaba-inc.com>
This commit is contained in:
teijin
2023-08-07 16:26:51 +08:00
committed by GitHub
parent d307d0e755
commit 8c206a6456
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helm/core/templates/controller-deployment.yaml
View File

@@ -202,6 +202,8 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: DOMAIN_SUFFIX
value: {{ .Values.global.proxy.clusterDomain }}
{{- if .Values.controller.env }} {{- if .Values.controller.env }}
{{- range $key, $val := .Values.controller.env }} {{- range $key, $val := .Values.controller.env }}
- name: {{ $key }} - name: {{ $key }}

7
pkg/ingress/kube/util/util.go
View File

@@ -22,6 +22,7 @@ import (
"fmt" "fmt"
"path" "path"
"strings" "strings"
"os"
"github.com/gogo/protobuf/types" "github.com/gogo/protobuf/types"
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
@@ -30,6 +31,7 @@ import (
) )
const DefaultDomainSuffix = "cluster.local" const DefaultDomainSuffix = "cluster.local"
var domainSuffix = os.Getenv("DOMAIN_SUFFIX")
type ClusterNamespacedName struct { type ClusterNamespacedName struct {
model.NamespacedName model.NamespacedName
@@ -80,7 +82,10 @@ func MessageToGoGoStruct(msg proto.Message) (*types.Struct, error) {
} }
func CreateServiceFQDN(namespace, name string) string { func CreateServiceFQDN(namespace, name string) string {
return fmt.Sprintf("%s.%s.svc.%s", name, namespace, DefaultDomainSuffix) if domainSuffix == "" {
domainSuffix = DefaultDomainSuffix
}
return fmt.Sprintf("%s.%s.svc.%s", name, namespace, domainSuffix)
} }
func BuildPatchStruct(config string) *types.Struct { func BuildPatchStruct(config string) *types.Struct {