Refactor etcd config as discovery section with convenience types

kube/m3dbnode-configmap.yaml

@@ -66,15 +66,16 @@ data:
       filesystem:
         filePathPrefix: /var/lib/m3db
 
-      config:
-        service:
-            env: default_env
-            zone: embedded
-            service: m3db
-            cacheDir: /var/lib/m3kv
-            etcdClusters:
-            - zone: embedded
-              endpoints:
-              - http://etcd-0.etcd:2379
-              - http://etcd-1.etcd:2379
-              - http://etcd-2.etcd:2379
+      discovery:
+        config:
+          service:
+              env: default_env
+              zone: embedded
+              service: m3db
+              cacheDir: /var/lib/m3kv
+              etcdClusters:
+              - zone: embedded
+                endpoints:
+                - http://etcd-0.etcd:2379
+                - http://etcd-1.etcd:2379
+                - http://etcd-2.etcd:2379

scripts/development/m3_stack/m3dbnode.yml

@@ -54,20 +54,21 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-      service:
-          env: default_env
-          zone: embedded
-          service: m3db
-          cacheDir: /var/lib/m3kv
-          etcdClusters:
-              - zone: embedded
-                endpoints:
-                    - m3db_seed:2379
-      seedNodes:
-          initialCluster:
-              - hostID: m3db_seed
-                endpoint: http://m3db_seed:2380
+  discovery:
+    config:
+        service:
+            env: default_env
+            zone: embedded
+            service: m3db
+            cacheDir: /var/lib/m3kv
+            etcdClusters:
+                - zone: embedded
+                  endpoints:
+                      - m3db_seed:2379
+        seedNodes:
+            initialCluster:
+                - hostID: m3db_seed
+                  endpoint: http://m3db_seed:2380
 
   # proto:
   #   schemaFilePath: /etc/m3dbnode/schema.proto

scripts/docker-integration-tests/dedicated_etcd_embedded_coordinator/m3dbnode.yml

@@ -62,13 +62,14 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-    service:
-      env: foo-namespace/foo-cluster
-      zone: bar-zone
-      service: m3db
-      cacheDir: /var/lib/m3kv
-      etcdClusters:
-      - zone: bar-zone
-        endpoints:
-        - etcd01:2379
+  discovery:
+    config:
+      service:
+        env: foo-namespace/foo-cluster
+        zone: bar-zone
+        service: m3db
+        cacheDir: /var/lib/m3kv
+        etcdClusters:
+        - zone: bar-zone
+          endpoints:
+          - etcd01:2379

scripts/docker-integration-tests/multi_cluster_write/m3dbnode-cluster-a.yml

@@ -75,17 +75,18 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-    service:
-      env: default_env
-      zone: embedded
-      service: m3db
-      cacheDir: /var/lib/m3kv
-      etcdClusters:
-        - zone: embedded
-          endpoints:
-            - cluster_a_dbnode01:2379
-    seedNodes:
-      initialCluster:
-        - hostID: cluster_a_m3db_local_1
-          endpoint: http://cluster_a_dbnode01:2380
+  discovery:
+    config:
+      service:
+        env: default_env
+        zone: embedded
+        service: m3db
+        cacheDir: /var/lib/m3kv
+        etcdClusters:
+          - zone: embedded
+            endpoints:
+              - cluster_a_dbnode01:2379
+      seedNodes:
+        initialCluster:
+          - hostID: cluster_a_m3db_local_1
+            endpoint: http://cluster_a_dbnode01:2380

scripts/docker-integration-tests/multi_cluster_write/m3dbnode-cluster-b.yml

@@ -54,17 +54,18 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-    service:
-      env: default_env
-      zone: embedded
-      service: m3db
-      cacheDir: /var/lib/m3kv
-      etcdClusters:
-        - zone: embedded
-          endpoints:
-            - cluster_b_dbnode01:2379
-    seedNodes:
-      initialCluster:
-        - hostID: cluster_b_m3db_local_1
-          endpoint: http://cluster_b_dbnode01:2380
+  discovery:
+    config:
+      service:
+        env: default_env
+        zone: embedded
+        service: m3db
+        cacheDir: /var/lib/m3kv
+        etcdClusters:
+          - zone: embedded
+            endpoints:
+              - cluster_b_dbnode01:2379
+      seedNodes:
+        initialCluster:
+          - hostID: cluster_b_m3db_local_1
+            endpoint: http://cluster_b_dbnode01:2380

scripts/docker-integration-tests/repair/m3dbnode.yml

@@ -54,20 +54,21 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-      service:
-          env: default_env
-          zone: embedded
-          service: m3db
-          cacheDir: /var/lib/m3kv
-          etcdClusters:
-              - zone: embedded
-                endpoints:
-                    - dbnode01:2379
-      seedNodes:
-          initialCluster:
-              - hostID: m3db_local_1
-                endpoint: http://dbnode01:2380
+  discovery:
+    config:
+        service:
+            env: default_env
+            zone: embedded
+            service: m3db
+            cacheDir: /var/lib/m3kv
+            etcdClusters:
+                - zone: embedded
+                  endpoints:
+                      - dbnode01:2379
+        seedNodes:
+            initialCluster:
+                - hostID: m3db_local_1
+                  endpoint: http://dbnode01:2380
 
   # Enable repairs.
   repair:

