Merge pull request #2500 from neiljerram/update-pin-default-config

Set DatastoreType etcdv3 if EtcdEndpoints or EtcdAddr specified

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") {

go.mod

@@ -25,9 +25,9 @@ require (
 	github.com/onsi/ginkgo v1.12.0
 	github.com/onsi/gomega v1.9.0
 	github.com/pkg/errors v0.9.1
-	github.com/projectcalico/libcalico-go v1.7.2-0.20200902233834-d4bd7b4025b7
+	github.com/projectcalico/libcalico-go v1.7.2-0.20200917204009-315d5a03415f
 	github.com/projectcalico/pod2daemon v0.0.0-20200814164722-4bedcf682d20
-	github.com/projectcalico/typha v0.7.3-0.20200903040722-5ee47fb9b583
+	github.com/projectcalico/typha v0.7.3-0.20200917205717-211e99c80f9a
 	github.com/prometheus/client_golang v1.0.0
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.4.2

go.sum

@@ -549,14 +549,14 @@ github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:J
 github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54/go.mod h1:UgC0aTQ2KMDxlX3lU/stndk7DMUBJqzN40yFiILHgxc=
 github.com/projectcalico/hcsshim v0.8.9-calico h1:aRrOWouDTzKwaIoRGMV/I1QikR+ikwj1G9T9h3wD090=
 github.com/projectcalico/hcsshim v0.8.9-calico/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
-github.com/projectcalico/libcalico-go v1.7.2-0.20200902233834-d4bd7b4025b7 h1:ekJgBS6oDsWMfyhPg/saoPDRIjoj1alkfj0imliJD20=
-github.com/projectcalico/libcalico-go v1.7.2-0.20200902233834-d4bd7b4025b7/go.mod h1:+HQmSvCZc2MCvkgOm1tn0zAkpJikDhvhcRcAiavLYtg=
+github.com/projectcalico/libcalico-go v1.7.2-0.20200917204009-315d5a03415f h1:IPbk+x76yQtxZVoy8m98ulESdiWFdwvkYsTtOxannXM=
+github.com/projectcalico/libcalico-go v1.7.2-0.20200917204009-315d5a03415f/go.mod h1:+HQmSvCZc2MCvkgOm1tn0zAkpJikDhvhcRcAiavLYtg=
 github.com/projectcalico/logrus v0.0.0-20180701205716-fc9bbf2f5799 h1:9jp4YoHqZvEKDW3Z9464x/whSRCWEinIo4/JifaKR+g=
 github.com/projectcalico/logrus v0.0.0-20180701205716-fc9bbf2f5799/go.mod h1:DfgrchabbtEO9wjOz5lVae+XRvjFKKWEA9GTMme6A8g=
 github.com/projectcalico/pod2daemon v0.0.0-20200814164722-4bedcf682d20 h1:GC9FGvqtyVuw3riZe+IvZfxm7bPghY6ClT/QlEtBem4=
 github.com/projectcalico/pod2daemon v0.0.0-20200814164722-4bedcf682d20/go.mod h1:bmtxGPEug34TbG/rPrGdPGt/ewR2OBksgA7P9TPKHIk=
-github.com/projectcalico/typha v0.7.3-0.20200903040722-5ee47fb9b583 h1:EVf51PgsmAiyeH6cTMhBDCBfJ+sWFFrYHwWM4kb6leo=
-github.com/projectcalico/typha v0.7.3-0.20200903040722-5ee47fb9b583/go.mod h1:T8piPSimoYDrXkJLhr40KGislNNn+tf+zZg4ucDJOAg=
+github.com/projectcalico/typha v0.7.3-0.20200917205717-211e99c80f9a h1:KdK368GVNIRBn5D1RGvph5fl9N7nbm/CTCagutjyINM=
+github.com/projectcalico/typha v0.7.3-0.20200917205717-211e99c80f9a/go.mod h1:npFxgcFXdZSXZnKe/UlSArpEjpvMKdOchCLXvNzwotM=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=