[#3737] Add app param to ignore manual replica count scaling

### What is the feature/fix? Add app param to ignore manual replica count scaling
convox · Aug 9, 2024 · 584ad69 · 584ad69
1 parent 1a027ce
commit 584ad69
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/provider/aws/formation/app.json.tmpl b/provider/aws/formation/app.json.tmpl
@@ -85,6 +85,11 @@
       "Type": "String",
       "Default": ""
     },
+    "IgnoreManualScaleCount": {
+      "Type": "String",
+      "Default": "No",
+      "AllowedValues": [ "Yes", "No" ]
+    },
     "InternalDomains": {
       "Type": "String",
       "Default": "Yes",
@@ -389,6 +394,7 @@
           "LogGroup": { "Fn::If": [ "EnableCloudWatch", { "Ref": "LogGroup" }, { "Ref": "AWS::NoValue" } ] },
           "InternalDomains": { "Ref": "InternalDomains" },
           "Isolate": { "Fn::If": [ "IsolateServices", "Yes", "No" ] },
+          "IgnoreManualScaleCount": { "Ref": "IgnoreManualScaleCount" },
           "Memory": { "Fn::Select": [ 2, { "Ref": "{{ upper .Name }}Formation" } ] },
           "Policies": "{{ join .Policies "," }}",
           "Private": { "Ref": "Private" },

diff --git a/provider/aws/formation/service.json.tmpl b/provider/aws/formation/service.json.tmpl
@@ -17,6 +17,7 @@
       "Private": { "Fn::Equals": [ { "Ref": "Private" }, "Yes" ] },
       "RackUrl": { "Fn::Equals": [ { "Ref": "RackUrl" }, "Yes" ] },
       "EnableContainerReadonlyRootFilesystem": { "Fn::Equals": [ { "Ref": "EnableContainerReadonlyRootFilesystem" }, "Yes" ] },
+      "EnableIgnoreManualScaleCount": { "Fn::Equals": [ { "Ref": "IgnoreManualScaleCount" }, "Yes" ] },
       "RouteHttp": { "Fn::Equals": [ { "Ref": "RedirectHttps" }, "No" ] },
       "TaskTags": { "Fn::Equals": [ { "Ref": "TaskTags" }, "Yes" ] }
     },
@@ -74,6 +75,11 @@
         "Default": "No",
         "AllowedValues": [ "Yes", "Spot", "No" ]
       },
+      "IgnoreManualScaleCount": {
+        "Type": "String",
+        "Default": "No",
+        "AllowedValues": [ "Yes", "No" ]
+      },
       "InternalDomains": {
         "Type": "String",
         "Default": "Yes",
@@ -217,15 +223,15 @@
         "Properties": {
           "ServiceToken": { "Fn::ImportValue": { "Fn::Sub": "${Rack}:CustomTopic" } },
           "X": "{{.Scale.Count.Min}}",
-          "Y": { "Ref": "Count" }
+          "Y": { "Fn::If": [ "EnableIgnoreManualScaleCount", "{{.Scale.Count.Min}}", { "Ref": "Count" } ] }
         }
       },
       "MaxCount": {
         "Type": "Custom::MathMax",
         "Properties": {
           "ServiceToken": { "Fn::ImportValue": { "Fn::Sub": "${Rack}:CustomTopic" } },
           "X": "{{.Scale.Count.Max}}",
-          "Y": { "Ref": "Count" }
+          "Y": { "Fn::If": [ "EnableIgnoreManualScaleCount", "{{.Scale.Count.Max}}", { "Ref": "Count" } ] }
         }
       },
       "AutoscalingRole": {
@@ -584,7 +590,7 @@
           {{ if .Agent.Enabled }}
             "SchedulingStrategy": "DAEMON",
           {{ else }}
-            "DesiredCount": { "Ref": "Count" },
+            "DesiredCount": { "Fn::If": [ "EnableIgnoreManualScaleCount", { "Ref": "AWS::NoValue" }, { "Ref": "Count" } ] },
             "SchedulingStrategy": "REPLICA",
             "PlacementStrategies": { "Fn::If": [ "FargateEither",
               { "Ref": "AWS::NoValue" },