Skip to content

Commit

Permalink
Merge pull request #3331 from shraddhabang/release2.6
Browse files Browse the repository at this point in the history
cut v2.6.0 release
  • Loading branch information
k8s-ci-robot authored Aug 10, 2023
2 parents b805cc2 + f12ab24 commit 4d746c5
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
MAKEFILE_PATH = $(dir $(realpath -s $(firstword $(MAKEFILE_LIST))))

# Image URL to use all building/pushing image targets
IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.5.4
IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.6.0
# Image URL to use for builder stage in Docker build
BUILD_IMAGE ?= public.ecr.aws/docker/library/golang:1.20.5
# Image URL to use for base layer in Docker build
Expand Down Expand Up @@ -165,7 +165,7 @@ docs-preview: docs-dependencies

# publish the versioned docs using mkdocs mike util
docs-publish: docs-dependencies
pipenv run mike deploy v2.5 latest -p --update-aliases
pipenv run mike deploy v2.6 latest -p --update-aliases

# install dependencies needed to preview and publish docs
docs-dependencies:
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/eks/aws-load-balancer-controller
newTag: v2.5.4
newTag: v2.6.0
16 changes: 8 additions & 8 deletions docs/deploy/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ Example condition for cluster name resource tag:
2. Download an IAM policy for the LBC using one of the following commands:<p>
If your cluster is in a US Gov Cloud region:
```
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/install/iam_policy_us-gov.json
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/install/iam_policy_us-gov.json
```
If your cluster is in a China region:
```
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/install/iam_policy_cn.json
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/install/iam_policy_cn.json
```
If your cluster is in any other region:
```
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/install/iam_policy.json
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/install/iam_policy.json
```

3. Create an IAM policy named `AWSLoadBalancerControllerIAMPolicy`. If you downloaded a different policy, replace `iam-policy` with the name of the policy that you downloaded.
Expand All @@ -121,7 +121,7 @@ Example condition for cluster name resource tag:
### Option B: Attach IAM policies to nodes
If you're not setting up IAM roles for service accounts, apply the IAM policies from the following URL at a minimum. Please be aware of the possibility that the controller permissions may be assumed by other users in a pod after retrieving the node role credentials, so the best practice would be using IRSA instead of attaching IAM policy directly.
```
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/install/iam_policy.json
curl -o iam-policy.json https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/install/iam_policy.json
```

The following IAM permissions subset is for those using `TargetGroupBinding` only and don't plan to use the LBC to manage security group rules:
Expand Down Expand Up @@ -204,7 +204,7 @@ We recommend using the Helm chart to install the controller. The chart supports
### Apply YAML
1. Download the spec for the LBC.
```
wget https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.5.4/v2_5_4_full.yaml
wget https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.6.0/v2_6_0_full.yaml
```
2. Edit the saved yaml file, go to the Deployment spec, and set the controller `--cluster-name` arg value to your EKS cluster name
```
Expand All @@ -228,15 +228,15 @@ We recommend using the Helm chart to install the controller. The chart supports
```
4. Apply the yaml file
```
kubectl apply -f v2_5_4_full.yaml
kubectl apply -f v2_6_0_full.yaml
```
5. Optionally download the default ingressclass and ingressclass params
```
wget https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.5.4/v2_5_4_ingclass.yaml
wget https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.6.0/v2_6_0_ingclass.yaml
```
6. Apply the ingressclass and params
```
kubectl apply -f v2_5_4_ingclass.yaml
kubectl apply -f v2_6_0_ingclass.yaml
```

## Create Update Strategy
Expand Down
10 changes: 5 additions & 5 deletions docs/examples/echo_server.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ In this walkthrough, you'll
1. Deploy all the echoserver resources (namespace, service, deployment)

```bash
kubectl apply -f https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/examples/echoservice/echoserver-namespace.yaml &&\
kubectl apply -f https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/examples/echoservice/echoserver-service.yaml &&\
kubectl apply -f https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/examples/echoservice/echoserver-deployment.yaml
kubectl apply -f https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/examples/echoservice/echoserver-namespace.yaml &&\
kubectl apply -f https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/examples/echoservice/echoserver-service.yaml &&\
kubectl apply -f https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/examples/echoservice/echoserver-deployment.yaml
```

1. List all the resources to ensure they were created.
Expand All @@ -113,7 +113,7 @@ In this walkthrough, you'll
1. Download the echoserver ingress manifest locally.

```bash
wget https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/examples/echoservice/echoserver-ingress.yaml
wget https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/examples/echoservice/echoserver-ingress.yaml
```

1. Configure the subnets, either by add annotation to the ingress or add tags to subnets. This step is optional in lieu of auto-discovery.
Expand Down Expand Up @@ -300,7 +300,7 @@ You should get back a valid response.
follow below steps if you want to use kube2iam to provide the AWS credentials

1. configure the proper policy
The policy to be used can be fetched from https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.5.4/docs/install/iam_policy.json
The policy to be used can be fetched from https://github.com/kubernetes-sigs/aws-load-balancer-controller/v2.6.0/docs/install/iam_policy.json

1. configure the proper role and create the trust relationship
You have to find which role is associated with your K8S nodes. Once you found take note of the full arn:
Expand Down
4 changes: 2 additions & 2 deletions helm/aws-load-balancer-controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: aws-load-balancer-controller
description: AWS Load Balancer Controller Helm chart for Kubernetes
version: 1.5.5
appVersion: v2.5.4
version: 1.6.0
appVersion: v2.6.0
home: https://github.com/aws/eks-charts
icon: https://github.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/aws-load-balancer-controller/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replicaCount: 2

image:
repository: public.ecr.aws/eks/aws-load-balancer-controller
tag: v2.5.4
tag: v2.6.0
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion helm/aws-load-balancer-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replicaCount: 2

image:
repository: public.ecr.aws/eks/aws-load-balancer-controller
tag: v2.5.4
tag: v2.6.0
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion version-stable.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.4
2.6.0
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.4
2.6.0

0 comments on commit 4d746c5

Please sign in to comment.