Skip to content

Commit f3ec795

Browse files
xabinapalxabinapal
authored
Merge branch 'aws:main' into misleading-404
2 parents 06cfba9 + 4188819 commit f3ec795

File tree

24 files changed

+796
-150
lines changed

24 files changed

+796
-150
lines changed

‎.github/workflows/build-and-test.yaml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Set up golangci-lint
7171
uses: golangci/golangci-lint-action@v3
7272
with:
73-
version: v1.55.2
73+
version: latest
7474
args: --timeout=5m
7575
skip-cache: true
7676

@@ -124,7 +124,10 @@ jobs:
124124

125125
buildWindows:
126126
name: Build Windows Binaries
127-
runs-on: windows-2019
127+
strategy:
128+
matrix:
129+
version: [2019, 2022]
130+
runs-on: windows-${{matrix.version}}
128131
steps:
129132
- name: Set up Go 1.x
130133
uses: actions/setup-go@v2
@@ -149,11 +152,14 @@ jobs:
149152
Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
150153
refreshenv
151154
152-
choco install make && choco install zip && make build-binaries-windows
155+
choco install make && choco install zip && make build-binaries-windows-${{matrix.version}}
153156
154157
buildWindowsDocker:
155158
name: Build Windows Docker Images
156-
runs-on: windows-2019
159+
strategy:
160+
matrix:
161+
version: [2019, 2022]
162+
runs-on: windows-${{matrix.version}}
157163
steps:
158164
- name: Set up Go 1.x
159165
uses: actions/setup-go@v2
@@ -178,7 +184,7 @@ jobs:
178184
Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
179185
refreshenv
180186
181-
choco install make && make build-docker-images-windows
187+
choco install make && make build-docker-images-windows-${{matrix.version}}
182188
183189
e2e:
184190
name: E2E Tests
@@ -205,4 +211,4 @@ jobs:
205211
key: gocache
206212

207213
- name: E2E Tests
208-
run: test/k8s-local-cluster-test/run-test -v ${{ matrix.k8sVersion }}
214+
run: test/k8s-local-cluster-test/run-test -v ${{ matrix.k8sVersion }}

‎.github/workflows/release.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,11 @@ jobs:
3636

3737
releaseWindows:
3838
name: Release Windows
39-
runs-on: windows-2019
4039
needs: [releaseLinux]
40+
strategy:
41+
matrix:
42+
version: [2019, 2022]
43+
runs-on: windows-${{matrix.version}}
4144
steps:
4245
- name: Set up Go 1.x
4346
uses: actions/setup-go@v2
@@ -53,7 +56,7 @@ jobs:
5356
Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
5457
refreshenv
5558
56-
choco install make && choco install zip && make release-windows
59+
choco install make && choco install zip && make release-windows-${{matrix.version}}
5760
env:
5861
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
5962
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -91,4 +94,4 @@ jobs:
9194
env:
9295
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
9396
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
94-
AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
97+
AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}

