Skip to content

Commit 9c78766

Browse files
authored
Merge branch '8.19' into mergify/bp/8.19/pr-9732
2 parents 5172f02 + 7bb582d commit 9c78766

20 files changed

+409
-139
lines changed

NOTICE-fips.txt

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
173173

174174
--------------------------------------------------------------------------------
175175
Dependency : github.com/docker/docker
176-
Version: v28.2.2+incompatible
176+
Version: v28.3.3+incompatible
177177
Licence type (autodetected): Apache-2.0
178178
--------------------------------------------------------------------------------
179179

180-
Contents of probable licence file $GOMODCACHE/github.com/docker/docker@v28.2.2+incompatible/LICENSE:
180+
Contents of probable licence file $GOMODCACHE/github.com/docker/docker@v28.3.3+incompatible/LICENSE:
181181

182182

183183
Apache License
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250901184515-cb1ec1181044
790+
Version: v7.0.0-alpha2.0.20250903065447-128846e9b4bb
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250901184515-cb1ec1181044/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250903065447-128846e9b4bb/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -48063,6 +48063,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4806348063

4806448064

4806548065

48066+
--------------------------------------------------------------------------------
48067+
Dependency : github.com/gohugoio/hashstructure
48068+
Version: v0.5.0
48069+
Licence type (autodetected): MIT
48070+
--------------------------------------------------------------------------------
48071+
48072+
Contents of probable licence file $GOMODCACHE/github.com/gohugoio/[email protected]/LICENSE:
48073+
48074+
The MIT License (MIT)
48075+
48076+
Copyright (c) 2016 Mitchell Hashimoto
48077+
48078+
Permission is hereby granted, free of charge, to any person obtaining a copy
48079+
of this software and associated documentation files (the "Software"), to deal
48080+
in the Software without restriction, including without limitation the rights
48081+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
48082+
copies of the Software, and to permit persons to whom the Software is
48083+
furnished to do so, subject to the following conditions:
48084+
48085+
The above copyright notice and this permission notice shall be included in
48086+
all copies or substantial portions of the Software.
48087+
48088+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
48089+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
48090+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
48091+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
48092+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
48093+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
48094+
THE SOFTWARE.
48095+
48096+
4806648097
--------------------------------------------------------------------------------
4806748098
Dependency : github.com/golang-jwt/jwt/v4
4806848099
Version: v4.5.2
@@ -57594,37 +57625,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
5759457625
THE SOFTWARE.
5759557626

5759657627

57597-
--------------------------------------------------------------------------------
57598-
Dependency : github.com/mitchellh/hashstructure
57599-
Version: v1.1.0
57600-
Licence type (autodetected): MIT
57601-
--------------------------------------------------------------------------------
57602-
57603-
Contents of probable licence file $GOMODCACHE/github.com/mitchellh/[email protected]/LICENSE:
57604-
57605-
The MIT License (MIT)
57606-
57607-
Copyright (c) 2016 Mitchell Hashimoto
57608-
57609-
Permission is hereby granted, free of charge, to any person obtaining a copy
57610-
of this software and associated documentation files (the "Software"), to deal
57611-
in the Software without restriction, including without limitation the rights
57612-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
57613-
copies of the Software, and to permit persons to whom the Software is
57614-
furnished to do so, subject to the following conditions:
57615-
57616-
The above copyright notice and this permission notice shall be included in
57617-
all copies or substantial portions of the Software.
57618-
57619-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
57620-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
57621-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
57622-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
57623-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
57624-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
57625-
THE SOFTWARE.
57626-
57627-
5762857628
--------------------------------------------------------------------------------
5762957629
Dependency : github.com/mitchellh/mapstructure
5763057630
Version: v1.5.1-0.20231216201459-8508981c8b6c

NOTICE.txt

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
173173

174174
--------------------------------------------------------------------------------
175175
Dependency : github.com/docker/docker
176-
Version: v28.2.2+incompatible
176+
Version: v28.3.3+incompatible
177177
Licence type (autodetected): Apache-2.0
178178
--------------------------------------------------------------------------------
179179

