From 8ca3021ba141f9c7f1775ebae220da267a67a2f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 07:33:02 -0400 Subject: [PATCH 1/2] chore(deps): Bump github/codeql-action from 2.22.4 to 2.22.5 (#1809) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 1dc6649f6e..567a88799e 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -71,6 +71,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@49abf0ba24d0b7953cb586944e918a0b92074c80 # v2.22.4 + uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5 with: sarif_file: results.sarif From 06fd114a107de04c946312a33545930dde11e340 Mon Sep 17 00:00:00 2001 From: Vijay Chintalapati Date: Fri, 27 Oct 2023 14:40:43 -0700 Subject: [PATCH 2/2] fix: Additional annotation added for NLB in `istio` pattern (#1810) --- patterns/istio/README.md | 6 +++++- patterns/istio/main.tf | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/patterns/istio/README.md b/patterns/istio/README.md index 6d69ad81be..c66441da6d 100644 --- a/patterns/istio/README.md +++ b/patterns/istio/README.md @@ -14,7 +14,11 @@ concepts. ## Deploy -See [here](https://aws-ia.github.io/terraform-aws-eks-blueprints/getting-started/#prerequisites) for the prerequisites and steps to deploy this pattern. +See [here](https://aws-ia.github.io/terraform-aws-eks-blueprints/getting-started/#prerequisites) for the prerequisites and run the following command to deploy this pattern. + +```sh +terraform apply --auto-approve +``` Once the resources have been provisioned, you will need to replace the `istio-ingress` pods due to a [`istiod` dependency issue](https://github.com/istio/istio/issues/35789). Use the following command to perform a rolling restart of the `istio-ingress` pods: diff --git a/patterns/istio/main.tf b/patterns/istio/main.tf index 76a38c8ac9..254cc26c4f 100644 --- a/patterns/istio/main.tf +++ b/patterns/istio/main.tf @@ -165,9 +165,10 @@ module "eks_blueprints_addons" { } service = { annotations = { - "service.beta.kubernetes.io/aws-load-balancer-type" = "nlb" - "service.beta.kubernetes.io/aws-load-balancer-scheme" = "internet-facing" - "service.beta.kubernetes.io/aws-load-balancer-attributes" = "load_balancing.cross_zone.enabled=true" + "service.beta.kubernetes.io/aws-load-balancer-type" = "external" + "service.beta.kubernetes.io/aws-load-balancer-nlb-target-type" = "ip" + "service.beta.kubernetes.io/aws-load-balancer-scheme" = "internet-facing" + "service.beta.kubernetes.io/aws-load-balancer-attributes" = "load_balancing.cross_zone.enabled=true" } } }