Skip to content

Commit 93c0f2b

Browse files
mikestvzMike Estevez
andauthored
Release artifacts for v1.1.2 (#759)
* Release artifacts for release v1.1.2 * updated version on getstarted.md * Removing the oldest version since the script failed to remove it. * Update README.md as needs to be updated in every release to target latest version * Readme.md updates to the new version --------- Co-authored-by: Mike Estevez <mikestvz@amazon.com>
1 parent db2303b commit 93c0f2b

File tree

9 files changed

+2737
-7976
lines changed

9 files changed

+2737
-7976
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ This project is licensed under the Apache-2.0 License.
5555
[getting-started]: https://www.gateway-api-controller.eks.aws.dev/guides/getstarted/
5656
[spec]: https://www.gateway-api-controller.eks.aws.dev/api-reference/
5757
[concepts]: https://www.gateway-api-controller.eks.aws.dev/concepts/
58-
[gh_release]: https://github.com/aws/aws-application-networking-k8s/releases/tag/v1.1.0
59-
[godoc]: https://www.gateway-api-controller.eks.aws.dev/
58+
[gh_release]: https://github.com/aws/aws-application-networking-k8s/releases/tag/v1.1.2
59+
[godoc]: https://www.gateway-api-controller.eks.aws.dev/

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ configMapGenerator:
1313
images:
1414
- name: controller
1515
newName: public.ecr.aws/aws-application-networking-k8s/aws-gateway-controller
16-
newTag: v1.1.1
16+
newTag: v1.1.2

docs/guides/deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ helm install gateway-api-controller \
200200
=== "Kubectl"
201201

202202
```bash
203-
kubectl apply -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.0.yaml
203+
kubectl apply -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.2.yaml
204204
```
205205

206206
1. Create the `amazon-vpc-lattice` GatewayClass:

docs/guides/getstarted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@ aws vpc-lattice delete-service-network-vpc-association --service-network-vpc-as
402402
=== "Kubectl"
403403
```bash
404404
kubectl config use-context gw-api-controller-demo
405-
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.0.yaml
405+
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.2.yaml
406406
kubectl config use-context gw-api-controller-demo-2
407-
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.0.yaml
407+
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.2.yaml
408408
```
409409
410410
1. Delete the service network:

files/controller-installation/deploy-v1.0.4.yaml

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

files/controller-installation/deploy-v1.1.2.yaml

Lines changed: 2694 additions & 0 deletions
Large diffs are not rendered by default.

helm/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-gateway-controller-chart
33
description: A Helm chart for the Gateway Controller for AWS VPC Lattice
4-
version: v1.1.1
5-
appVersion: v1.1.1
4+
version: v1.1.2
5+
appVersion: v1.1.2
66
home: https://github.com/aws/aws-application-networking-k8s
77
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
88
sources:

helm/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-application-networking-k8s/aws-gateway-controller
7-
tag: v1.1.1
7+
tag: v1.1.2
88
pullPolicy: IfNotPresent
99
pullSecrets: []
1010

scripts/github-release.sh

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ source ./scripts/lib/common.sh
1616
SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
1717
WORKSPACE_DIR=$(realpath "$SCRIPTS_DIR/..")
1818

19+
# Check if SSH agent is running
20+
if [ -z "$SSH_AUTH_SOCK" ]; then
21+
echo "SSH agent is not running. This script requires SSH agent to avoid multiple passphrase prompts."
22+
echo "Please run 'eval \$(ssh-agent -s)' and 'ssh-add' before running this script."
23+
exit 1
24+
fi
25+
1926
if [ -z "$RELEASE_VERSION" ]; then
2027
echo "Environment variable RELEASE_VERSION is not set. Please set it to run this script."
2128
exit 1
@@ -62,7 +69,7 @@ sed_inplace "tag: $OLD_VERSION" "tag: $RELEASE_VERSION" "$WORKSPACE_DIR"/helm/va
6269
sed_inplace "deploy-$OLD_VERSION.yaml" "deploy-$RELEASE_VERSION.yaml" "$WORKSPACE_DIR"/docs/guides/deploy.md
6370
sed_inplace "--version=$OLD_VERSION" "--version=$RELEASE_VERSION" "$WORKSPACE_DIR"/docs/guides/deploy.md
6471
sed_inplace "--version=$OLD_VERSION" "--version=$RELEASE_VERSION" "$WORKSPACE_DIR"/docs/guides/getstarted.md
65-
sed_inplace "mike deploy $OLD_VERSION" "mike deploy $RELEASE_VERSION" "$WORKSPACE_DIR"/.github/workflows/publish-doc.yml
72+
sed_inplace "mike deploy $OLD_VERSION" "mike deploy $RELEASE_VERSION" "$WORKSPACE_DIR"/.github/workflows/publish-doc.yaml
6673

6774

6875
# Build the deploy.yaml
@@ -71,25 +78,45 @@ cp "deploy.yaml" "files/controller-installation/deploy-$RELEASE_VERSION.yaml"
7178

7279
#only keep 4 recent versions deploy.yaml, removing the oldest one
7380
VERSION_TO_REMOVE=$(git tag --sort=v:refname | grep -v 'rc' | tail -n 5 | head -n 1)
74-
rm -f "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml"
81+
if [ -f "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml" ]; then
82+
echo "Removing old deploy file: deploy-$VERSION_TO_REMOVE.yaml"
83+
rm -f "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml"
84+
else
85+
echo "Old deploy file not found: deploy-$VERSION_TO_REMOVE.yaml. Skipping removal."
86+
fi
7587

76-
# Crete a new release branch, tag and push the changes
88+
# Create a new release branch, tag and push the changes
7789
git checkout -b release-$RELEASE_VERSION
90+
91+
# Add all modified files
7892
git add "$WORKSPACE_DIR/README.md" \
7993
"$WORKSPACE_DIR/config/manager/kustomization.yaml" \
8094
"$WORKSPACE_DIR/helm/Chart.yaml" \
8195
"$WORKSPACE_DIR/helm/values.yaml" \
8296
"$WORKSPACE_DIR/files/controller-installation/deploy-$RELEASE_VERSION.yaml" \
83-
"$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml" \
84-
"$WORKSPACE_DIR/docs/guides/deploy.md"
97+
"$WORKSPACE_DIR/docs/guides/deploy.md" \
98+
"$WORKSPACE_DIR/docs/guides/getstarted.md" \
99+
100+
# Add the old deploy file if it exists and was removed
101+
if [ -f "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml" ]; then
102+
git add "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml"
103+
fi
104+
85105
git commit -m "Release artifacts for release $RELEASE_VERSION"
86106
git push origin release-$RELEASE_VERSION
87-
git tag -a $RELEASE_VERSION -m "Release artifacts for release $RELEASE_VERSION"
107+
git tag -a $RELEASE_VERSION -m "Release artifacts for release $RELEASE_VERSION"
88108
git push origin $RELEASE_VERSION
89109

110+
# Check if GitHub CLI is authenticated and has necessary permissions
111+
if ! gh auth status &>/dev/null; then
112+
echo "GitHub CLI is not authenticated. Please run 'gh auth login' before running this script."
113+
exit 1
114+
fi
115+
90116
# Create a PR
117+
echo "Creating a PR for release $RELEASE_VERSION..."
91118
gh pr create --title "Release artifacts for $RELEASE_VERSION" --body "Release artifacts for $RELEASE_VERSION" \
92119
--base aws:main --head aws:release-$RELEASE_VERSION \
93120
--repo aws/aws-application-networking-k8s --web
94121

95-
122+
echo "Release process completed successfully!"

0 commit comments

Comments
 (0)