Skip to content

Commit 8fb0ab8

Browse files
author
Mike Estevez
committed
updated version on getstarted.md
1 parent 1efa8f6 commit 8fb0ab8

File tree

3 files changed

+38
-10
lines changed

3 files changed

+38
-10
lines changed

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:

scripts/github-release.sh

Lines changed: 35 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,46 @@ 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+
"$WORKSPACE_DIR/.github/workflows/publish-doc.yaml"
100+
101+
# Add the old deploy file if it exists and was removed
102+
if [ -f "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml" ]; then
103+
git add "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml"
104+
fi
105+
85106
git commit -m "Release artifacts for release $RELEASE_VERSION"
86107
git push origin release-$RELEASE_VERSION
87-
git tag -a $RELEASE_VERSION -m "Release artifacts for release $RELEASE_VERSION"
108+
git tag -a $RELEASE_VERSION -m "Release artifacts for release $RELEASE_VERSION"
88109
git push origin $RELEASE_VERSION
89110

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

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

0 commit comments

Comments
 (0)