Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
name: Build Windows Binaries
strategy:
matrix:
version: [2019, 2022]
version: [2022]
runs-on: windows-${{matrix.version}}
steps:
- name: Set up Go 1.x
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
name: Build Windows Docker Images
strategy:
matrix:
version: [2019, 2022]
version: [2022]
runs-on: windows-${{matrix.version}}
steps:
- name: Set up Go 1.x
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
needs: [releaseLinux]
strategy:
matrix:
version: [2019, 2022]
version: [2022]
runs-on: windows-${{matrix.version}}
steps:
- name: Set up Go 1.x
Expand Down
16 changes: 1 addition & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ SUPPORTED_PLATFORMS_LINUX ?= "linux/amd64,linux/arm64"
# needs to happen on a separate GitHub runner
# A windows version is specified by major-minor-build-revision.
# The build number of the OS must match the build number of the container image
# The revision does not matter for windows 2019 and 2022.
# The revision does not matter for windows 2022.
# Reference: https://learn.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility
WINDOWS_2019 ?= "windows-10.0.17763.6189/amd64"
WINDOWS_2022 ?= "windows-10.0.20348.2582/amd64"

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

build-docker-images-windows-2019:
${MAKEFILE_PATH}/scripts/build-docker-images -p ${WINDOWS_2019} -r ${IMG} -v ${VERSION}

build-docker-images-windows-2022:
${MAKEFILE_PATH}/scripts/build-docker-images -p ${WINDOWS_2022} -r ${IMG} -v ${VERSION}

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

push-docker-images-windows-2019:
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${WINDOWS_2019} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
bash ${MAKEFILE_PATH}/scripts/install-amazon-ecr-credential-helper $(AMAZON_ECR_CREDENTIAL_HELPER_VERSION)
${MAKEFILE_PATH}/scripts/push-docker-images -p ${WINDOWS_2019} -r ${ECR_REPO} -v ${VERSION} -m

push-docker-images-windows-2022:
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${WINDOWS_2022} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
bash ${MAKEFILE_PATH}/scripts/install-amazon-ecr-credential-helper $(AMAZON_ECR_CREDENTIAL_HELPER_VERSION)
Expand Down Expand Up @@ -145,9 +136,6 @@ helm-validate-chart-versions:
build-binaries:
${MAKEFILE_PATH}/scripts/build-binaries -p ${SUPPORTED_PLATFORMS_LINUX} -v ${VERSION}

build-binaries-windows-2019:
${MAKEFILE_PATH}/scripts/build-binaries -p ${WINDOWS_2019} -v ${VERSION}

build-binaries-windows-2022:
${MAKEFILE_PATH}/scripts/build-binaries -p ${WINDOWS_2022} -v ${VERSION}

Expand Down Expand Up @@ -191,8 +179,6 @@ eks-cluster-test:

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

release-windows-2019: build-binaries-windows-2019 build-docker-images-windows-2019 push-docker-images-windows-2019

release-windows-2022: build-binaries-windows-2022 build-docker-images-windows-2022 push-docker-images-windows-2022

test: spellcheck shellcheck unit-test e2e-test compatibility-test license-test go-linter helm-version-sync-test helm-lint
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ helm upgrade --install aws-node-termination-handler \

| 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 |
| :-----------------------------------------------------------------------------------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: | :-------: |
| [v1.25.2](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.2) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
| [v1.25.1](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.1) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
| [v1.25.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.25.0) | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
| [v1.24.0](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.24.0) | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
Expand Down Expand Up @@ -214,7 +215,7 @@ When using Kubernetes [Pod Security Admission](https://kubernetes.io/docs/concep
You can use kubectl to directly add all of the above resources with the default configuration into your cluster.

```
kubectl apply -f https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.1/all-resources.yaml
kubectl apply -f https://github.com/aws/aws-node-termination-handler/releases/download/v1.25.2/all-resources.yaml
```

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

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).
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).

</details>

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

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).
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).

#### Single Instance vs Multiple Replicas

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

```
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
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
<open all-resources-queue-processor.yaml and update QUEUE_URL value>
kubectl apply -f ./all-resources-queue-processor.yaml
```
Expand Down
4 changes: 2 additions & 2 deletions config/helm/aws-node-termination-handler/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: aws-node-termination-handler
description: A Helm chart for the AWS Node Termination Handler.
type: application
version: 0.27.1
appVersion: 1.25.1
version: 0.27.2
appVersion: 1.25.2
kubeVersion: ">= 1.16-0"
keywords:
- aws
Expand Down
2 changes: 1 addition & 1 deletion test/eks-cluster-test/cluster-spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ nodeGroups:
minSize: 1
maxSize: 1
volumeSize: 100
amiFamily: WindowsServer2019FullContainer
amiFamily: WindowsServer2022FullContainer