diff --git a/changes/38834-update-apple-os-update-time b/changes/38834-update-apple-os-update-time new file mode 100644 index 0000000000..1f860dd7e6 --- /dev/null +++ b/changes/38834-update-apple-os-update-time @@ -0,0 +1 @@ +- Updated default macOS, iOS, and iPadOS update deadline time to 7PM (19:00) local time. \ No newline at end of file diff --git a/ee/server/service/mdm.go b/ee/server/service/mdm.go index a0516e50a8..dea13bb08c 100644 --- a/ee/server/service/mdm.go +++ b/ee/server/service/mdm.go @@ -1307,7 +1307,7 @@ func (svc *Service) mdmAppleEditedAppleOSUpdates(ctx context.Context, teamID *ui "Type": %q, "Payload": { "TargetOSVersion": %q, - "TargetLocalDateTime": "%sT12:00:00" + "TargetLocalDateTime": "%sT19:00:00" } }`, softwareUpdateIdentifier, softwareUpdateType, updates.MinimumVersion.Value, updates.Deadline.Value)) diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx index a35a257542..3d62d197e1 100644 --- a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx +++ b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx @@ -212,7 +212,7 @@ const AppleOSTargetForm = ({ disabled={gitOpsModeEnabled} name="deadline" label="Deadline" - tooltip="The end user can't dismiss the OS update once they reach this deadline. Deadline is 12:00 (Noon), the host's local time." + tooltip="The end user can't dismiss the OS update once they reach this deadline. Deadline is 19:00 (7PM), the host's local time." helpText="YYYY-MM-DD format only (e.g., “2024-07-01”)." value={deadline} error={deadlineError} diff --git a/server/service/integration_enterprise_test.go b/server/service/integration_enterprise_test.go index 5249fc5140..09d404c363 100644 --- a/server/service/integration_enterprise_test.go +++ b/server/service/integration_enterprise_test.go @@ -3180,7 +3180,7 @@ func (s *integrationEnterpriseTestSuite) assertAppleOSUpdatesDeclaration(teamID require.NoError(t, err) require.Contains(t, string(decl.RawJSON), fmt.Sprintf(`"TargetOSVersion": "%s"`, expected.MinimumVersion.Value)) - require.Contains(t, string(decl.RawJSON), fmt.Sprintf(`"TargetLocalDateTime": "%sT12:00:00"`, expected.Deadline.Value)) + require.Contains(t, string(decl.RawJSON), fmt.Sprintf(`"TargetLocalDateTime": "%sT19:00:00"`, expected.Deadline.Value)) } func (s *integrationEnterpriseTestSuite) TestAppleOSUpdatesTeamConfig() {