chore: remove deprecated labels config option (#9609)

agent/cmd/determined-agent/init.go

@@ -88,10 +88,6 @@ func registerAgentConfig() {
 	registerInt(flags, name("master-port"), defaults.MasterPort, "Port of the master")
 	registerString(flags, name("agent-id"), defaults.AgentID, "Unique ID of this Determined agent")
 
-	// Label flags.
-	registerString(flags, name("label"), defaults.Label,
-		"This field has been deprecated and will be ignored, use ``resource_pool`` instead.")
-
 	// ResourcePool flags.
 	registerString(flags, name("resource-pool"), defaults.ResourcePool,
 		"Resource Pool the agent belongs to")

agent/internal/options/options.go

@@ -48,7 +48,6 @@ type Options struct {
 	AgentID    string `json:"agent_id"`
 
 	// Label has been deprecated; we now use ResourcePool to classify the agent.
-	Label        string `json:"label"`
 	ResourcePool string `json:"resource_pool"`
 
 	ContainerMasterHost string `json:"container_master_host"`

agent/internal/options/options_test.go

@@ -84,7 +84,6 @@ log:
 master_host: master_host_IP
 master_port: 5000
 agent_id: agent_device_name
-label: deprecated
 resource_pool: agent_rp
 container_master_host: docker_localhost
 container_master_port: 2000
@@ -122,7 +121,6 @@ container_runtime: docker_runtime_env
 				MasterHost:          "master_host_IP",
 				MasterPort:          5000,
 				AgentID:             "agent_device_name",
-				Label:               "deprecated",
 				ResourcePool:        "agent_rp",
 				ContainerMasterHost: "docker_localhost",
 				ContainerMasterPort: 2000,

docs/reference/deploy/agent-config-reference.rst

@@ -165,12 +165,6 @@ In order to shut down the machine on which the agent is running, set this to ``[
 configuration may be required in order to allow the agent to execute the command from inside a
 Docker container or without the need to enter a password.
 
-***********
- ``label``
-***********
-
-Deprecated. This field has been deprecated and will be ignored. Use ``resource_pool`` instead.
-
 .. _agent-config-ref-debug:
 
 ***********

docs/reference/experiment-config-reference.rst

@@ -1248,11 +1248,6 @@ equivalent to a ``--device DEVICE`` command-line argument to ``docker run``. ``d
 by resource managers of type ``agent`` but is ignored by resource managers of type ``kubernetes``.
 See :ref:`master configuration <master-config-reference>` for details about resource managers.
 
-``agent_label``
-===============
-
-Optional. This field has been deprecated and will be ignored. Use ``resource_pool`` instead.
-
 .. _exp-bind-mounts:
 
 *************

docs/reference/job-config-reference.rst

@@ -114,9 +114,6 @@ The following configuration settings are supported:
       ``kubernetes``. See :ref:`master configuration <master-config-reference>` for details about
       resource managers.
 
-   -  ``agent_label``: This field has been deprecated and will be ignored. Use ``resource_pool``
-      instead.
-
 -  ``bind_mounts``: Specifies a collection of directories that are bind-mounted into the Docker
    containers for execution. This can be used to allow commands to access additional data that is
    not contained in the command context. This field should consist of an array of entries. Note that

docs/release-notes/remove-agent-labels.rst

@@ -0,0 +1,7 @@
+:orphan:
+
+**Breaking Changes**
+
+-  Cluster: ``resources.agent_label`` task option and agent config ``label`` option have been
+   removed. Beginning with 0.20.0 release, these options have been ignored. Please remove any
+   remaining references from configuration files and use ``resource_pool`` instead.

docs/setup-cluster/slurm/slurm-known-issues.rst

@@ -12,7 +12,6 @@ When using the HPC Launcher, Determined delegates all job scheduling and priorit
 workload manager (either Slurm or PBS) and the following experiment configuration options are
 ignored.
 
--  ``resources.agent_label``
 -  ``resources.max_slots``
 -  ``resources.priority``
 -  ``resources.weight``

harness/tests/fixtures/experiment.json

@@ -116,7 +116,6 @@
         "experiment_seed": 1661188515
       },
       "resources": {
-        "agent_label": "",
         "devices": [],
         "max_slots": null,
         "native_parallel": false,

harness/tests/fixtures/model_versions.json

@@ -177,7 +177,6 @@
                      "experiment_seed":1654719872
                   },
                   "resources":{
-                     "agent_label":"",
                      "devices":[
 
                      ],
@@ -434,7 +433,6 @@
                      "experiment_seed":1654719872
                   },
                   "resources":{
-                     "agent_label":"",
                      "devices":[
 
                      ],
@@ -691,7 +689,6 @@
                      "experiment_seed":1654719872
                   },
                   "resources":{
-                     "agent_label":"",
                      "devices":[
 
                      ],
@@ -933,7 +930,6 @@
                      "experiment_seed":1658776683
                   },
                   "resources":{
-                     "agent_label":"",
                      "devices":[
 
                      ],

master/pkg/model/experiment_config.go

@@ -94,9 +94,6 @@ type ResourcesConfig struct {
 	IsSingleNode   *bool        `json:"is_single_node"`
 
 	Devices DevicesConfig `json:"devices"`
-
-	// Deprecated: Use ResourcePool instead.
-	AgentLabel string `json:"agent_label,omitempty"`
 }
 
 // StorageSize is a named type for custom marshaling behavior for shm_size.