180-
Contents of probable licence file $GOMODCACHE/github.com/docker/docker@v28.2.2+incompatible/LICENSE:
180+
Contents of probable licence file $GOMODCACHE/github.com/docker/docker@v28.3.3+incompatible/LICENSE:
181181

182182

183183
Apache License
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20250901184515-cb1ec1181044
790+
Version: v7.0.0-alpha2.0.20250903065447-128846e9b4bb
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250901184515-cb1ec1181044/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250903065447-128846e9b4bb/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -51654,6 +51654,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5165451654

5165551655

5165651656

51657+
--------------------------------------------------------------------------------
51658+
Dependency : github.com/gohugoio/hashstructure
51659+
Version: v0.5.0
51660+
Licence type (autodetected): MIT
51661+
--------------------------------------------------------------------------------
51662+
51663+
Contents of probable licence file $GOMODCACHE/github.com/gohugoio/[email protected]/LICENSE:
51664+
51665+
The MIT License (MIT)
51666+
51667+
Copyright (c) 2016 Mitchell Hashimoto
51668+
51669+
Permission is hereby granted, free of charge, to any person obtaining a copy
51670+
of this software and associated documentation files (the "Software"), to deal
51671+
in the Software without restriction, including without limitation the rights
51672+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
51673+
copies of the Software, and to permit persons to whom the Software is
51674+
furnished to do so, subject to the following conditions:
51675+
51676+
The above copyright notice and this permission notice shall be included in
51677+
all copies or substantial portions of the Software.
51678+
51679+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
51680+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
51681+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
51682+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
51683+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
51684+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
51685+
THE SOFTWARE.
51686+
51687+
5165751688
--------------------------------------------------------------------------------
5165851689
Dependency : github.com/golang-jwt/jwt/v4
5165951690
Version: v4.5.2
@@ -63548,37 +63579,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
6354863579
THE SOFTWARE.
6354963580

6355063581

