From 50af795ad01736d27357ba027f4512f673255e38 Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Wed, 24 Jul 2019 19:48:12 -0400 Subject: [PATCH] Remove toggle for MARATHON_APP_ENFORCE_GROUP_ROLE from service configuration as Marathon now injects this based on the group settings. --- frameworks/helloworld/universe/config.json | 5 ----- frameworks/helloworld/universe/marathon.json.mustache | 3 --- 2 files changed, 8 deletions(-) diff --git a/frameworks/helloworld/universe/config.json b/frameworks/helloworld/universe/config.json index 3938ee7c289..0801b5192a7 100644 --- a/frameworks/helloworld/universe/config.json +++ b/frameworks/helloworld/universe/config.json @@ -10,11 +10,6 @@ "type": "string", "default": "hello-world" }, - "marathon_enforce_group_role" : { - "description": "DELEVELOPMENT ONLY! WILL BE REMOVED IN RELEASE. Whether to allocate using Mesos allocation role or use the legacy role subscription behaviour.", - "type": "boolean", - "default": false - }, "user": { "description": "The user that the service will run as.", "type": "string", diff --git a/frameworks/helloworld/universe/marathon.json.mustache b/frameworks/helloworld/universe/marathon.json.mustache index 55f075546c3..f7564097191 100644 --- a/frameworks/helloworld/universe/marathon.json.mustache +++ b/frameworks/helloworld/universe/marathon.json.mustache @@ -37,9 +37,6 @@ "PACKAGE_BUILD_TIME_EPOCH_MS": "{{package-build-time-epoch-ms}}", "PACKAGE_BUILD_TIME_STR": "{{package-build-time-str}}", "FRAMEWORK_NAME": "{{service.name}}", - {{#service.marathon_enforce_group_role}} - "MARATHON_APP_ENFORCE_GROUP_ROLE": "{{service.marathon_enforce_group_role}}", - {{/service.marathon_enforce_group_role}} "FRAMEWORK_LOG_LEVEL": "{{service.log_level}}", "FRAMEWORK_PRINCIPAL": "{{service.service_account}}", "FRAMEWORK_USER": "{{service.user}}",