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

upgrade to istio 1.19 (#1211)

Browse Source 
Co-authored-by: CH3CHO <ch3cho@qq.com>
Co-authored-by: rinfx <893383980@qq.com>
This commit is contained in:
澄潭
2024-08-26 09:51:47 +08:00
committed by GitHub
parent a2c2d1d521
commit f7a419770d
401 changed files with 21171 additions and 7255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,50 +20,65 @@ import (
"encoding/hex"
"errors"
"fmt"
"os"
"path"
"strings"
"os"
"github.com/gogo/protobuf/types"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"istio.io/istio/pilot/pkg/model"
_struct "github.com/golang/protobuf/ptypes/struct"
"istio.io/istio/pkg/cluster"
"k8s.io/apimachinery/pkg/types"
)
const (
DefaultDomainSuffix = "cluster.local"
// IngressClassAnnotation is the annotation on ingress resources for the class of controllers
// responsible for it
IngressClassAnnotation = "kubernetes.io/ingress.class"
)
const DefaultDomainSuffix = "cluster.local"
var domainSuffix = os.Getenv("DOMAIN_SUFFIX")
type ClusterNamespacedName struct {
model.NamespacedName
ClusterId string
types.NamespacedName
ClusterId cluster.ID
}
func (c ClusterNamespacedName) String() string {
return c.ClusterId + "/" + c.NamespacedName.String()
return c.ClusterId.String() + "/" + c.NamespacedName.String()
}
func SplitNamespacedName(name string) model.NamespacedName {
func GetDomainSuffix() string {
if len(domainSuffix) != 0 {
return domainSuffix
}
return DefaultDomainSuffix
}
func SplitNamespacedName(name string) types.NamespacedName {
nsName := strings.Split(name, "/")
if len(nsName) == 2 {
return model.NamespacedName{
return types.NamespacedName{
Namespace: nsName[0],
Name: nsName[1],
}
}
return model.NamespacedName{
return types.NamespacedName{
Name: nsName[0],
}
}
// CreateDestinationRuleName create the same format of DR name with ops.
func CreateDestinationRuleName(istioCluster, namespace, name string) string {
format := path.Join(istioCluster, namespace, name)
func CreateDestinationRuleName(istioCluster cluster.ID, namespace, name string) string {
format := path.Join(istioCluster.String(), namespace, name)
hash := md5.Sum([]byte(format))
return hex.EncodeToString(hash[:])
}
func MessageToGoGoStruct(msg proto.Message) (*types.Struct, error) {
func MessageToStruct(msg proto.Message) (*_struct.Struct, error) {
if msg == nil {
return nil, errors.New("nil message")
}
@@ -73,7 +88,7 @@ func MessageToGoGoStruct(msg proto.Message) (*types.Struct, error) {
return nil, err
}
pbs := &types.Struct{}
pbs := &_struct.Struct{}
if err := jsonpb.Unmarshal(buf, pbs); err != nil {
return nil, err
}
@@ -82,14 +97,14 @@ func MessageToGoGoStruct(msg proto.Message) (*types.Struct, error) {
}
func CreateServiceFQDN(namespace, name string) string {
if domainSuffix == "" {
domainSuffix = DefaultDomainSuffix
}
if domainSuffix == "" {
domainSuffix = DefaultDomainSuffix
}
return fmt.Sprintf("%s.%s.svc.%s", name, namespace, domainSuffix)
}
func BuildPatchStruct(config string) *types.Struct {
val := &types.Struct{}
func BuildPatchStruct(config string) *_struct.Struct {
val := &_struct.Struct{}
_ = jsonpb.Unmarshal(strings.NewReader(config), val)
return val
}