jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-04-20 11:37:27 +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

28
pkg/cmd/server.go
View File

@@ -16,7 +16,6 @@ package cmd
import (
"fmt"
"time"
"github.com/alibaba/higress/pkg/bootstrap"
innerconstants "github.com/alibaba/higress/pkg/config/constants"
@@ -24,6 +23,7 @@ import (
"istio.io/istio/pilot/pkg/features"
"istio.io/istio/pkg/cmd"
"istio.io/istio/pkg/config/constants"
"istio.io/istio/pkg/env"
"istio.io/istio/pkg/keepalive"
"istio.io/pkg/log"
)
@@ -39,6 +39,20 @@ var (
waitForMonitorSignal = func(stop chan struct{}) {
cmd.WaitSignal(stop)
}
keepConfigLabels = env.Register(
"CONTROLLER_KEEP_XDS_CONFIG_LABELS",
true,
"If enabled, Higress Controller will keep all the labels when converting configs to xDS resources."+
" By default this is enabled. So far, this feature only works for Gateway resource.",
).Get()
keepConfigAnnotations = env.Register(
"CONTROLLER_KEEP_XDS_CONFIG_ANNOTATIONS",
true,
"If enabled, Higress Controller will keep the annotations when converting configs to xDS resources."+
" By default this is enabled. So far, this feature only works for Gateway resource.",
).Get()
)
// getServerCommand returns the server cobra command to be executed.
@@ -80,9 +94,11 @@ func getServerCommand() *cobra.Command {
GrpcAddress: ":15051",
GrpcKeepAliveOptions: keepalive.DefaultOption(),
XdsOptions: bootstrap.XdsOptions{
DebounceAfter: features.DebounceAfter,
DebounceMax: features.DebounceMax,
EnableEDSDebounce: features.EnableEDSDebounce,
DebounceAfter: features.DebounceAfter,
DebounceMax: features.DebounceMax,
EnableEDSDebounce: features.EnableEDSDebounce,
KeepConfigLabels: keepConfigLabels,
KeepConfigAnnotations: keepConfigAnnotations,
},
}
@@ -100,9 +116,7 @@ func getServerCommand() *cobra.Command {
serveCmd.PersistentFlags().StringVar(&serverArgs.RegistryOptions.KubeConfig, "kubeconfig", "",
"Use a Kubernetes configuration file instead of in-cluster configuration")
// RegistryOptions Controller options
serveCmd.PersistentFlags().DurationVar(&serverArgs.RegistryOptions.KubeOptions.ResyncPeriod, "resync", 60*time.Second,
"Controller resync interval")
serveCmd.PersistentFlags().StringVar(&serverArgs.RegistryOptions.KubeOptions.DomainSuffix, "domain", constants.DefaultKubernetesDomain,
serveCmd.PersistentFlags().StringVar(&serverArgs.RegistryOptions.KubeOptions.DomainSuffix, "domain", constants.DefaultClusterLocalDomain,
"DNS domain suffix")
serveCmd.PersistentFlags().StringVar((*string)(&serverArgs.RegistryOptions.KubeOptions.ClusterID), "clusterID", "Kubernetes",
"The ID of the cluster that this instance resides")