fix: updated default case and add kinds dir to graph config

Author: abhishekmadan30

src/taskgraph/config.py

@@ -28,7 +28,6 @@
         Required("trust-domain"): str,
         Optional(
             "docker-image-kind",
-            default="docker-image",
             description="Name of the docker image kind (default: docker-image)",
         ): str,
         Required("task-priority"): optionally_keyed_by(
@@ -166,6 +165,10 @@ def taskcluster_yml(self):
     def docker_dir(self):
         return os.path.join(self.root_dir, "docker")
 
+    @property
+    def kinds_dir(self):
+        return os.path.join(self.root_dir, "kinds")
+
 
 def validate_graph_config(config):
     validate_schema(graph_config_schema, config, "Invalid graph configuration:")

src/taskgraph/util/docker.py

@@ -210,9 +210,8 @@ def image_paths(graph_config):
     """Return a map of image name to paths containing their Dockerfile."""
 
     config = load_yaml(
-        graph_config.root_dir,
-        "kinds",
-        graph_config["docker-image-kind"],
+        graph_config.kinds_dir,
+        graph_config.get("docker-image-kind", "docker-image"),
         "kind.yml",
     )
 

taskcluster/config.yml

@@ -14,8 +14,6 @@ index:
 
 task-priority: low
 
-docker-image-kind: docker-image
-
 taskgraph:
     register: self_taskgraph:register
     decision-parameters: 'self_taskgraph.custom_parameters:decision_parameters'