Apply ECS_PAUSE_LABELS labels to namespace pause containers (#4427)

Author: shogondo

agent/api/task/task.go

@@ -1815,16 +1815,17 @@ func (task *Task) dockerConfig(container *apicontainer.Container, apiVersion doc
 		containerConfig.Labels = make(map[string]string)
 	}
 
-	if container.Type == apicontainer.ContainerCNIPause {
+	switch container.Type {
+	case apicontainer.ContainerCNIPause, apicontainer.ContainerNamespacePause:
 		if pauseLabels := os.Getenv(PAUSE_LABELS_ENV_VAR); pauseLabels != "" {
 			// Set labels to pause container if it's provieded as env var.
 			setLabelsFromJsonString(containerConfig, pauseLabels)
 		}
+	}
 
-		if task.IsNetworkModeAWSVPC() {
-			// apply hostname to pause container's docker config
-			return task.applyENIHostname(containerConfig), nil
-		}
+	if container.Type == apicontainer.ContainerCNIPause && task.IsNetworkModeAWSVPC() {
+		// apply hostname to pause container's docker config
+		return task.applyENIHostname(containerConfig), nil
 	}
 
 	return containerConfig, nil

agent/api/task/task_test.go

@@ -5971,6 +5971,31 @@ func TestDockerConfigPauseContainerLabelsWithEnvVar_ECS_PAUSE_LABELS(t *testing.
 	assert.Equal(t, "test_b", config.Labels["test.label.2"])
 }
 
+func TestDockerConfigNamespacePauseContainerLabelsWithEnvVar_ECS_PAUSE_LABELS(t *testing.T) {
+	testTask := &Task{
+		Arn:     "arn:aws:ecs:us-east-1:012345678910:task/c09f0188-7f87-4b0f-bfc3-16296622b6fe",
+		Family:  "myFamily",
+		Version: "1",
+		Containers: []*apicontainer.Container{
+			{
+				Name: "pause",
+				Type: apicontainer.ContainerNamespacePause,
+			},
+		},
+	}
+	labelsString := "{\"test.label.1\":\"test_a\",\"test.label.2\":\"test_b\"}"
+	t.Setenv("ECS_PAUSE_LABELS", labelsString)
+
+	config, configErr := testTask.DockerConfig(testTask.Containers[0], defaultDockerClientAPIVersion)
+	if configErr != nil {
+		t.Fatal(configErr)
+	}
+
+	assert.Equal(t, 2, len(config.Labels))
+	assert.Equal(t, "test_a", config.Labels["test.label.1"])
+	assert.Equal(t, "test_b", config.Labels["test.label.2"])
+}
+
 func TestDockerConfigPauseContainerLabelsWithInvalidEnvVar_ECS_PAUSE_LABELS(t *testing.T) {
 	testTask := &Task{
 		Arn:     "arn:aws:ecs:us-east-1:012345678910:task/c09f0188-7f87-4b0f-bfc3-16296622b6fe",