Set DatastoreType etcdv3 if EtcdEndpoints or EtcdAddr specified

projectcalico · Sep 18, 2020 · e3b0ddb · e3b0ddb
1 parent 5dfa987
commit e3b0ddb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/config/config_params.go b/config/config_params.go
@@ -520,10 +520,12 @@ func (config *Config) DatastoreConfig() apiconfig.CalicoAPIConfig {
 	if config.setByConfigFileOrEnvironment("EtcdEndpoints") && len(config.EtcdEndpoints) > 0 {
 		log.Infof("Overriding EtcdEndpoints from felix config to %s", config.EtcdEndpoints)
 		cfg.Spec.EtcdEndpoints = strings.Join(config.EtcdEndpoints, ",")
+		cfg.Spec.DatastoreType = apiconfig.EtcdV3
 	} else if config.setByConfigFileOrEnvironment("EtcdAddr") {
 		etcdEndpoints := config.EtcdScheme + "://" + config.EtcdAddr
 		log.Infof("Overriding EtcdEndpoints from felix config to %s", etcdEndpoints)
 		cfg.Spec.EtcdEndpoints = etcdEndpoints
+		cfg.Spec.DatastoreType = apiconfig.EtcdV3
 	}
 	// TLS.
 	if config.setByConfigFileOrEnvironment("EtcdKeyFile") {