63551-
--------------------------------------------------------------------------------
63552-
Dependency : github.com/mitchellh/hashstructure
63553-
Version: v1.1.0
63554-
Licence type (autodetected): MIT
63555-
--------------------------------------------------------------------------------
63556-
63557-
Contents of probable licence file $GOMODCACHE/github.com/mitchellh/[email protected]/LICENSE:
63558-
63559-
The MIT License (MIT)
63560-
63561-
Copyright (c) 2016 Mitchell Hashimoto
63562-
63563-
Permission is hereby granted, free of charge, to any person obtaining a copy
63564-
of this software and associated documentation files (the "Software"), to deal
63565-
in the Software without restriction, including without limitation the rights
63566-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
63567-
copies of the Software, and to permit persons to whom the Software is
63568-
furnished to do so, subject to the following conditions:
63569-
63570-
The above copyright notice and this permission notice shall be included in
63571-
all copies or substantial portions of the Software.
63572-
63573-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
63574-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
63575-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
63576-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
63577-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
63578-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
63579-
THE SOFTWARE.
63580-
63581-
6358263582
--------------------------------------------------------------------------------
6358363583
Dependency : github.com/mitchellh/mapstructure
6358463584
Version: v1.5.1-0.20231216201459-8508981c8b6c
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: bug-fix
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Retry service start command upon failure with 30-second delay.
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
pr: https://github.com/elastic/elastic-agent/pull/9313
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: bug-fix
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Fix missing liveness healthcheck during container enrollment
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
pr: https://github.com/elastic/elastic-agent/pull/9612
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
issue: https://github.com/elastic/elastic-agent/issues/9611

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ require (
1111
github.com/cenkalti/backoff/v4 v4.3.0
1212
github.com/cenkalti/backoff/v5 v5.0.2
1313
github.com/cespare/xxhash/v2 v2.3.0
14-
github.com/docker/docker v28.2.2+incompatible
14+
github.com/docker/docker v28.3.3+incompatible
1515
github.com/docker/go-units v0.5.0
1616
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
17-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250901184515-cb1ec1181044
17+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250903065447-128846e9b4bb
1818
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae
1919
github.com/elastic/elastic-agent-autodiscover v0.10.0
2020
github.com/elastic/elastic-agent-client/v7 v7.17.2
@@ -394,6 +394,7 @@ require (
394394
github.com/godror/knownpb v0.1.1 // indirect
395395
github.com/gogo/googleapis v1.4.1 // indirect
396396
github.com/gogo/protobuf v1.3.2 // indirect
397+
github.com/gohugoio/hashstructure v0.5.0 // indirect
397398
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
398399
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
399400
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
@@ -497,7 +498,6 @@ require (
497498
github.com/mitchellh/copystructure v1.2.0 // indirect
498499
github.com/mitchellh/go-homedir v1.1.0 // indirect
499500
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
500-
github.com/mitchellh/hashstructure v1.1.0 // indirect
501501
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
502502
github.com/mitchellh/reflectwalk v1.0.2 // indirect
503503
github.com/moby/docker-image-spec v1.3.1 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,8 @@ github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvD
447447
github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
448448
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
449449
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
450-
github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
451-
github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
450+
github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
451+
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
452452
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
453453
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
454454
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -483,8 +483,8 @@ github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumpti
483483
github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic/go.mod h1:0vCBR1wgGwZeGmloJ+eCWIZF2S47grTXRzj2mftg2Nk=
484484
github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0=
485485
github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68=
486-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250901184515-cb1ec1181044 h1:pCotyjQXcP9zdu2VItR6TivNWt+9dYao3d4+kLvtyLw=
487-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250901184515-cb1ec1181044/go.mod h1:AfOvbkDILnoM0RRIk2ksNbP61afcQoYZr6ViWW491UE=
486+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250903065447-128846e9b4bb h1:Pg3tgqxguMr/WgxYBeDJB+lWw2kYzY5CyV84F9l875U=
487+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250903065447-128846e9b4bb/go.mod h1:0kQANldROmlNbt2MEW04a7FrEcWcm/cfF8aiVGH6PIs=
488488
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae h1:OiShmbWAyGU0MS0ADJWr1/QgeLIZliMk9xsrFicR3/s=
489489
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20250327073047-b624240832ae/go.mod h1:D2IckZVXARugvikE4fv1glvaJMohKSZRzrPsxCjo9O0=
490490
github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQBLIL607Zt4LNfOgV7+XN0=
@@ -716,6 +716,8 @@ github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6x
716716
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
717717
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
718718
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
719+
github.com/gohugoio/hashstructure v0.5.0 h1:G2fjSBU36RdwEJBWJ+919ERvOVqAg9tfcYp47K9swqg=
720+
github.com/gohugoio/hashstructure v0.5.0/go.mod h1:Ser0TniXuu/eauYmrwM4o64EBvySxNzITEOLlm4igec=
719721
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
720722
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
721723
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
@@ -1091,8 +1093,6 @@ github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJ
10911093
github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
10921094
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
10931095
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
1094-
github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0=
1095-
github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/6d8ulp4AwfLKrmA=
10961096
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
10971097
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=
10981098
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=

internal/pkg/agent/application/monitoring/liveness.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ func livenessHandler(coord CoordinatorState) func(http.ResponseWriter, *http.Req
5656
return func(w http.ResponseWriter, r *http.Request) error {
5757
w.Header().Set("Content-Type", "application/json; charset=utf-8")
5858

59+
if coord == nil {
60+
// no coordinator, then that means we are in the container enrollment mode
61+
// at this point the container is healthy and trying to enroll, so return 200
62+
w.WriteHeader(http.StatusOK)
63+
return nil
64+
}
65+
5966
state := coord.State()
6067
isUp := coord.IsActive(time.Second * 10)
6168
// the coordinator check is always on, so if that fails, always return false

0 commit comments

Comments
 (0)