Skip to content

Commit 99f04d6

Browse files
authored
Merge pull request #447 from nckturner/release-0.5.6
Release 0.5.6
2 parents 186ea9d + 9dcb6d1 commit 99f04d6

File tree

6 files changed

+36
-10
lines changed

6 files changed

+36
-10
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Release v0.5.6
2+
* Bump AWS SDK to v1.43.28 ([#445](https://github.com/kubernetes-sigs/aws-iam-authenticator/pull/445), @nckturner)
3+
* Use the apiversion from KUBERNETES_EXEC_INFO ([#439](https://github.com/kubernetes-sigs/aws-iam-authenticator/pull/439), @jyotimahapatra)
4+
* Bump promptui module to v0.9.0 ([#437](https://github.com/kubernetes-sigs/aws-iam-authenticator/pull/437), @abhay-krishna)
5+
16
Release v0.5.5
27
* Use full package name for goreleaser version ([#433](https://github.com/kubernetes-sigs/aws-iam-authenticator/pull/433), @nckturner)
38
* add sts error metric ([#430](https://github.com/kubernetes-sigs/aws-iam-authenticator/pull/430), @jyotimahapatra)

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
# limitations under the License.
1414
ARG image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
1515

16-
FROM golang:1.16 AS builder
16+
FROM --platform=$BUILDPLATFORM golang:1.16 AS builder
1717
WORKDIR /go/src/github.com/kubernetes-sigs/aws-iam-authenticator
1818
COPY . .
19-
RUN make bin
19+
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH make bin
2020
RUN chown 65532 _output/bin/aws-iam-authenticator
2121

2222
FROM public.ecr.aws/eks-distro/kubernetes/go-runner:v0.9.0-eks-1-21-4 as go-runner

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default: bin/aws-iam-authenticator
33
PKG ?= sigs.k8s.io/aws-iam-authenticator
44
GORELEASER := $(shell command -v goreleaser 2> /dev/null)
55

6-
VERSION ?= v0.5.5
6+
VERSION ?= v0.5.6
77
GOOS ?= $(shell go env GOOS)
88
GOARCH ?= $(shell go env GOARCH)
99
GOPROXY ?= $(shell go env GOPROXY)

cloudbuild.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
images:
2-
- 'gcr.io/$PROJECT_ID/aws-iam-authenticator:$_GIT_TAG'
3-
- 'gcr.io/$PROJECT_ID/aws-iam-authenticator:latest'
41
options:
52
substitution_option: ALLOW_LOOSE
63
steps:
@@ -17,4 +14,4 @@ steps:
1714
substitutions:
1815
_GIT_TAG: '12345'
1916
_PULL_BASE_REF: 'master'
20-
timeout: 1200s
17+
timeout: 1600s

docs/RELEASE.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ You also might need to create a release branch, if it doesn't already exist, if
3939

4040
## Creating the release commit
4141

42+
### Updating the Makefile
43+
44+
Bump the version number in the Makefile:
45+
46+
```
47+
VERSION ?= v0.5.2
48+
```
49+
50+
This ensures the binary version is correct.
51+
52+
### Updating the CHANGELOG
53+
4254
We need to generate the CHANGELOG for the new release by running `./hack/changelog.py`. First check the correctness of the output using the `--print-only` flag. Pass the previous release tag, and the commit SHA of the most recent commit (the new tag will include the changelog, so it hasn't been created yet). The commands use a `--token` field. Generate it from [github personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
4355

4456
```
@@ -115,3 +127,11 @@ $(aws ecr get-login --no-include-email --region us-west-2 --registry-ids 6024011
115127
* `docker pull 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:v0.5.2-alpine-3.6`
116128
* `docker pull 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:v0.5.2-scratch`
117129
````
130+
131+
## Post Release
132+
133+
In a new PR after the images are pushed to ECR, update the yaml in `deploy/example.yaml`:
134+
135+
```
136+
image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/aws-iam-authenticator:v0.5.2
137+
```

hack/changelog.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def git_log(range=''):
2727
if __name__ == '__main__':
2828
parser = argparse.ArgumentParser(prog='changelog')
2929
parser.add_argument('--token', help='Your github token.')
30-
parser.add_argument('--changelog-file', help='The path to the changelog output file.')
30+
parser.add_argument('--changelog-file', default='CHANGELOG.md', help='The path to the changelog output file.')
3131
parser.add_argument('--print-only', action='store_true', help='Only print the output.')
3232
parser.add_argument('--range', help='The range of commit logs to inspect in the repository. You can (and should) use tags here. Example: v5..v10 (This argument is passed to git log, so read the git log documentation for clarification.')
3333
parser.add_argument('--section-title', help='The title for the section in the changelog that is generated')
@@ -50,8 +50,12 @@ def git_log(range=''):
5050

5151
changelog = f'{args.section_title}\n'
5252
g = ChangelogGenerator('kubernetes-sigs/aws-iam-authenticator', args.token)
53-
for pr_match in re.finditer(r'Merge pull request #(\d+)', logs):
54-
pr_id = int(pr_match.group(1))
53+
for pr_match in re.finditer(r'Merge pull request #(\d+)|\(#([\d]{1,7})\)', logs):
54+
groups = pr_match.groups()
55+
if groups[0]:
56+
pr_id = int(groups[0])
57+
elif groups[1]:
58+
pr_id = int(groups[1])
5559
changelog += f'* {g.generate(pr_id)}\n'
5660

5761
if args.print_only:

0 commit comments

Comments
 (0)