From 233ca76a14bba83901c2bc9d5d3b2c9d58640a67 Mon Sep 17 00:00:00 2001 From: Steve Nay <265958+snay2@users.noreply.github.com> Date: Fri, 15 Oct 2021 13:28:38 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A5=91=F0=9F=A4=96=20v1.13.4=20release=20?= =?UTF-8?q?prep=20(#512)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🥑🤖 v1.13.4 release prep 🤖🥑 * Don't push to Dockerhub during release * Remove other references to Dockerhub Co-authored-by: ec2-bot 🤖 --- .github/workflows/ci.yml | 6 ---- Makefile | 13 -------- .../aws-node-termination-handler/Chart.yaml | 4 +-- .../aws-node-termination-handler/values.yaml | 2 +- scripts/sync-readme-to-dockerhub | 31 ------------------- 5 files changed, 3 insertions(+), 53 deletions(-) delete mode 100755 scripts/sync-readme-to-dockerhub diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61938398..aebcb9ba 100644 --- 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 index b8cc13b5..fb146e49 100644 --- 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,10 +34,6 @@ 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} @@ -47,15 +41,11 @@ 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 index 395b7646..dae8179a 100644 --- 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 index bd6323a6..c97eef36 100644 --- 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 deleted file mode 100755 index 544b6491..00000000 --- a/scripts/sync-readme-to-dockerhub +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -euo pipefail - -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" - -image="amazon/aws-node-termination-handler" - -if git --no-pager diff --name-only HEAD^ HEAD | grep 'README.md'; then - token=$(curl -s -X POST \ - -H "Content-Type: application/json" \ - -d '{"username": "'"${DOCKER_USERNAME}"'", "password": "'"${DOCKER_PASSWORD}"'"}' \ - https://hub.docker.com/v2/users/login/ | jq -r .token) - - rcode=$(jq -n --arg msg "$(<$SCRIPTPATH/../README.md)" \ - '{"registry":"registry-1.docker.io","full_description": $msg }' | - curl -s -o /dev/stderr -L -w "%{http_code}" \ - https://hub.docker.com/v2/repositories/"${image}"/ \ - -d @- \ - -X PATCH \ - -H "Content-Type: application/json" \ - -H "Authorization: JWT ${token}") - - if [[ $rcode -ge 200 && $rcode -lt 300 ]]; then - echo "README sync to dockerhub completed successfully" - else - echo "README sync to dockerhub failed" - exit 1 - fi -else - echo "README.md did not change in the last commit. Not taking any action." -fi