## Summary - Reverts the changes introduced by issue [#38834](https://github.com/fleetdm/fleet/issues/38834), which changed the Apple (macOS, iOS, iPadOS) OS update enforcement deadline from 12:00 PM (Noon) to 7:00 PM local time. - Reverts code from [PR #38810](https://github.com/fleetdm/fleet/pull/38810) (backend, frontend, tests) and [PR #39185](https://github.com/fleetdm/fleet/pull/39185) (documentation). - Restores the original noon (12:00) deadline in the MDM declaration payload, frontend tooltip, integration tests, REST API docs, and YAML configuration docs. ## Changes | File | Change | |------|--------| | `ee/server/service/mdm.go` | `TargetLocalDateTime` reverted from `T19:00:00` to `T12:00:00` | | `frontend/.../AppleOSTargetForm.tsx` | Deadline tooltip reverted from "19:00 (7PM)" to "12:00 (Noon)" | | `server/service/integration_enterprise_test.go` | Test assertion reverted from `T19:00:00` to `T12:00:00` | | `docs/Configuration/yaml-files.md` | 3 references reverted from "7PM" to "noon" | | `docs/REST API/rest-api.md` | 6 references reverted from "7PM" to "noon" | Built for [ntalerman](https://fleetdm.slack.com/archives/D0AEA6U4SM9/p1773780763835429) by [Kilo for Slack](https://kilo.ai/features/slack-integration) Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com> Co-authored-by: George Karr <georgekarrv@users.noreply.github.com>
This commit is contained in:
co-authored by
kiloconnect[bot]
George Karr
parent
61aad1bdba
commit
3678d6a981
@@ -2435,7 +2435,7 @@ _Available in Fleet Premium._
|
||||
| Name | Type | Description |
|
||||
| --------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| minimum_version | string | Hosts that belong to no team and are enrolled into Fleet's MDM will be prompted to update when their OS is below this version. |
|
||||
| deadline | string | Hosts that belong to no team and are enrolled into Fleet's MDM will be forced to update their OS after this deadline (7PM local time for hosts already on macOS 14 or above, 20:00 UTC for hosts on earlier macOS versions). |
|
||||
| deadline | string | Hosts that belong to no team and are enrolled into Fleet's MDM will be forced to update their OS after this deadline (noon local time for hosts already on macOS 14 or above, 20:00 UTC for hosts on earlier macOS versions). |
|
||||
| update_new_hosts | string | macOS hosts that automatically enroll (ADE) are updated to [Apple's latest version](https://fleetdm.com/guides/enforce-os-updates) during macOS Setup Assistant. For backwards compatibility, if not specified, and `deadline` and `minimum_version` are set, `update_new_hosts` is set to `true`. Otherwise, `update_new_hosts` defaults to `false`. |
|
||||
|
||||
<br/>
|
||||
@@ -2449,7 +2449,7 @@ _Available in Fleet Premium._
|
||||
| Name | Type | Description |
|
||||
| --------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| minimum_version | string | Hosts that belong to no team will be prompted to update when their OS is below this version. |
|
||||
| deadline | string | Hosts that belong to no team will be forced to update their OS after this deadline (7PM local time). |
|
||||
| deadline | string | Hosts that belong to no team will be forced to update their OS after this deadline (noon local time). |
|
||||
|
||||
<br/>
|
||||
|
||||
@@ -2462,7 +2462,7 @@ _Available in Fleet Premium._
|
||||
| Name | Type | Description |
|
||||
| --------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| minimum_version | string | Hosts that belong to no team will be prompted to update when their OS is below this version. |
|
||||
| deadline | string | Hosts that belong to no team will be forced to update their OS after this deadline (7PM local time). |
|
||||
| deadline | string | Hosts that belong to no team will be forced to update their OS after this deadline (noon local time). |
|
||||
|
||||
<br/>
|
||||
|
||||
@@ -12287,7 +12287,7 @@ _Available in Fleet Premium_
|
||||
| Name | Type | Description |
|
||||
| --------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| minimum_version | string | Hosts that belong to this team and are enrolled into Fleet's MDM will be prompted to update when their OS is below this version. |
|
||||
| deadline | string | Hosts that belong to this team and are enrolled into Fleet's MDM will be forced to update their OS after this deadline (7PM local time for hosts already on macOS 14 or above, 20:00 UTC for hosts on earlier macOS versions). |
|
||||
| deadline | string | Hosts that belong to this team and are enrolled into Fleet's MDM will be forced to update their OS after this deadline (noon local time for hosts already on macOS 14 or above, 20:00 UTC for hosts on earlier macOS versions). |
|
||||
| update_new_hosts | string | macOS hosts that automatically enroll (ADE) are updated to [Apple's latest version](https://fleetdm.com/guides/enforce-os-updates) during macOS Setup Assistant. For backwards compatibility, if not specified, and `deadline` and `minimum_version` are set, `update_new_hosts` is set to `true`. Otherwise, `update_new_hosts` defaults to `false`. |
|
||||
|
||||
<br/>
|
||||
@@ -12299,7 +12299,7 @@ _Available in Fleet Premium_
|
||||
| Name | Type | Description |
|
||||
| --------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| minimum_version | string | Hosts that belong to this team will be prompted to update when their OS is below this version. |
|
||||
| deadline | string | Hosts that belong to this team will be forced to update their OS after this deadline (7PM local time). |
|
||||
| deadline | string | Hosts that belong to this team will be forced to update their OS after this deadline (noon local time). |
|
||||
|
||||
|
||||
<br/>
|
||||
@@ -12311,7 +12311,7 @@ _Available in Fleet Premium_
|
||||
| Name | Type | Description |
|
||||
| --------------------- | ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| minimum_version | string | Hosts that belong to this team will be prompted to update when their OS is below this version. |
|
||||
| deadline | string | Hosts that belong to this team will be forced to update their OS after this deadline (7PM local time). |
|
||||
| deadline | string | Hosts that belong to this team will be forced to update their OS after this deadline (noon local time). |
|
||||
|
||||
|
||||
<br/>
|
||||
|
||||
Reference in New Issue
Block a user