scripts/docker-integration-tests/repair_and_replication/m3dbnode-cluster-a.yml

@@ -54,20 +54,21 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-      service:
-          env: default_env
-          zone: embedded
-          service: m3db
-          cacheDir: /var/lib/m3kv
-          etcdClusters:
-              - zone: embedded
-                endpoints:
-                    - cluster_a_dbnode01:2379
-      seedNodes:
-          initialCluster:
-              - hostID: cluster_a_m3db_local_1
-                endpoint: http://cluster_a_dbnode01:2380
+  discovery:
+    config:
+        service:
+            env: default_env
+            zone: embedded
+            service: m3db
+            cacheDir: /var/lib/m3kv
+            etcdClusters:
+                - zone: embedded
+                  endpoints:
+                      - cluster_a_dbnode01:2379
+        seedNodes:
+            initialCluster:
+                - hostID: cluster_a_m3db_local_1
+                  endpoint: http://cluster_a_dbnode01:2380
 
   # Enable repairs (within cluster a).
   repair:

scripts/docker-integration-tests/repair_and_replication/m3dbnode-cluster-b.yml

@@ -54,20 +54,21 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-      service:
-          env: default_env
-          zone: embedded
-          service: m3db
-          cacheDir: /var/lib/m3kv
-          etcdClusters:
-              - zone: embedded
-                endpoints:
-                    - cluster_b_dbnode01:2379
-      seedNodes:
-          initialCluster:
-              - hostID: cluster_b_m3db_local_1
-                endpoint: http://cluster_b_dbnode01:2380
+  discovery:
+    config:
+        service:
+            env: default_env
+            zone: embedded
+            service: m3db
+            cacheDir: /var/lib/m3kv
+            etcdClusters:
+                - zone: embedded
+                  endpoints:
+                      - cluster_b_dbnode01:2379
+        seedNodes:
+            initialCluster:
+                - hostID: cluster_b_m3db_local_1
+                  endpoint: http://cluster_b_dbnode01:2380
 
   # Enable repairs (within cluster b).
   repair:

scripts/docker-integration-tests/replication/m3dbnode-cluster-a.yml

@@ -54,20 +54,21 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-      service:
-          env: default_env
-          zone: embedded
-          service: m3db
-          cacheDir: /var/lib/m3kv
-          etcdClusters:
-              - zone: embedded
-                endpoints:
-                    - cluster_a_dbnode01:2379
-      seedNodes:
-          initialCluster:
-              - hostID: cluster_a_m3db_local_1
-                endpoint: http://cluster_a_dbnode01:2380
+  discovery:
+    config:
+        service:
+            env: default_env
+            zone: embedded
+            service: m3db
+            cacheDir: /var/lib/m3kv
+            etcdClusters:
+                - zone: embedded
+                  endpoints:
+                      - cluster_a_dbnode01:2379
+        seedNodes:
+            initialCluster:
+                - hostID: cluster_a_m3db_local_1
+                  endpoint: http://cluster_a_dbnode01:2380
 
   # Disable repairs (within cluster a).
   repair:

scripts/docker-integration-tests/replication/m3dbnode-cluster-b.yml

@@ -54,20 +54,21 @@ db:
   filesystem:
     filePathPrefix: /var/lib/m3db
 
-  config:
-      service:
-          env: default_env
-          zone: embedded
-          service: m3db
-          cacheDir: /var/lib/m3kv
-          etcdClusters:
-              - zone: embedded
-                endpoints:
-                    - cluster_b_dbnode01:2379
-      seedNodes:
-          initialCluster:
-              - hostID: cluster_b_m3db_local_1
-                endpoint: http://cluster_b_dbnode01:2380
+  discovery:
+    config:
+        service:
+            env: default_env
+            zone: embedded
+            service: m3db
+            cacheDir: /var/lib/m3kv
+            etcdClusters:
+                - zone: embedded
+                  endpoints:
+                      - cluster_b_dbnode01:2379
+        seedNodes:
+            initialCluster:
+                - hostID: cluster_b_m3db_local_1
+                  endpoint: http://cluster_b_dbnode01:2380
 
   # Disable repairs (within cluster b).
   repair:

src/cmd/services/m3dbnode/config/config.go

@@ -31,6 +31,7 @@ import (
 
 	coordinatorcfg "github.com/m3db/m3/src/cmd/services/m3query/config"
 	"github.com/m3db/m3/src/dbnode/client"
+	"github.com/m3db/m3/src/dbnode/discovery"
 	"github.com/m3db/m3/src/dbnode/environment"
 	"github.com/m3db/m3/src/dbnode/storage/series"
 	"github.com/m3db/m3/src/x/config/hostid"
@@ -140,8 +141,8 @@ type DBConfiguration struct {
 	// The pooling policy.
 	PoolingPolicy PoolingPolicy `yaml:"pooling"`
 
-	// The environment (static or dynamic) configuration.
-	EnvironmentConfig environment.Configuration `yaml:"config"`
+	// The discovery configuration.
+	DiscoveryConfig discovery.Configuration `yaml:"discovery"`
 
 	// The configuration for hashing
 	Hashing HashingConfiguration `yaml:"hashing"`