Skip to content

Commit d205787

Browse files
🥑🤖 v1.25.2 release prep (#1179)
* 🥑🤖 v1.25.2 release prep 🤖🥑 * Removed windows 2019 version * Updated README.md to include removed version --------- Co-authored-by: ec2-bot 🤖 <[email protected]>
1 parent 82f5378 commit d205787

File tree

6 files changed

+12
-25
lines changed

6 files changed

+12
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
name: Build Windows Binaries
127127
strategy:
128128
matrix:
129-
version: [2019, 2022]
129+
version: [2022]
130130
runs-on: windows-${{matrix.version}}
131131
steps:
132132
- name: Set up Go 1.x
@@ -158,7 +158,7 @@ jobs:
158158
name: Build Windows Docker Images
159159
strategy:
160160
matrix:
161-
version: [2019, 2022]
161+
version: [2022]
162162
runs-on: windows-${{matrix.version}}
163163
steps:
164164
- name: Set up Go 1.x

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
needs: [releaseLinux]
4040
strategy:
4141
matrix:
42-
version: [2019, 2022]
42+
version: [2022]
4343
runs-on: windows-${{matrix.version}}
4444
steps:
4545
- name: Set up Go 1.x

Makefile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ SUPPORTED_PLATFORMS_LINUX ?= "linux/amd64,linux/arm64"
2222
# needs to happen on a separate GitHub runner
2323
# A windows version is specified by major-minor-build-revision.
2424
# 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.
25+
# The revision does not matter for windows 2022.
2626
# Reference: https://learn.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility
27-
WINDOWS_2019 ?= "windows-10.0.17763.6189/amd64"
2827
WINDOWS_2022 ?= "windows-10.0.20348.2582/amd64"
2928

3029
BINARY_NAME ?= "node-termination-handler"
@@ -57,9 +56,6 @@ docker-run:
5756
build-docker-images:
5857
${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${IMG} -v ${VERSION}
5958

60-
build-docker-images-windows-2019:
61-
${MAKEFILE_PATH}/scripts/build-docker-images -p ${WINDOWS_2019} -r ${IMG} -v ${VERSION}
62-
6359
build-docker-images-windows-2022:
6460
${MAKEFILE_PATH}/scripts/build-docker-images -p ${WINDOWS_2022} -r ${IMG} -v ${VERSION}
6561

@@ -74,11 +70,6 @@ push-docker-images:
7470
amazon-ecr-credential-helper:
7571
bash ${MAKEFILE_PATH}/scripts/install-amazon-ecr-credential-helper $(AMAZON_ECR_CREDENTIAL_HELPER_VERSION)
7672

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-
8273
push-docker-images-windows-2022:
8374
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${WINDOWS_2022} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
8475
bash ${MAKEFILE_PATH}/scripts/install-amazon-ecr-credential-helper $(AMAZON_ECR_CREDENTIAL_HELPER_VERSION)
@@ -145,9 +136,6 @@ helm-validate-chart-versions:
145136
build-binaries:
146137
${MAKEFILE_PATH}/scripts/build-binaries -p ${SUPPORTED_PLATFORMS_LINUX} -v ${VERSION}
147138

148-
build-binaries-windows-2019:
149-
${MAKEFILE_PATH}/scripts/build-binaries -p ${WINDOWS_2019} -v ${VERSION}
150-
151139
build-binaries-windows-2022:
152140
${MAKEFILE_PATH}/scripts/build-binaries -p ${WINDOWS_2022} -v ${VERSION}
153141

@@ -191,8 +179,6 @@ eks-cluster-test:
191179

192180
release: build-binaries build-docker-images push-docker-images generate-k8s-yaml upload-resources-to-github
193181

194-
release-windows-2019: build-binaries-windows-2019 build-docker-images-windows-2019 push-docker-images-windows-2019
195-
196182
release-windows-2022: build-binaries-windows-2022 build-docker-images-windows-2022 push-docker-images-windows-2022
197183

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

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ helm upgrade --install aws-node-termination-handler \
166166

167167
| NTH Release | K8s v1.32 | K8s v1.31 | K8s v1.30 | K8s v1.29 | K8s v1.28 | K8s v1.27 | K8s v1.26 | K8s v1.25 |
168168
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
169+
| [v1.25.2](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.2) |||||||||
169170
| [v1.25.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.1) |||||||||
170171
| [v1.25.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.0) |||||||||
171172
| [v1.24.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.24.0) |||||||||
@@ -214,7 +215,7 @@ When using Kubernetes [Pod Security Admission](https://kubernetes.io/docs/concep
214215
You can use kubectl to directly add all of the above resources with the default configuration into your cluster.
215216

216217
```
217-
kubectl apply -f https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.1/all-resources.yaml
218+
kubectl apply -f https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.2/all-resources.yaml
218219
```
219220

220221
For a full list of releases and associated artifacts see our [releases page](https://github.com/aws/aws-node-termination-handler/releases).
@@ -287,7 +288,7 @@ helm upgrade --install aws-node-termination-handler \
287288
oci://public.ecr.aws/aws-ec2/helm/aws-node-termination-handler --version $CHART_VERSION
288289
```
289290

290-
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.25.1/config/helm/aws-node-termination-handler#readme).
291+
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.25.2/config/helm/aws-node-termination-handler#readme).
291292

292293
</details>
293294

@@ -577,7 +578,7 @@ helm upgrade --install aws-node-termination-handler \
577578
oci://public.ecr.aws/aws-ec2/helm/aws-node-termination-handler --version $CHART_VERSION
578579
```
579580

580-
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.25.1/config/helm/aws-node-termination-handler#readme).
581+
For a full list of configuration options see our [Helm readme](https://github.com/aws/aws-node-termination-handler/blob/v1.25.2/config/helm/aws-node-termination-handler#readme).
581582

582583
#### Single Instance vs Multiple Replicas
583584

@@ -602,7 +603,7 @@ Queue Processor needs an **SQS queue URL** to function; therefore, manifest chan
602603
Minimal Config:
603604

604605
```
605-
curl -L https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.1/all-resources-queue-processor.yaml -o all-resources-queue-processor.yaml
606+
curl -L https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.2/all-resources-queue-processor.yaml -o all-resources-queue-processor.yaml
606607
<open all-resources-queue-processor.yaml and update QUEUE_URL value>
607608
kubectl apply -f ./all-resources-queue-processor.yaml
608609
```

config/helm/aws-node-termination-handler/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: aws-node-termination-handler
33
description: A Helm chart for the AWS Node Termination Handler.
44
type: application
5-
version: 0.27.1
6-
appVersion: 1.25.1
5+
version: 0.27.2
6+
appVersion: 1.25.2
77
kubeVersion: ">= 1.16-0"
88
keywords:
99
- aws

test/eks-cluster-test/cluster-spec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ nodeGroups:
2222
minSize: 1
2323
maxSize: 1
2424
volumeSize: 100
25-
amiFamily: WindowsServer2019FullContainer
25+
amiFamily: WindowsServer2022FullContainer

0 commit comments

Comments
 (0)