Remove channel&&common.yaml (#8716)

Signed-off-by: xiaofan-luan <xiaofan.luan@zilliz.com>

configs/advanced/channel.yaml

@@ -1,38 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under the License.
-
-msgChannel:
-  # channel name generation rule: ${namePrefix}-${ChannelIdx}
-  chanNamePrefix:
-    cluster:           "by-dev"
-    rootCoordTimeTick: "rootcoord-timetick"
-    rootCoordStatistics: "rootcoord-statistics"
-    rootCoordDml: "rootcoord-dml"
-    search: "search"
-    searchResult: "searchResult"
-    proxyTimeTick: "proxyTimeTick"
-    queryTimeTick: "queryTimeTick"
-    queryNodeStats: "query-node-stats"
-    # cmd for loadIndex, flush, etc...
-    cmd: "cmd"
-    dataCoordInsertChannel: "insert-channel-"
-    dataCoordStatistic: "datacoord-statistics-channel"
-    dataCoordTimeTick: "datacoord-timetick-channel"
-    dataCoordSegmentInfo: "segment-info-channel"
-
-  # sub name generation rule: ${subNamePrefix}-${NodeID}
-  subNamePrefix:
-    rootCoordSubNamePrefix: "rootCoord"
-    proxySubNamePrefix: "proxy"
-    queryNodeSubNamePrefix: "queryNode"
-    dataNodeSubNamePrefix: "dataNode"
-    dataCoordSubNamePrefix: "dataCoord"
-

internal/util/paramtable/basetable.go

@@ -57,7 +57,6 @@ func (gp *BaseTable) Init() {
 
 	// TODO remove once we change helm deployment
 	gp.loadFromCommonYaml()
-	gp.loadFromChannelYaml()
 
 	gp.tryloadFromEnv()
 }
@@ -112,18 +111,6 @@ func (gp *BaseTable) loadFromCommonYaml() bool {
 	return false
 }
 
-func (gp *BaseTable) loadFromChannelYaml() bool {
-	configFile := gp.configDir + "advanced/channel.yaml"
-	if _, err := os.Stat(configFile); err == nil {
-		if err := gp.LoadYaml("advanced/channel.yaml"); err != nil {
-			panic(err)
-		}
-		return true
-	}
-	log.Debug("failed to find channel.yaml in config, skip..")
-	return false
-}
-
 func (gp *BaseTable) tryloadFromEnv() {
 	minioAddress := os.Getenv("MINIO_ADDRESS")
 	if minioAddress == "" {

internal/util/paramtable/basetable_test.go

@@ -141,11 +141,9 @@ func TestBaseTable_ConfDir(t *testing.T) {
 
 	assert.Panics(t, func() { baseParams.loadFromMilvusYaml() })
 	assert.False(t, baseParams.loadFromCommonYaml())
-	assert.False(t, baseParams.loadFromChannelYaml())
 
 	baseParams.configDir = rightConfig
 	assert.True(t, baseParams.loadFromCommonYaml())
-	assert.True(t, baseParams.loadFromChannelYaml())
 }
 
 func TestBateTable_ConfPath(t *testing.T) {