Merge pull request #61 from daimg/develop

update bfe initial config
bfenetworks · Mar 12, 2022 · 52f1933 · 52f1933
2 parents 3674613 + 2e2c673
commit 52f1933
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/internal/bfeConfig/configs/TLSConfig.go b/internal/bfeConfig/configs/TLSConfig.go
@@ -58,12 +58,10 @@ type TLSConfig struct {
 
 func NewTLSConfig(version string) *TLSConfig {
 	tlsConf := &TLSConfig{
-		serverCertVersion: version,
-		tlsRuleVersion:    version,
-		ingress2secret:    setmultimap.New(),
-		serverCertConf:    newServerCertConf(version),
-		tlsRuleConf:       newTlsRuleConf(version),
-		certs:             make(map[string]certConf),
+		ingress2secret: setmultimap.New(),
+		serverCertConf: newServerCertConf(version),
+		tlsRuleConf:    newTlsRuleConf(version),
+		certs:          make(map[string]certConf),
 	}
 
 	return tlsConf

diff --git a/internal/bfeConfig/configs/clusterConfig.go b/internal/bfeConfig/configs/clusterConfig.go
@@ -62,10 +62,8 @@ func NewClusterConfig(version string) *ClusterConfig {
 	clusterBackend := make(cluster_table_conf.AllClusterBackend)
 
 	return &ClusterConfig{
-		gslbVersion:         version,
-		clusterTableVersion: version,
-		ingress2Cluster:     setmultimap.New(),
-		service2Cluster:     setmultimap.New(),
+		ingress2Cluster: setmultimap.New(),
+		service2Cluster: setmultimap.New(),
 		gslbConf: gslb_conf.GslbConf{
 			Clusters: &gslbCluster,
 			Hostname: &hostname,

diff --git a/internal/bfeConfig/configs/serverDataConfig.go b/internal/bfeConfig/configs/serverDataConfig.go
@@ -52,13 +52,10 @@ type ServerDataConfig struct {
 
 func NewServerDataConfig(version string) *ServerDataConfig {
 	return &ServerDataConfig{
-		hostTableVersion:      version,
-		routeTableVersion:     version,
-		bfeClusterConfVersion: version,
-		routeRuleCache:        NewRouteRuleCache(),
-		hostTableConf:         newHostTableConf(util.NewVersion()),
-		routeTableFile:        newRouteTableConfFile(version),
-		bfeClusterConf:        newBfeClusterConf(version),
+		routeRuleCache: NewRouteRuleCache(),
+		hostTableConf:  newHostTableConf(version),
+		routeTableFile: newRouteTableConfFile(version),
+		bfeClusterConf: newBfeClusterConf(version),
 	}
 }