Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ This project is licensed under the Apache-2.0 License.
[getting-started]: https://www.gateway-api-controller.eks.aws.dev/guides/getstarted/
[spec]: https://www.gateway-api-controller.eks.aws.dev/api-reference/
[concepts]: https://www.gateway-api-controller.eks.aws.dev/concepts/
[gh_release]: https://github.com/aws/aws-application-networking-k8s/releases/tag/v1.1.0
[godoc]: https://www.gateway-api-controller.eks.aws.dev/
[gh_release]: https://github.com/aws/aws-application-networking-k8s/releases/tag/v1.1.2
[godoc]: https://www.gateway-api-controller.eks.aws.dev/
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ configMapGenerator:
images:
- name: controller
newName: public.ecr.aws/aws-application-networking-k8s/aws-gateway-controller
newTag: v1.1.1
newTag: v1.1.2
2 changes: 1 addition & 1 deletion docs/guides/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ helm install gateway-api-controller \
=== "Kubectl"

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

1. Create the `amazon-vpc-lattice` GatewayClass:
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/getstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,9 @@ aws vpc-lattice delete-service-network-vpc-association --service-network-vpc-as
=== "Kubectl"
```bash
kubectl config use-context gw-api-controller-demo
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.0.yaml
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.2.yaml
kubectl config use-context gw-api-controller-demo-2
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.0.yaml
kubectl delete -f https://raw.githubusercontent.com/aws/aws-application-networking-k8s/main/files/controller-installation/deploy-v1.1.2.yaml
```

1. Delete the service network:
Expand Down
7,960 changes: 0 additions & 7,960 deletions files/controller-installation/deploy-v1.0.4.yaml

This file was deleted.

2,694 changes: 2,694 additions & 0 deletions files/controller-installation/deploy-v1.1.2.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: aws-gateway-controller-chart
description: A Helm chart for the Gateway Controller for AWS VPC Lattice
version: v1.1.1
appVersion: v1.1.1
version: v1.1.2
appVersion: v1.1.2
home: https://github.com/aws/aws-application-networking-k8s
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-application-networking-k8s/aws-gateway-controller
tag: v1.1.1
tag: v1.1.2
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down
41 changes: 34 additions & 7 deletions scripts/github-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ source ./scripts/lib/common.sh
SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
WORKSPACE_DIR=$(realpath "$SCRIPTS_DIR/..")

# Check if SSH agent is running
if [ -z "$SSH_AUTH_SOCK" ]; then
echo "SSH agent is not running. This script requires SSH agent to avoid multiple passphrase prompts."
echo "Please run 'eval \$(ssh-agent -s)' and 'ssh-add' before running this script."
exit 1
fi

if [ -z "$RELEASE_VERSION" ]; then
echo "Environment variable RELEASE_VERSION is not set. Please set it to run this script."
exit 1
Expand Down Expand Up @@ -62,7 +69,7 @@ sed_inplace "tag: $OLD_VERSION" "tag: $RELEASE_VERSION" "$WORKSPACE_DIR"/helm/va
sed_inplace "deploy-$OLD_VERSION.yaml" "deploy-$RELEASE_VERSION.yaml" "$WORKSPACE_DIR"/docs/guides/deploy.md
sed_inplace "--version=$OLD_VERSION" "--version=$RELEASE_VERSION" "$WORKSPACE_DIR"/docs/guides/deploy.md
sed_inplace "--version=$OLD_VERSION" "--version=$RELEASE_VERSION" "$WORKSPACE_DIR"/docs/guides/getstarted.md
sed_inplace "mike deploy $OLD_VERSION" "mike deploy $RELEASE_VERSION" "$WORKSPACE_DIR"/.github/workflows/publish-doc.yml
sed_inplace "mike deploy $OLD_VERSION" "mike deploy $RELEASE_VERSION" "$WORKSPACE_DIR"/.github/workflows/publish-doc.yaml


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

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

# Crete a new release branch, tag and push the changes
# Create a new release branch, tag and push the changes
git checkout -b release-$RELEASE_VERSION

# Add all modified files
git add "$WORKSPACE_DIR/README.md" \
"$WORKSPACE_DIR/config/manager/kustomization.yaml" \
"$WORKSPACE_DIR/helm/Chart.yaml" \
"$WORKSPACE_DIR/helm/values.yaml" \
"$WORKSPACE_DIR/files/controller-installation/deploy-$RELEASE_VERSION.yaml" \
"$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml" \
"$WORKSPACE_DIR/docs/guides/deploy.md"
"$WORKSPACE_DIR/docs/guides/deploy.md" \
"$WORKSPACE_DIR/docs/guides/getstarted.md" \

# Add the old deploy file if it exists and was removed
if [ -f "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml" ]; then
git add "$WORKSPACE_DIR/files/controller-installation/deploy-$VERSION_TO_REMOVE.yaml"
fi

git commit -m "Release artifacts for release $RELEASE_VERSION"
git push origin release-$RELEASE_VERSION
git tag -a $RELEASE_VERSION -m "Release artifacts for release $RELEASE_VERSION"
git tag -a $RELEASE_VERSION -m "Release artifacts for release $RELEASE_VERSION"
git push origin $RELEASE_VERSION

# Check if GitHub CLI is authenticated and has necessary permissions
if ! gh auth status &>/dev/null; then
echo "GitHub CLI is not authenticated. Please run 'gh auth login' before running this script."
exit 1
fi

# Create a PR
echo "Creating a PR for release $RELEASE_VERSION..."
gh pr create --title "Release artifacts for $RELEASE_VERSION" --body "Release artifacts for $RELEASE_VERSION" \
--base aws:main --head aws:release-$RELEASE_VERSION \
--repo aws/aws-application-networking-k8s --web


echo "Release process completed successfully!"
Loading