Skip to content

Commit 233ca76

Browse files
snay2ec2-bot
andauthored
🥑🤖 v1.13.4 release prep (#512)
* 🥑🤖 v1.13.4 release prep 🤖🥑 * Don't push to Dockerhub during release * Remove other references to Dockerhub Co-authored-by: ec2-bot 🤖 <[email protected]>
1 parent aad964e commit 233ca76

File tree

5 files changed

+3
-53
lines changed

5 files changed

+3
-53
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ env:
77
GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
88
GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
99
WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
10-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
11-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
12-
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
1310

1411
jobs:
1512

@@ -182,9 +179,6 @@ jobs:
182179
- name: Create eks-charts PR
183180
run: make ekscharts-sync-release
184181

185-
- name: Sync Readme to Dockerhub
186-
run: make sync-readme-to-dockerhub
187-
188182
- name: Sync Readme to ECR Public
189183
run: make sync-readme-to-ecr-public
190184
env:

Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ ECR_REPO ?= ${ECR_REGISTRY}/aws-node-termination-handler
77
IMG ?= amazon/aws-node-termination-handler
88
IMG_TAG ?= ${VERSION}
99
IMG_W_TAG = ${IMG}:${IMG_TAG}
10-
DOCKER_USERNAME ?= ""
11-
DOCKERHUB_TOKEN ?= ""
1210
GOOS ?= linux
1311
GOARCH ?= amd64
1412
GOPROXY ?= "https://proxy.golang.org,direct"
@@ -36,26 +34,18 @@ docker-build:
3634
docker-run:
3735
docker run ${IMG_W_TAG}
3836

39-
docker-push:
40-
@docker login -u ${DOCKER_USERNAME} -p="${DOCKERHUB_TOKEN}"
41-
docker push ${IMG_W_TAG}
42-
4337
build-docker-images:
4438
${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${IMG} -v ${VERSION}
4539

4640
build-docker-images-windows:
4741
${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${IMG} -v ${VERSION}
4842

4943
push-docker-images:
50-
@docker login -u ${DOCKER_USERNAME} -p="${DOCKERHUB_TOKEN}"
51-
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${IMG} -v ${VERSION} -m
5244
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
5345
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
5446
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${ECR_REPO} -v ${VERSION} -m
5547

5648
push-docker-images-windows:
57-
@docker login -u ${DOCKER_USERNAME} -p="${DOCKERHUB_TOKEN}"
58-
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${IMG} -v ${VERSION} -m
5949
${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
6050
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
6151
${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${ECR_REPO} -v ${VERSION} -m
@@ -117,9 +107,6 @@ upload-resources-to-github-windows:
117107
generate-k8s-yaml:
118108
${MAKEFILE_PATH}/scripts/generate-k8s-yaml
119109

120-
sync-readme-to-dockerhub:
121-
${MAKEFILE_PATH}/scripts/sync-readme-to-dockerhub
122-
123110
sync-readme-to-ecr-public:
124111
@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
125112
${MAKEFILE_PATH}/scripts/sync-readme-to-ecr-public

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
22
name: aws-node-termination-handler
33
description: A Helm chart for the AWS Node Termination Handler
4-
version: 0.15.3
5-
appVersion: 1.13.3
4+
version: 0.15.4
5+
appVersion: 1.13.4
66
home: https://github.com/aws/eks-charts
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
image:
66
repository: public.ecr.aws/aws-ec2/aws-node-termination-handler
7-
tag: v1.13.3
7+
tag: v1.13.4
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

scripts/sync-readme-to-dockerhub

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)