🥑🤖 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]>
aws · Oct 15, 2021 · 233ca76 · 233ca76
1 parent aad964e
commit 233ca76
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 53 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,9 +7,6 @@ env:
   GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
   GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
   WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-  DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
 jobs:
 
@@ -182,9 +179,6 @@ jobs:
     - name: Create eks-charts PR
       run: make ekscharts-sync-release
 
-    - name: Sync Readme to Dockerhub
-      run: make sync-readme-to-dockerhub
-
     - name: Sync Readme to ECR Public
       run: make sync-readme-to-ecr-public
       env:

diff --git a/Makefile b/Makefile
@@ -7,8 +7,6 @@ ECR_REPO ?= ${ECR_REGISTRY}/aws-node-termination-handler
 IMG ?= amazon/aws-node-termination-handler
 IMG_TAG ?= ${VERSION}
 IMG_W_TAG = ${IMG}:${IMG_TAG}
-DOCKER_USERNAME ?= ""
-DOCKERHUB_TOKEN ?= ""
 GOOS ?= linux
 GOARCH ?= amd64
 GOPROXY ?= "https://proxy.golang.org,direct"
@@ -36,26 +34,18 @@ docker-build:
 docker-run:
 	docker run ${IMG_W_TAG}
 
-docker-push:
-	@docker login -u ${DOCKER_USERNAME} -p="${DOCKERHUB_TOKEN}"
-	docker push ${IMG_W_TAG}
-
 build-docker-images:
 	${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${IMG} -v ${VERSION}
 
 build-docker-images-windows:
 	${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${IMG} -v ${VERSION}
 
 push-docker-images:
-	@docker login -u ${DOCKER_USERNAME} -p="${DOCKERHUB_TOKEN}"
-	${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${IMG} -v ${VERSION} -m
 	${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
 	@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
 	${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_LINUX} -r ${ECR_REPO} -v ${VERSION} -m
 
 push-docker-images-windows:
-	@docker login -u ${DOCKER_USERNAME} -p="${DOCKERHUB_TOKEN}"
-	${MAKEFILE_PATH}/scripts/push-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -r ${IMG} -v ${VERSION} -m
 	${MAKEFILE_PATH}/scripts/retag-docker-images -p ${SUPPORTED_PLATFORMS_WINDOWS} -v ${VERSION} -o ${IMG} -n ${ECR_REPO}
 	@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
 	${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:
 generate-k8s-yaml:
 	${MAKEFILE_PATH}/scripts/generate-k8s-yaml
 
-sync-readme-to-dockerhub:
-	${MAKEFILE_PATH}/scripts/sync-readme-to-dockerhub
-
 sync-readme-to-ecr-public:
 	@ECR_REGISTRY=${ECR_REGISTRY} ${MAKEFILE_PATH}/scripts/ecr-public-login
 	${MAKEFILE_PATH}/scripts/sync-readme-to-ecr-public

diff --git a/config/helm/aws-node-termination-handler/Chart.yaml b/config/helm/aws-node-termination-handler/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: aws-node-termination-handler
 description: A Helm chart for the AWS Node Termination Handler
-version: 0.15.3
-appVersion: 1.13.3
+version: 0.15.4
+appVersion: 1.13.4
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/config/helm/aws-node-termination-handler/values.yaml b/config/helm/aws-node-termination-handler/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-ec2/aws-node-termination-handler
-  tag: v1.13.3
+  tag: v1.13.4
   pullPolicy: IfNotPresent
   pullSecrets: []
 

diff --git a/scripts/sync-readme-to-dockerhub b/scripts/sync-readme-to-dockerhub