Skip to content

Commit 074832a

Browse files
michel-latermanmichel-laterman
authored
Merge branch 'main' into fips-ech
2 parents c0be6f9 + c042f7c commit 074832a

File tree

15 files changed

+464
-35
lines changed

15 files changed

+464
-35
lines changed

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ steps:
4646
- build/diagnostics/**
4747
agents:
4848
provider: "gcp"
49-
machineType: "n1-standard-8"
49+
machineType: "n2-standard-8"
5050
image: "${IMAGE_WIN_2022}"
5151
retry:
5252
automatic:
@@ -67,7 +67,7 @@ steps:
6767
limit: 1
6868
agents:
6969
provider: "gcp"
70-
machineType: "n1-standard-8"
70+
machineType: "n2-standard-8"
7171
image: "${IMAGE_WIN_2025}"
7272
- label: "Ubuntu:2404:amd64:sudo"
7373
depends_on: packaging-ubuntu-x86-64
@@ -84,7 +84,7 @@ steps:
8484
limit: 1
8585
agents:
8686
provider: "gcp"
87-
machineType: "n1-standard-8"
87+
machineType: "n2-standard-8"
8888
image: "${IMAGE_UBUNTU_2404_X86_64}"
8989

9090
- group: "Stateful: Windows"
@@ -103,7 +103,7 @@ steps:
103103
- build/diagnostics/**
104104
agents:
105105
provider: "gcp"
106-
machineType: "n1-standard-8"
106+
machineType: "n2-standard-8"
107107
image: "${IMAGE_WIN_2022}"
108108
retry:
109109
automatic:
@@ -129,7 +129,7 @@ steps:
129129
- build/diagnostics/**
130130
agents:
131131
provider: "gcp"
132-
machineType: "n1-standard-8"
132+
machineType: "n2-standard-8"
133133
image: "${IMAGE_WIN_2022}"
134134
retry:
135135
automatic:
@@ -148,7 +148,7 @@ steps:
148148
- build/diagnostics/**
149149
agents:
150150
provider: "gcp"
151-
machineType: "n1-standard-8"
151+
machineType: "n2-standard-8"
152152
image: "${IMAGE_WIN_2025}"
153153
retry:
154154
automatic:
@@ -177,7 +177,7 @@ steps:
177177
limit: 1
178178
agents:
179179
provider: "gcp"
180-
machineType: "n1-standard-8"
180+
machineType: "n2-standard-8"
181181
image: "${IMAGE_WIN_2025}"
182182
matrix:
183183
- default
@@ -200,7 +200,7 @@ steps:
200200
limit: 1
201201
agents:
202202
provider: "gcp"
203-
machineType: "n1-standard-8"
203+
machineType: "n2-standard-8"
204204
image: "${IMAGE_UBUNTU_2404_X86_64}"
205205
matrix:
206206
- default
@@ -220,7 +220,7 @@ steps:
220220
limit: 1
221221
agents:
222222
provider: "gcp"
223-
machineType: "n1-standard-8"
223+
machineType: "n2-standard-8"
224224
image: "${IMAGE_UBUNTU_2404_X86_64}"
225225
matrix:
226226
- default
@@ -309,7 +309,7 @@ steps:
309309
limit: 1
310310
agents:
311311
provider: "gcp"
312-
machineType: "n1-standard-8"
312+
machineType: "n2-standard-8"
313313
image: "${IMAGE_DEBIAN_12}"
314314
matrix:
315315
- default
@@ -329,7 +329,7 @@ steps:
329329
limit: 1
330330
agents:
331331
provider: "gcp"
332-
machineType: "n1-standard-8"
332+
machineType: "n2-standard-8"
333333
image: "${IMAGE_DEBIAN_12}"
334334
matrix:
335335
- default
@@ -367,7 +367,7 @@ steps:
367367
limit: 1
368368
agents:
369369
provider: "gcp"
370-
machineType: "n1-standard-8"
370+
machineType: "n2-standard-8"
371371
image: "${IMAGE_RHEL_8}"
372372

373373
- group: "Kubernetes"
@@ -394,7 +394,7 @@ steps:
394394
limit: 1
395395
agents:
396396
provider: "gcp"
397-
machineType: "n1-standard-4"
397+
machineType: "n2-standard-4"
398398
image: "${IMAGE_UBUNTU_2404_X86_64}"
399399
diskSizeGb: 80
400400
matrix:

‎.buildkite/pipeline.elastic-agent-helm-charts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ steps:
1616
project-number: "911195782929"
1717
agents:
1818
provider: "gcp"
19-
machineType: "n1-standard-8"
19+
machineType: "n2-standard-8"

‎.buildkite/pipeline.integration-test-matrix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
- build/distributions/**
1313
agents:
1414
provider: "gcp"
15-
machineType: "n1-standard-8"
15+
machineType: "n2-standard-8"
1616

1717
- label: "Integration test matrix"
1818
key: "integration-tests-matrix"
@@ -26,4 +26,4 @@ steps:
2626
- "build/diagnostics/*"
2727
agents:
2828
provider: "gcp"
29-
machineType: "n1-standard-8"
29+
machineType: "n2-standard-8"

‎.ci/scripts/otel-update.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ sed -i.bak "s/\(go\.opentelemetry\.io\/collector.*\) $current_stable_core/\1 $ne
3535
sed -i.bak "s/\(github\.com\/open-telemetry\/opentelemetry\-collector\-contrib\/.*\) $current_contrib/\1 $next_contrib/" go.mod
3636
rm go.mod.bak
3737

38+
echo "=> Running go mod tidy"
39+
go mod tidy
3840
echo "=> Running mage notice"
3941
mage notice
4042
echo "=> Running mage otel:readme"

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
/deploy/helm/edot-collector @elastic/ingest-otel-data
1414
/deploy/kubernetes @elastic/elastic-agent-control-plane
1515
/dev-tools/kubernetes @elastic/elastic-agent-control-plane
16-
/internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat
1716
/internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane

‎NOTICE-fips.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,11 +1224,11 @@ SOFTWARE
12241224

12251225
--------------------------------------------------------------------------------
12261226
Dependency : github.com/elastic/elastic-agent-libs
1227-
Version: v0.19.5
1227+
Version: v0.19.6
12281228
Licence type (autodetected): Apache-2.0
12291229
--------------------------------------------------------------------------------
12301230

1231-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].5/LICENSE:
1231+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].6/LICENSE:
12321232

12331233
Apache License
12341234
Version 2.0, January 2004
@@ -34937,11 +34937,11 @@ SOFTWARE.
3493734937

3493834938
--------------------------------------------------------------------------------
3493934939
Dependency : github.com/elastic/go-concert
34940-
Version: v0.3.0
34940+
Version: v0.3.1
3494134941
Licence type (autodetected): Apache-2.0
3494234942
--------------------------------------------------------------------------------
3494334943

34944-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].0/LICENSE:
34944+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].1/LICENSE:
3494534945

3494634946
Apache License
3494734947
Version 2.0, January 2004

‎NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,11 +1224,11 @@ SOFTWARE
12241224

12251225
--------------------------------------------------------------------------------
12261226
Dependency : github.com/elastic/elastic-agent-libs
1227-
Version: v0.19.5
1227+
Version: v0.19.6
12281228
Licence type (autodetected): Apache-2.0
12291229
--------------------------------------------------------------------------------
12301230

1231-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].5/LICENSE:
1231+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].6/LICENSE:
12321232

12331233
Apache License
12341234
Version 2.0, January 2004
@@ -36422,11 +36422,11 @@ SOFTWARE.
3642236422

3642336423
--------------------------------------------------------------------------------
3642436424
Dependency : github.com/elastic/go-concert
36425-
Version: v0.3.0
36425+
Version: v0.3.1
3642636426
Licence type (autodetected): Apache-2.0
3642736427
--------------------------------------------------------------------------------
3642836428

36429-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].0/LICENSE:
36429+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].1/LICENSE:
3643036430

3643136431
Apache License
3643236432
Version 2.0, January 2004

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1818
github.com/elastic/elastic-agent-autodiscover v0.9.2
1919
github.com/elastic/elastic-agent-client/v7 v7.17.2
20-
github.com/elastic/elastic-agent-libs v0.19.5
20+
github.com/elastic/elastic-agent-libs v0.19.6
2121
github.com/elastic/elastic-agent-system-metrics v0.11.12
2222
github.com/elastic/elastic-transport-go/v8 v8.7.0
2323
github.com/elastic/go-elasticsearch/v8 v8.17.1
@@ -296,7 +296,7 @@ require (
296296
github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38 // indirect
297297
github.com/eclipse/paho.mqtt.golang v1.3.5 // indirect
298298
github.com/elastic/bayeux v1.0.5 // indirect
299-
github.com/elastic/go-concert v0.3.0 // indirect
299+
github.com/elastic/go-concert v0.3.1 // indirect
300300
github.com/elastic/go-docappender/v2 v2.9.0 // indirect
301301
github.com/elastic/go-freelru v0.16.0 // indirect
302302
github.com/elastic/go-grok v0.3.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,16 +482,16 @@ github.com/elastic/elastic-agent-autodiscover v0.9.2 h1:eBmru2v66HRRHOFf89rDl9OZ
482482
github.com/elastic/elastic-agent-autodiscover v0.9.2/go.mod h1:RNaHnOTYfNptSTQUyZYnjypxmrR5AaE6BIap/175F5c=
483483
github.com/elastic/elastic-agent-client/v7 v7.17.2 h1:Cl2TeABqWZgW40t5fchGWT/sRk4MDDLWA0d8iHHOxLA=
484484
github.com/elastic/elastic-agent-client/v7 v7.17.2/go.mod h1:5irRFqp6HLqtu1S+OeY0jg8x7K6PLL+DW+PwVk1vJnk=
485-
github.com/elastic/elastic-agent-libs v0.19.5 h1:br0kvmwowHu4KQpPy5C4DjkFdiGafbp8BV4CeXR4wUs=
486-
github.com/elastic/elastic-agent-libs v0.19.5/go.mod h1:1HNxREH8C27kGrJCtKZh/ot8pV8joH8VREP21+FrH5s=
485+
github.com/elastic/elastic-agent-libs v0.19.6 h1:HLYhYQqfSumAhBlNosd6V1V2hMFbSKNJnS9Ka9wRh6c=
486+
github.com/elastic/elastic-agent-libs v0.19.6/go.mod h1:1HNxREH8C27kGrJCtKZh/ot8pV8joH8VREP21+FrH5s=
487487
github.com/elastic/elastic-agent-system-metrics v0.11.12 h1:2SnN3arw2MrWV7eWjm+8zLuyQcsCtEyMasi1w9eFHU8=
488488
github.com/elastic/elastic-agent-system-metrics v0.11.12/go.mod h1:GNqmKfvOt8PwORjbS6GllNdMfkLpOWyTa7P8oQq4E5o=
489489
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
490490
github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
491491
github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 h1:UyNbxdkQiSfyipwsOCWAlO+ju3xXC61Z4prx/HBTtFk=
492492
github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3/go.mod h1:DAsKqylc/16NDcfdk8dN5axVtSOsQwgP2kV+NV5xPDE=
493-
github.com/elastic/go-concert v0.3.0 h1:Y66JFn3ENndpHErOhTASu8/Fz1SSsLZicPufCmvQD60=
494-
github.com/elastic/go-concert v0.3.0/go.mod h1:UWt1MB5HxxZ85hKynLaYl/AaLIKFx0WiBP2uJSRfduA=
493+
github.com/elastic/go-concert v0.3.1 h1:dqtq2+xA8w7BZunI7j3Hs43CjWod7/nNRD8ByPx4YMs=
494+
github.com/elastic/go-concert v0.3.1/go.mod h1:bQ/sGkdR0I8IdzLuxDcrczc+caloItvAqw23jISl9sQ=
495495
github.com/elastic/go-docappender/v2 v2.9.0 h1:EWNSfA4R8gyK+x9Hh3/AsRbc12nT3UVjsLg+Yz4fxA4=
496496
github.com/elastic/go-docappender/v2 v2.9.0/go.mod h1:xoTA2/HUjnIgF7acxxjfYaT7KE3nFhBQ5ZkmN0edE5o=
497497
github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q=

‎internal/pkg/core/authority/ca.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ func (c *CertificateAuthority) GeneratePairWithName(name string) (*Pair, error)
140140
privateKey, _ := rsa.GenerateKey(rand.Reader, 2048)
141141
publicKey := &privateKey.PublicKey
142142

143+
certTemplate.SubjectKeyId = generateSubjectKeyID(publicKey)
144+
143145
// Sign the certificate
144146
certBytes, err := x509.CreateCertificate(rand.Reader, certTemplate, c.caCert, publicKey, c.privateKey)
145147
if err != nil {

0 commit comments

Comments
 (0)