‎Makefile‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ MAKEFILE_PATH = $(dir $(realpath -s $(firstword $(MAKEFILE_LIST))))
1717
BUILD_DIR_PATH = ${MAKEFILE_PATH}/build
1818
BIN_DIR = ${MAKEFILE_PATH}/bin
1919
SUPPORTED_PLATFORMS_LINUX ?= "linux/amd64,linux/arm64"
20-
SUPPORTED_PLATFORMS_WINDOWS ?= "windows/amd64"
20+
21+
# Each windows version needs a separate make target because each build
22+
# needs to happen on a separate GitHub runner
23+
# A windows version is specified by major-minor-build-revision.
24+
# The build number of the OS must match the build number of the container image
25+
# The revision does not matter for windows 2019 and 2022.
26+
# Reference: https://learn.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility
27+
WINDOWS_2019 ?= "windows-10.0.17763.6189/amd64"
28+
WINDOWS_2022 ?= "windows-10.0.20348.2582/amd64"
29+
2130
BINARY_NAME ?= "node-termination-handler"
2231
THIRD_PARTY_LICENSES = "${MAKEFILE_PATH}/THIRD_PARTY_LICENSES.md"
2332
GOLICENSES = $(BIN_DIR)/go-licenses
@@ -48,18 +57,32 @@ docker-run:
4857
build-docker-images:
4958
${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${IMG} -v ${VERSION}
5059

51-
build-docker-images-windows:
52-
${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${IMG} -v ${VERSION}
60+
build-docker-images-windows-2019:
61+
${MAKEFILE_PATH}/scripts/build-docker-images -p ${WINDOWS_2019} -r ${IMG} -v ${VERSION}
62+
63+
build-docker-images-windows-2022:
64+
${MAKEFILE_PATH}/scripts/build-docker-images -p ${WINDOWS_2022} -r ${IMG} -v ${VERSION}
65+
66+
ecr-public-login:
67+
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
5368

5469
push-docker-images:
5570
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
5671
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
5772
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${ECR_REPO} -v ${VERSION} -m
5873

59-
push-docker-images-windows:
60-
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
74+
amazon-ecr-credential-helper:
6175
bash ${MAKEFILE_PATH}/scripts/install-amazon-ecr-credential-helper $(AMAZON_ECR_CREDENTIAL_HELPER_VERSION)
62-
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${ECR_REPO} -v ${VERSION} -m
76+
77+
push-docker-images-windows-2019:
78+
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${WINDOWS_2019} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
79+
bash ${MAKEFILE_PATH}/scripts/install-amazon-ecr-credential-helper $(AMAZON_ECR_CREDENTIAL_HELPER_VERSION)
80+
${MAKEFILE_PATH}/scripts/push-docker-images -p ${WINDOWS_2019} -r ${ECR_REPO} -v ${VERSION} -m
81+
82+
push-docker-images-windows-2022:
83+
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${WINDOWS_2022} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
84+
bash ${MAKEFILE_PATH}/scripts/install-amazon-ecr-credential-helper $(AMAZON_ECR_CREDENTIAL_HELPER_VERSION)
85+
${MAKEFILE_PATH}/scripts/push-docker-images -p ${WINDOWS_2022} -r ${ECR_REPO} -v ${VERSION} -m
6386

6487
push-helm-chart:
6588
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/helm-login
@@ -122,8 +145,11 @@ helm-validate-chart-versions:
122145
build-binaries:
123146
${MAKEFILE_PATH}/scripts/build-binaries -p ${SUPPORTED_PLATFORMS_LINUX} -v ${VERSION}
124147

125-
build-binaries-windows:
126-
${MAKEFILE_PATH}/scripts/build-binaries -p ${SUPPORTED_PLATFORMS_WINDOWS} -v ${VERSION}
148+
build-binaries-windows-2019:
149+
${MAKEFILE_PATH}/scripts/build-binaries -p ${WINDOWS_2019} -v ${VERSION}
150+
151+
build-binaries-windows-2022:
152+
${MAKEFILE_PATH}/scripts/build-binaries -p ${WINDOWS_2022} -v ${VERSION}
127153

128154
upload-resources-to-github:
129155
${MAKEFILE_PATH}/scripts/upload-resources-to-github
@@ -165,7 +191,9 @@ eks-cluster-test:
165191

166192
release: build-binaries build-docker-images push-docker-images generate-k8s-yaml upload-resources-to-github
167193

168-
release-windows: build-binaries-windows build-docker-images-windows push-docker-images-windows
194+
release-windows-2019: build-binaries-windows-2019 build-docker-images-windows-2019 push-docker-images-windows-2019
195+
196+
release-windows-2022: build-binaries-windows-2022 build-docker-images-windows-2022 push-docker-images-windows-2022
169197

170198
test: spellcheck shellcheck unit-test e2e-test compatibility-test license-test go-linter helm-version-sync-test helm-lint
171199

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ When using the EC2 Console or EC2 API to terminate the instance, a state-change
8383
| Spot Instance Termination Notifications (ITN) | ✅ | ✅ |
8484
| Scheduled Events | ✅ | ✅ |
8585
| Instance Rebalance Recommendation | ✅ | ✅ |
86+
| ASG Termination Lifecycle Hooks | ✅ | ✅ |
8687
| AZ Rebalance Recommendation | ❌ | ✅ |
87-
| ASG Termination Lifecycle Hooks | ❌ | ✅ |
8888
| Instance State Change Events | ❌ | ✅ |
8989

9090
### Kubernetes Compatibility

‎cmd/node-termination-handler.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package main
1616
import (
1717
"context"
1818
"fmt"
19+
"github.com/aws/aws-node-termination-handler/pkg/monitor/asglifecycle"
1920
"os"
2021
"os/signal"
2122
"strings"
@@ -53,6 +54,7 @@ import (
5354
const (
5455
scheduledMaintenance = "Scheduled Maintenance"
5556
spotITN = "Spot ITN"
57+
asgLifecycle = "ASG Lifecycle"
5658
rebalanceRecommendation = "Rebalance Recommendation"
5759
sqsEvents = "SQS Event"
5860
timeFormat = "2006/01/02 15:04:05"
@@ -168,8 +170,9 @@ func main() {
168170
err = handleRebootUncordon(nthConfig.NodeName, interruptionEventStore, *node)
169171
if err != nil {
170172
log.Warn().Err(err).Msgf("Unable to complete the uncordon after reboot workflow on startup, retrying")
173+
return false, nil
171174
}
172-
return false, nil
175+
return true, nil
173176
})
174177
if err != nil {
175178
log.Warn().Err(err).Msgf("All retries failed, unable to complete the uncordon after reboot workflow")
@@ -188,6 +191,10 @@ func main() {
188191
imdsSpotMonitor := spotitn.NewSpotInterruptionMonitor(imds, interruptionChan, cancelChan, nthConfig.NodeName)
189192
monitoringFns[spotITN] = imdsSpotMonitor
190193
}
194+
if nthConfig.EnableASGLifecycleDraining {
195+
asgLifecycleMonitor := asglifecycle.NewASGLifecycleMonitor(imds, interruptionChan, cancelChan, nthConfig.NodeName)
196+
monitoringFns[asgLifecycle] = asgLifecycleMonitor
197+
}
191198
if nthConfig.EnableScheduledEventDraining {
192199
imdsScheduledEventMonitor := scheduledevent.NewScheduledEventMonitor(imds, interruptionChan, cancelChan, nthConfig.NodeName)
193200
monitoringFns[scheduledMaintenance] = imdsScheduledEventMonitor

‎config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ spec:
143143
{{- end }}
144144
- name: ENABLE_SPOT_INTERRUPTION_DRAINING
145145
value: {{ .Values.enableSpotInterruptionDraining | quote }}
146+
- name: ENABLE_ASG_LIFECYCLE_DRAINING
147+
value: {{ .Values.enableASGLifecycleDraining | quote }}
146148
- name: ENABLE_SCHEDULED_EVENT_DRAINING
147149
value: {{ .Values.enableScheduledEventDraining | quote }}
148150
- name: ENABLE_REBALANCE_MONITORING

‎config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ spec:
143143
{{- end }}
144144
- name: ENABLE_SPOT_INTERRUPTION_DRAINING
145145
value: {{ .Values.enableSpotInterruptionDraining | quote }}
146+
- name: ENABLE_ASG_LIFECYCLE_DRAINING
147+
value: {{ .Values.enableASGLifecycleDraining | quote }}
146148
- name: ENABLE_SCHEDULED_EVENT_DRAINING
147149
value: {{ .Values.enableScheduledEventDraining | quote }}
148150
- name: ENABLE_REBALANCE_MONITORING

‎config/helm/aws-node-termination-handler/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ metadataTries: 3
270270
# enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received. Only used in IMDS mode.
271271
enableSpotInterruptionDraining: true
272272

273+
# enableASGLifecycleDraining If false, do not drain nodes when ASG target lifecycle state Terminated is received. Only used in IMDS mode.
274+
enableASGLifecycleDraining: true
275+
273276
# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event. Only used in IMDS mode.
274277
enableScheduledEventDraining: true
275278

‎go.mod‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ toolchain go1.22.2
77
require (
88
github.com/Masterminds/sprig/v3 v3.2.3
99
github.com/aws/aws-sdk-go v1.55.4
10-
github.com/prometheus/client_golang v1.18.0
10+
github.com/prometheus/client_golang v1.20.1
1111
github.com/rs/zerolog v1.29.0
1212
go.opentelemetry.io/contrib/instrumentation/runtime v0.47.0
13-
go.opentelemetry.io/otel v1.22.0
14-
go.opentelemetry.io/otel/exporters/prometheus v0.45.0
15-
go.opentelemetry.io/otel/metric v1.22.0
16-
go.opentelemetry.io/otel/sdk/metric v1.22.0
13+
go.opentelemetry.io/otel v1.29.0
14+
go.opentelemetry.io/otel/exporters/prometheus v0.51.0
15+
go.opentelemetry.io/otel/metric v1.29.0
16+
go.opentelemetry.io/otel/sdk/metric v1.29.0
1717
go.uber.org/multierr v1.11.0
18-
golang.org/x/sys v0.18.0
19-
k8s.io/api v0.30.3
20-
k8s.io/apimachinery v0.30.3
21-
k8s.io/client-go v0.30.3
22-
k8s.io/kubectl v0.30.3
18+
golang.org/x/sys v0.24.0
19+
k8s.io/api v0.30.4
20+
k8s.io/apimachinery v0.30.4
21+
k8s.io/client-go v0.30.4
22+
k8s.io/kubectl v0.30.4
2323
)
2424

2525
require (
@@ -28,26 +28,26 @@ require (
2828
github.com/Masterminds/goutils v1.1.1 // indirect
2929
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3030
github.com/beorn7/perks v1.0.1 // indirect
31-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
31+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3232
github.com/chai2010/gettext-go v1.0.2 // indirect
3333
github.com/davecgh/go-spew v1.1.1 // indirect
3434
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3535
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3636
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
3737
github.com/go-errors/errors v1.4.2 // indirect
38-
github.com/go-logr/logr v1.4.1 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4141
github.com/go-openapi/jsonreference v0.20.2 // indirect
42-
github.com/go-openapi/swag v0.22.3 // indirect
42+
github.com/go-openapi/swag v0.22.4 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4545
github.com/golang/protobuf v1.5.4 // indirect
4646
github.com/google/btree v1.0.1 // indirect
4747
github.com/google/gnostic-models v0.6.8 // indirect
4848
github.com/google/gofuzz v1.2.0 // indirect
4949
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
50-
github.com/google/uuid v1.3.0 // indirect
50+
github.com/google/uuid v1.6.0 // indirect
5151
github.com/gorilla/websocket v1.5.0 // indirect
5252
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5353
github.com/huandu/xstrings v1.3.3 // indirect
@@ -56,55 +56,54 @@ require (
5656
github.com/jmespath/go-jmespath v0.4.0 // indirect
5757
github.com/josharian/intern v1.0.0 // indirect
5858
github.com/json-iterator/go v1.1.12 // indirect
59+
github.com/klauspost/compress v1.17.9 // indirect
5960
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6061
github.com/mailru/easyjson v0.7.7 // indirect
6162
github.com/mattn/go-colorable v0.1.12 // indirect
6263
github.com/mattn/go-isatty v0.0.14 // indirect
63-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6464
github.com/mitchellh/copystructure v1.2.0 // indirect
6565
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6666
github.com/mitchellh/reflectwalk v1.0.2 // indirect
67-
github.com/moby/spdystream v0.2.0 // indirect
68-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
67+
github.com/moby/spdystream v0.4.0 // indirect
68+
github.com/moby/term v0.5.0 // indirect
6969
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7070
github.com/modern-go/reflect2 v1.0.2 // indirect
7171
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7272
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7373
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7474
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7575
github.com/pkg/errors v0.9.1 // indirect
76-
github.com/prometheus/client_model v0.5.0 // indirect
77-
github.com/prometheus/common v0.45.0 // indirect
78-
github.com/prometheus/procfs v0.12.0 // indirect
76+
github.com/prometheus/client_model v0.6.1 // indirect
77+
github.com/prometheus/common v0.55.0 // indirect
78+
github.com/prometheus/procfs v0.15.1 // indirect
7979
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8080
github.com/shopspring/decimal v1.2.0 // indirect
8181
github.com/spf13/cast v1.3.1 // indirect
82-
github.com/spf13/cobra v1.7.0 // indirect
82+
github.com/spf13/cobra v1.8.1 // indirect
8383
github.com/spf13/pflag v1.0.5 // indirect
8484
github.com/xlab/treeprint v1.2.0 // indirect
85-
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
86-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
85+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
86+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
8787
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
88-
golang.org/x/crypto v0.21.0 // indirect
89-
golang.org/x/net v0.23.0 // indirect
90-
golang.org/x/oauth2 v0.12.0 // indirect
91-
golang.org/x/sync v0.6.0 // indirect
92-
golang.org/x/term v0.18.0 // indirect
93-
golang.org/x/text v0.14.0 // indirect
88+
golang.org/x/crypto v0.24.0 // indirect
89+
golang.org/x/net v0.26.0 // indirect
90+
golang.org/x/oauth2 v0.21.0 // indirect
91+
golang.org/x/sync v0.7.0 // indirect
92+
golang.org/x/term v0.21.0 // indirect
93+
golang.org/x/text v0.16.0 // indirect
9494
golang.org/x/time v0.3.0 // indirect
95-
google.golang.org/appengine v1.6.7 // indirect
96-
google.golang.org/protobuf v1.33.0 // indirect
95+
google.golang.org/protobuf v1.34.2 // indirect
9796
gopkg.in/inf.v0 v0.9.1 // indirect
9897
gopkg.in/yaml.v2 v2.4.0 // indirect
9998
gopkg.in/yaml.v3 v3.0.1 // indirect
100-
k8s.io/cli-runtime v0.30.3 // indirect
101-
k8s.io/component-base v0.30.3 // indirect
102-
k8s.io/klog/v2 v2.120.1 // indirect
99+
k8s.io/cli-runtime v0.30.4 // indirect
100+
k8s.io/component-base v0.30.4 // indirect
101+
k8s.io/klog/v2 v2.130.1 // indirect
103102
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
104-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
103+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
105104
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
106105
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
107106
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
108107
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
109-
sigs.k8s.io/yaml v1.3.0 // indirect
108+
sigs.k8s.io/yaml v1.4.0 // indirect
110109
)

0 commit comments

Comments
 (0)