Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions changelog/fragments/1753950279-windows-arm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: feature

# Change summary; a 80ish characters long description of the change.
summary: Windows ARM64 support for Elastic Defend

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
#description:

# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
component:

# PR URL; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
#pr: https://github.com/owner/repo/1234

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
#issue: https://github.com/owner/repo/1234
5 changes: 5 additions & 0 deletions pkg/component/platforms.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ var GlobalPlatforms = Platforms{
Arch: AMD64,
GOOS: Windows,
},
{
OS: Windows,
Arch: ARM64,
GOOS: Windows,
},
}

// String returns the platform string identifier.
Expand Down
9 changes: 5 additions & 4 deletions pkg/testing/common/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ func TestConfig_GetPlatforms(t *testing.T) {
Platforms: []string{"linux/arm64/centos/12/toomany"},
Err: errors.New(`failed to parse platform string "linux/arm64/centos/12/toomany": more than 3 separators`),
},
{
Platforms: []string{"windows/arm64"},
Err: errors.New(`failed to parse platform string "windows/arm64": windows on arm64 not supported`),
},
{
Platforms: []string{"linux/arm64/centos", "windows/arm64/toomany/2022"},
Err: errors.New(`failed to parse platform string "windows/arm64/toomany/2022": more than 2 separators`),
Expand All @@ -62,6 +58,7 @@ func TestConfig_GetPlatforms(t *testing.T) {
"windows",
"windows/amd64",
"windows/amd64/2022",
"windows/arm64",
},
Results: []define.OS{
{
Expand Down Expand Up @@ -114,6 +111,10 @@ func TestConfig_GetPlatforms(t *testing.T) {
Arch: define.AMD64,
Version: "2022",
},
{
Type: define.Windows,
Arch: define.ARM64,
},
},
},
}
Expand Down
3 changes: 0 additions & 3 deletions pkg/testing/define/requirements.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ func (o OS) Validate() error {
if o.Arch != AMD64 && o.Arch != ARM64 {
return errors.New("arch must be either amd64 or arm64")
}
if o.Type == Windows && o.Arch == ARM64 {
return errors.New("windows on arm64 not supported")
}
}
if o.Distro != "" && (o.Type != Linux && o.Type != Kubernetes) {
return errors.New("distro can only be set when type is linux or kubernetes")
Expand Down
5 changes: 3 additions & 2 deletions specs/endpoint-security.spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ inputs:
description: "Endpoint Security"
platforms:
- windows/amd64
- windows/arm64
outputs: *outputs
proxied_actions: *proxied_actions
runtime:
Expand All @@ -90,8 +91,8 @@ inputs:
message: "Elastic Defend requires Elastic Agent be running as Administrator or SYSTEM"
- condition: ${install.in_default} == false
message: "Elastic Defend requires Elastic Agent be installed at the default installation path"
- condition: ${runtime.native_arch} != '' and ${runtime.native_arch} != 'amd64'
message: "Elastic Defend cannot be installed on Windows running on non-AMD64 CPU"
- condition: ${runtime.native_arch} != '' and ${runtime.arch} != ${runtime.native_arch}
message: "Elastic Defend cannot run on an emulated architecture"
- condition: ${runtime.major} < 6 or (${runtime.major} == 6 and ${runtime.minor} < 2)
message: "Elastic Defend requires Windows 10 / Server 2012 or newer."
service:
Expand Down
Loading