From 72c3395f2894528a7b874f4e93795c2142560b40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 07:10:03 -0500 Subject: [PATCH 01/10] chore(deps): Bump actions/dependency-review-action from 3.1.0 to 3.1.1 (#1824) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 75c8b7801c..d1fe9ab5b5 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0 + uses: actions/dependency-review-action@9f45b2463b475767b61721ccfef113fef513e6aa # v3.1.1 From 2e668edbde5bd459cf3708dc3fb33470a28d04e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 07:18:52 -0500 Subject: [PATCH 02/10] chore(deps): Bump actions/dependency-review-action from 3.1.1 to 3.1.2 (#1825) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d1fe9ab5b5..f028603c0e 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@9f45b2463b475767b61721ccfef113fef513e6aa # v3.1.1 + uses: actions/dependency-review-action@fde92acd0840415674c16b39c7d703fc28bc511e # v3.1.2 From 204aeeed5fd6413fa57a1b547e4ef0fadf7fa461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Allamand?= Date: Wed, 8 Nov 2023 13:19:21 +0100 Subject: [PATCH 03/10] fix: Pattern-blue-green-upgrade update example for `tfvars` (#1799) Co-authored-by: Carlos Santana Co-authored-by: Rodrigo Bersa --- .../environment/versions.tf | 1 + .../terraform.tfvars.example | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/patterns/blue-green-upgrade/environment/versions.tf b/patterns/blue-green-upgrade/environment/versions.tf index 967337612f..6227221a4a 100644 --- a/patterns/blue-green-upgrade/environment/versions.tf +++ b/patterns/blue-green-upgrade/environment/versions.tf @@ -10,5 +10,6 @@ terraform { source = "hashicorp/random" version = ">= 3.0" } + } } diff --git a/patterns/blue-green-upgrade/terraform.tfvars.example b/patterns/blue-green-upgrade/terraform.tfvars.example index 4687c83db5..0d70039604 100644 --- a/patterns/blue-green-upgrade/terraform.tfvars.example +++ b/patterns/blue-green-upgrade/terraform.tfvars.example @@ -5,12 +5,17 @@ environment_name = "eks-blueprint" hosted_zone_name = "eks.mydomain.org" # your Existing Hosted Zone eks_admin_role_name = "Admin" # Additional role admin in the cluster (usually the role I use in the AWS console) -# EKS Blueprint AddOns ArgoCD App of App repository -gitops_bridge_repo_url = "git@github.com:gitops-bridge-dev/gitops-bridge-argocd-control-plane-template" -gitops_bridge_repo_revision = "HEAD" +#gitops_addons_org = "git@github.com:aws-samples" +#gitops_addons_repo = "eks-blueprints-add-ons" +#gitops_addons_path = "argocd/bootstrap/control-plane/addons" +#gitops_addons_basepath = "argocd/" # EKS Blueprint Workloads ArgoCD App of App repository -workload_repo_url = "git@github.com:aws-samples/eks-blueprints-workloads.git" -workload_repo_revision = "main" -workload_repo_path = "envs/dev" -workload_repo_secret = "github-blueprint-ssh-key" +gitops_workloads_org = "git@github.com:aws-samples" +gitops_workloads_repo = "eks-blueprints-workloads" +gitops_workloads_revision = "main" +gitops_workloads_path = "envs/dev" + + +#Secret manager secret for github ssk jey +aws_secret_manager_git_private_ssh_key_name = "github-blueprint-ssh-key" From 30825d84997659a8e74e669ae2d5c53ae7b7a21f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 07:20:04 -0500 Subject: [PATCH 04/10] chore(deps): Bump actions/dependency-review-action from 3.1.2 to 3.1.3 (#1827) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index f028603c0e..1720e66af9 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@fde92acd0840415674c16b39c7d703fc28bc511e # v3.1.2 + uses: actions/dependency-review-action@7bbfa034e752445ea40215fff1c3bf9597993d3f # v3.1.3 From d4ca8c43c7916cfcfac854319e6c451beaa1c22d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 07:18:16 -0500 Subject: [PATCH 05/10] chore(deps): Bump github/codeql-action from 2.22.5 to 2.22.6 (#1828) 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 567a88799e..3275194b70 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@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5 + uses: github/codeql-action/upload-sarif@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6 with: sarif_file: results.sarif From f74594a2da147bbc5c635c4ec2806778394db05f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 06:56:27 -0500 Subject: [PATCH 06/10] chore(deps): Bump github/codeql-action from 2.22.6 to 2.22.7 (#1832) 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 3275194b70..466a898167 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@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6 + uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7 with: sarif_file: results.sarif From ba1155251ef3cefd3c97b6dd53faf88d46571932 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 07:09:55 -0500 Subject: [PATCH 07/10] chore(deps): Bump github/codeql-action from 2.22.7 to 2.22.8 (#1835) 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 466a898167..2ad03ab5a6 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@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7 + uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8 with: sarif_file: results.sarif From d2c87b184d2115bfaf6693e66fa2e0b8b470f4ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 07:12:46 -0500 Subject: [PATCH 08/10] chore(deps): Bump actions/dependency-review-action from 3.1.3 to 3.1.4 (#1836) --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 1720e66af9..7e7129fe19 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4 - name: 'Dependency Review' - uses: actions/dependency-review-action@7bbfa034e752445ea40215fff1c3bf9597993d3f # v3.1.3 + uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4 From 06b994fe7d3fb9eb14fb5d865ab12ff9a05c3315 Mon Sep 17 00:00:00 2001 From: Vijay Chintalapati Date: Wed, 6 Dec 2023 14:47:53 -0800 Subject: [PATCH 09/10] fix: Corrections to the Helm chart versions (#1837) --- patterns/istio/main.tf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/patterns/istio/main.tf b/patterns/istio/main.tf index 254cc26c4f..bf0edfc6d8 100644 --- a/patterns/istio/main.tf +++ b/patterns/istio/main.tf @@ -127,19 +127,19 @@ module "eks_blueprints_addons" { helm_releases = { istio-base = { - chart = "base" - version = local.istio_chart_version - repository = local.istio_chart_url - name = "istio-base" - namespace = kubernetes_namespace_v1.istio_system.metadata[0].name + chart = "base" + chart_version = local.istio_chart_version + repository = local.istio_chart_url + name = "istio-base" + namespace = kubernetes_namespace_v1.istio_system.metadata[0].name } istiod = { - chart = "istiod" - version = local.istio_chart_version - repository = local.istio_chart_url - name = "istiod" - namespace = kubernetes_namespace_v1.istio_system.metadata[0].name + chart = "istiod" + chart_version = local.istio_chart_version + repository = local.istio_chart_url + name = "istiod" + namespace = kubernetes_namespace_v1.istio_system.metadata[0].name set = [ { @@ -151,7 +151,7 @@ module "eks_blueprints_addons" { istio-ingress = { chart = "gateway" - version = local.istio_chart_version + chart_version = local.istio_chart_version repository = local.istio_chart_url name = "istio-ingress" namespace = "istio-ingress" # per https://github.com/istio/istio/blob/master/manifests/charts/gateways/istio-ingress/values.yaml#L2 From a4c28f7f7ba78c0db19810341f2f9e07e60e47cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 07:17:55 -0500 Subject: [PATCH 10/10] chore(deps): Bump actions/setup-python from 4 to 5 (#1838) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/publish-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 768a8e081b..b4dc12dd44 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -28,7 +28,7 @@ jobs: fetch-depth: 0 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VERSION }}