Merge branch 'master' into env-update-in-apply

dashboard/src/components/ProvisionerSettings.tsx

@@ -100,6 +100,9 @@ const machineTypeOptions = [
   { value: "r6i.24xlarge", label: "r6i.24xlarge" },
   { value: "r6i.32xlarge", label: "r6i.32xlarge" },
   { value: "g4dn.xlarge", label: "g4dn.xlarge" },
+  { value: "m5n.large", label: "m5n.large" },
+  { value: "m5n.xlarge", label: "m5n.xlarge" },
+  { value: "m5n.2xlarge", label: "m5n.2xlarge" },
 ];
 
 const defaultCidrVpc = "10.78.0.0/16"

dashboard/src/main/home/add-on-dashboard/AddOnDashboard.tsx

@@ -207,7 +207,7 @@ const AddOnDashboard: React.FC<Props> = ({
               <Fieldset>
                 <Container row>
                   <PlaceholderIcon src={notFound} />
-                  <Text color="helper">No matching add-ons were found.</Text>
+                  <Text color="helper">{searchValue === "" ? "No add-ons have been deployed yet." : "No matching add-ons were found."}</Text>
                 </Container>
               </Fieldset>
             ) : (isLoading ? <Loading offset="-150px" /> : view === "grid" ? (

dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/utils.ts

@@ -78,4 +78,10 @@ export const AWS_INSTANCE_LIMITS: InstanceTypes = Object.freeze({
     large: { vCPU: 2, RAM: 32 },
     xlarge: { vCPU: 4, RAM: 64 },
   },
+  m5n: {
+    large: { vCPU: 2, RAM: 8 },
+    xlarge: { vCPU: 4, RAM: 16 },
+    "2xlarge": { vCPU: 8, RAM: 32 },
+    "4xlarge": { vCPU: 16, RAM: 64 },
+  },
 });