mirror of
https://github.com/alibaba/higress.git
synced 2026-06-09 04:37:31 +08:00
Fix typos (#2628)
Signed-off-by: co63oc <co63oc@users.noreply.github.com> Co-authored-by: 澄潭 <zty98751@alibaba-inc.com> Co-authored-by: xingpiaoliang <erasernoobx@outlook.com>
This commit is contained in:
@@ -65,7 +65,7 @@ func (o *K8sInstaller) Install() error {
|
|||||||
return err1
|
return err1
|
||||||
}
|
}
|
||||||
fmt.Fprintf(o.writer, "\n✔️ Wrote Profile in kubernetes configmap: \"%s\" \n", profileName)
|
fmt.Fprintf(o.writer, "\n✔️ Wrote Profile in kubernetes configmap: \"%s\" \n", profileName)
|
||||||
fmt.Fprintf(o.writer, "\n Use bellow kubectl command to edit profile for upgrade. \n")
|
fmt.Fprintf(o.writer, "\n Use below kubectl command to edit profile for upgrade. \n")
|
||||||
fmt.Fprintf(o.writer, " ================================================================================== \n")
|
fmt.Fprintf(o.writer, " ================================================================================== \n")
|
||||||
names := strings.Split(profileName, "/")
|
names := strings.Split(profileName, "/")
|
||||||
fmt.Fprintf(o.writer, " kubectl edit configmap %s -n %s \n", names[1], names[0])
|
fmt.Fprintf(o.writer, " kubectl edit configmap %s -n %s \n", names[1], names[0])
|
||||||
|
|||||||
@@ -1113,7 +1113,7 @@ func (m *IngressConfig) AddOrUpdateWasmPlugin(clusterNamespacedName util.Cluster
|
|||||||
Labels: map[string]string{constants.AlwaysPushLabel: "true"},
|
Labels: map[string]string{constants.AlwaysPushLabel: "true"},
|
||||||
}
|
}
|
||||||
for _, f := range m.wasmPluginHandlers {
|
for _, f := range m.wasmPluginHandlers {
|
||||||
IngressLog.Debug("WasmPlugin triggerd update")
|
IngressLog.Debug("WasmPlugin triggered update")
|
||||||
f(config.Config{Meta: metadata}, config.Config{Meta: metadata}, istiomodel.EventUpdate)
|
f(config.Config{Meta: metadata}, config.Config{Meta: metadata}, istiomodel.EventUpdate)
|
||||||
}
|
}
|
||||||
istioWasmPlugin, err := m.convertIstioWasmPlugin(&wasmPlugin.Spec)
|
istioWasmPlugin, err := m.convertIstioWasmPlugin(&wasmPlugin.Spec)
|
||||||
@@ -1155,7 +1155,7 @@ func (m *IngressConfig) DeleteWasmPlugin(clusterNamespacedName util.ClusterNames
|
|||||||
Labels: map[string]string{constants.AlwaysPushLabel: "true"},
|
Labels: map[string]string{constants.AlwaysPushLabel: "true"},
|
||||||
}
|
}
|
||||||
for _, f := range m.wasmPluginHandlers {
|
for _, f := range m.wasmPluginHandlers {
|
||||||
IngressLog.Debug("WasmPlugin triggerd update")
|
IngressLog.Debug("WasmPlugin triggered update")
|
||||||
f(config.Config{Meta: metadata}, config.Config{Meta: metadata}, istiomodel.EventDelete)
|
f(config.Config{Meta: metadata}, config.Config{Meta: metadata}, istiomodel.EventDelete)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1211,23 +1211,23 @@ func (m *IngressConfig) AddOrUpdateMcpBridge(clusterNamespacedName util.ClusterN
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, f := range m.serviceEntryHandlers {
|
for _, f := range m.serviceEntryHandlers {
|
||||||
IngressLog.Debug("McpBridge triggerd serviceEntry update")
|
IngressLog.Debug("McpBridge triggered serviceEntry update")
|
||||||
f(config.Config{Meta: seMetadata}, config.Config{Meta: seMetadata}, istiomodel.EventUpdate)
|
f(config.Config{Meta: seMetadata}, config.Config{Meta: seMetadata}, istiomodel.EventUpdate)
|
||||||
}
|
}
|
||||||
for _, f := range m.destinationRuleHandlers {
|
for _, f := range m.destinationRuleHandlers {
|
||||||
IngressLog.Debug("McpBridge triggerd destinationRule update")
|
IngressLog.Debug("McpBridge triggered destinationRule update")
|
||||||
f(config.Config{Meta: drMetadata}, config.Config{Meta: drMetadata}, istiomodel.EventUpdate)
|
f(config.Config{Meta: drMetadata}, config.Config{Meta: drMetadata}, istiomodel.EventUpdate)
|
||||||
}
|
}
|
||||||
for _, f := range m.virtualServiceHandlers {
|
for _, f := range m.virtualServiceHandlers {
|
||||||
IngressLog.Debug("McpBridge triggerd virtualservice update")
|
IngressLog.Debug("McpBridge triggered virtualservice update")
|
||||||
f(config.Config{Meta: vsMetadata}, config.Config{Meta: vsMetadata}, istiomodel.EventUpdate)
|
f(config.Config{Meta: vsMetadata}, config.Config{Meta: vsMetadata}, istiomodel.EventUpdate)
|
||||||
}
|
}
|
||||||
for _, f := range m.wasmPluginHandlers {
|
for _, f := range m.wasmPluginHandlers {
|
||||||
IngressLog.Debug("McpBridge triggerd wasmplugin update")
|
IngressLog.Debug("McpBridge triggered wasmplugin update")
|
||||||
f(config.Config{Meta: wasmMetadata}, config.Config{Meta: wasmMetadata}, istiomodel.EventUpdate)
|
f(config.Config{Meta: wasmMetadata}, config.Config{Meta: wasmMetadata}, istiomodel.EventUpdate)
|
||||||
}
|
}
|
||||||
for _, f := range m.envoyFilterHandlers {
|
for _, f := range m.envoyFilterHandlers {
|
||||||
IngressLog.Debug("McpBridge triggerd envoyfilter update")
|
IngressLog.Debug("McpBridge triggered envoyfilter update")
|
||||||
f(config.Config{Meta: efMetadata}, config.Config{Meta: efMetadata}, istiomodel.EventUpdate)
|
f(config.Config{Meta: efMetadata}, config.Config{Meta: efMetadata}, istiomodel.EventUpdate)
|
||||||
}
|
}
|
||||||
}, m.localKubeClient, m.namespace, m.clusterId.String())
|
}, m.localKubeClient, m.namespace, m.clusterId.String())
|
||||||
@@ -1295,7 +1295,7 @@ func (m *IngressConfig) DeleteHttp2Rpc(clusterNamespacedName util.ClusterNamespa
|
|||||||
}
|
}
|
||||||
m.mutex.Unlock()
|
m.mutex.Unlock()
|
||||||
if hit {
|
if hit {
|
||||||
IngressLog.Infof("Http2Rpc triggerd deleted event executed %s", clusterNamespacedName.Name)
|
IngressLog.Infof("Http2Rpc triggered deleted event executed %s", clusterNamespacedName.Name)
|
||||||
push := func(gvk config.GroupVersionKind) {
|
push := func(gvk config.GroupVersionKind) {
|
||||||
m.XDSUpdater.ConfigUpdate(&istiomodel.PushRequest{
|
m.XDSUpdater.ConfigUpdate(&istiomodel.PushRequest{
|
||||||
Full: true,
|
Full: true,
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ func (c *ConfigmapMgr) AddOrUpdateHigressConfig(name util.ClusterNamespacedName)
|
|||||||
IngressLog.Infof("configmapMgr oldHigressConfig: %s", GetHigressConfigString(oldHigressConfig))
|
IngressLog.Infof("configmapMgr oldHigressConfig: %s", GetHigressConfigString(oldHigressConfig))
|
||||||
IngressLog.Infof("configmapMgr newHigressConfig: %s", GetHigressConfigString(newHigressConfig))
|
IngressLog.Infof("configmapMgr newHigressConfig: %s", GetHigressConfigString(newHigressConfig))
|
||||||
result, _ := c.CompareHigressConfig(oldHigressConfig, newHigressConfig)
|
result, _ := c.CompareHigressConfig(oldHigressConfig, newHigressConfig)
|
||||||
IngressLog.Infof("configmapMgr CompareHigressConfig reuslt is %d", result)
|
IngressLog.Infof("configmapMgr CompareHigressConfig result is %d", result)
|
||||||
|
|
||||||
if result == ResultNothing {
|
if result == ResultNothing {
|
||||||
return
|
return
|
||||||
@@ -177,7 +177,7 @@ func (c *ConfigmapMgr) AddOrUpdateHigressConfig(name util.ClusterNamespacedName)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
c.SetHigressConfig(newHigressConfig)
|
c.SetHigressConfig(newHigressConfig)
|
||||||
IngressLog.Infof("configmapMgr higress config AddOrUpdate success, reuslt is %d", result)
|
IngressLog.Infof("configmapMgr higress config AddOrUpdate success, result is %d", result)
|
||||||
// Call updateConfig
|
// Call updateConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ func testConvertHTTPRoute(t *testing.T, c common.KIngressController) {
|
|||||||
expectNoError: true,
|
expectNoError: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: "valid httpRoute convention, vaild ingress",
|
description: "valid httpRoute convention, valid ingress",
|
||||||
input: struct {
|
input: struct {
|
||||||
options *common.ConvertOptions
|
options *common.ConvertOptions
|
||||||
wrapperConfig *common.WrapperConfig
|
wrapperConfig *common.WrapperConfig
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ func (n *NacosMcpRegistry) refreshToolsListForGroup(group string, serviceMatcher
|
|||||||
serviceList := services.Doms
|
serviceList := services.Doms
|
||||||
pattern, err := regexp.Compile(serviceMatcher)
|
pattern, err := regexp.Compile(serviceMatcher)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.LogErrorf("Match service error for patter %s", serviceMatcher)
|
api.LogErrorf("Match service error for pattern %s", serviceMatcher)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ type TickFuncEntry struct {
|
|||||||
|
|
||||||
var globalOnTickFuncs []TickFuncEntry = []TickFuncEntry{}
|
var globalOnTickFuncs []TickFuncEntry = []TickFuncEntry{}
|
||||||
|
|
||||||
// Registe multiple onTick functions. Parameters include:
|
// Register multiple onTick functions. Parameters include:
|
||||||
// 1) tickPeriod: the execution period of tickFunc, this value should be a multiple of 100
|
// 1) tickPeriod: the execution period of tickFunc, this value should be a multiple of 100
|
||||||
// 2) tickFunc: the function to be executed
|
// 2) tickFunc: the function to be executed
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ func RedisCall(cluster Cluster, respQuery []byte, callback RedisResponseCallback
|
|||||||
response, err := proxywasm.GetRedisCallResponse(0, responseSize)
|
response, err := proxywasm.GetRedisCallResponse(0, responseSize)
|
||||||
var responseValue resp.Value
|
var responseValue resp.Value
|
||||||
if status != 0 {
|
if status != 0 {
|
||||||
proxywasm.LogCriticalf("Error occured while calling redis, it seems cannot connect to the redis cluster. request-id: %s", requestID)
|
proxywasm.LogCriticalf("Error occurred while calling redis, it seems cannot connect to the redis cluster. request-id: %s", requestID)
|
||||||
responseValue = resp.ErrorValue(fmt.Errorf("cannot connect to redis cluster"))
|
responseValue = resp.ErrorValue(fmt.Errorf("cannot connect to redis cluster"))
|
||||||
} else {
|
} else {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ var WasmPluginsKeyAuth = suite.ConformanceTest{
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
Meta: http.AssertionMeta{
|
Meta: http.AssertionMeta{
|
||||||
TestCaseName: "case 5: Muti Key Authentication information found",
|
TestCaseName: "case 5: Multi Key Authentication information found",
|
||||||
TargetBackend: "infra-backend-v1",
|
TargetBackend: "infra-backend-v1",
|
||||||
TargetNamespace: "higress-conformance-infra",
|
TargetNamespace: "higress-conformance-infra",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ var WasmPluginsTransformer = suite.ConformanceTest{
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
Meta: http.AssertionMeta{
|
Meta: http.AssertionMeta{
|
||||||
TestCaseName: "case 4: request transformer with arbitary order",
|
TestCaseName: "case 4: request transformer with arbitrary order",
|
||||||
TargetBackend: "infra-backend-v1",
|
TargetBackend: "infra-backend-v1",
|
||||||
TargetNamespace: "higress-conformance-infra",
|
TargetNamespace: "higress-conformance-infra",
|
||||||
},
|
},
|
||||||
@@ -204,7 +204,7 @@ var WasmPluginsTransformer = suite.ConformanceTest{
|
|||||||
|
|
||||||
{
|
{
|
||||||
Meta: http.AssertionMeta{
|
Meta: http.AssertionMeta{
|
||||||
TestCaseName: "case 5: response transformer with arbitary order",
|
TestCaseName: "case 5: response transformer with arbitrary order",
|
||||||
TargetBackend: "infra-backend-v1",
|
TargetBackend: "infra-backend-v1",
|
||||||
TargetNamespace: "higress-conformance-infra",
|
TargetNamespace: "higress-conformance-infra",
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user