Merge branch 'main' into sso/cam

aws-ia · Mar 26, 2024 · 2ec3f7b · 2ec3f7b
2 parents f9b2b8c + 9d02c36
commit 2ec3f7b
Show file tree

Hide file tree

Showing 59 changed files with 224 additions and 2,550 deletions.
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -22,6 +22,6 @@ jobs:
  egress-policy: audit
 
  - name: 'Checkout Repository'
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.5.4
  - name: 'Dependency Review'
- uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3
+ uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5
diff --git a/.github/workflows/e2e-parallel-destroy.yml b/.github/workflows/e2e-parallel-destroy.yml
@@ -41,7 +41,7 @@ jobs:
  egress-policy: audit
 
  - name: Checkout
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
  - name: Setup backend
  # Un-comment remote backend for use in workflow

diff --git a/.github/workflows/e2e-parallel-full.yml b/.github/workflows/e2e-parallel-full.yml
@@ -32,7 +32,7 @@ jobs:
  egress-policy: audit
 
  - name: Checkout
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
  - name: Auth AWS
  uses: aws-actions/[email protected]
@@ -74,7 +74,7 @@ jobs:
  egress-policy: audit
 
  - name: Checkout
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
  - name: Setup backend
  # Un-comment remote backend for use in workflow
@@ -167,7 +167,7 @@ jobs:
  egress-policy: audit
 
  - name: Checkout
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
  - name: Configure AWS credentials from Test account
  uses: aws-actions/[email protected]

diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml
@@ -25,7 +25,7 @@ jobs:
  with:
  egress-policy: audit
 
- - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
  - uses: actions/setup-node@v4
  with:
  node-version: '16.x'

diff --git a/.github/workflows/plan-examples.yml b/.github/workflows/plan-examples.yml
@@ -28,7 +28,7 @@ jobs:
  egress-policy: audit
 
  - name: Checkout
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
  - name: Get Terraform directories for evaluation
  id: dirs
@@ -63,13 +63,13 @@ jobs:
 
  - name: checkout-merge
  if: "contains(github.event_name, 'pull_request')"
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
  with:
  ref: refs/pull/${{github.event.pull_request.number}}/merge
 
  - name: checkout
  if: "!contains(github.event_name, 'pull_request')"
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
  - uses: dorny/paths-filter@v3
  id: changes

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -33,7 +33,7 @@ jobs:
  run: rm -rf $(which terraform)
 
  - name: Checkout
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
 
  - uses: dorny/paths-filter@v3
  id: changes
@@ -55,7 +55,7 @@ jobs:
  restore-keys: ${{ runner.os }}-terraform-
 
  - name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
- uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.3
+ uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
  if: steps.changes.outputs.src== 'true'
  with:
  terraform-version: ${{ env.TERRAFORM_VERSION }}

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -23,7 +23,7 @@ jobs:
  egress-policy: audit
 
  - name: Checkout main
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
  with:
  fetch-depth: 0
 

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -36,7 +36,7 @@ jobs:
  egress-policy: audit
 
  - name: "Checkout code"
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.5.4
+ uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.5.4
  with:
  persist-credentials: false
 
@@ -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@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+ uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
  with:
  sarif_file: results.sarif
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/streetsidesoftware/cspell-cli
- rev: v8.3.0
+ rev: v8.6.0
  hooks:
  - id: cspell
  args: [--exclude, 'ADOPTERS.md', --exclude, '.pre-commit-config.yaml', --exclude, '.gitignore', --exclude, '*.drawio', --exclude, 'mkdocs.yml', --exclude, '.helmignore', --exclude, '.github/workflows/*', --exclude, 'patterns/istio-multi-cluster/*', --exclude, 'patterns/blue-green-upgrade/*']
@@ -19,7 +19,7 @@ repos:
  - id: detect-aws-credentials
  args: [--allow-missing-credentials]
  - repo: https://github.com/antonbabenko/pre-commit-terraform
- rev: v1.86.0
+ rev: v1.88.2
  hooks:
  - id: terraform_fmt
  - id: terraform_docs

diff --git a/README.md b/README.md
@@ -85,6 +85,10 @@ related projects that users should be aware of:
  AWS-managed observability services such as Amazon Managed Service for Prometheus, Amazon
  Managed Grafana, AWS Distro for OpenTelemetry (ADOT) and Amazon CloudWatch
 
+4. Karpenter Blueprints
+ - [`karpenter-blueprints`](https://github.com/aws-samples/karpenter-blueprints) - includes a list of common workload scenarios,
+ some of them go in depth with the explanation of why configuring Karpenter and Kubernetes objects in such a way is important.
+
 ## Terraform Caveats
 
 EKS Blueprints for Terraform does not intend to teach users the recommended practices for Terraform

diff --git a/docs/cSpell_dict.txt b/docs/cSpell_dict.txt
@@ -4,6 +4,7 @@ addrs
 adot
 agones
 akuity
+alekc
 algbw
 ALLOWVOLUMEEXPANSION
 amazonlinux
@@ -73,7 +74,6 @@ flblogs
 fluentbit
 gameserver
 gameservers
-gavinbunney
 gitops
 helloworld
 heptio
@@ -144,6 +144,7 @@ tcpdump
 templatefile
 tfstate
 tfvars
+tolerations
 tolist
 toset
 velero

diff --git a/docs/patterns/istio-multi-cluster.md b/docs/patterns/istio-multi-cluster.md
diff --git a/patterns/appmesh-mtls/versions.tf b/patterns/appmesh-mtls/versions.tf
@@ -11,8 +11,8 @@ terraform {
  version = ">= 2.9"
  }
  kubectl = {
- source = "gavinbunney/kubectl"
- version = ">= 1.14"
+ source = "alekc/kubectl"
+ version = ">= 2.0"
  }
  }
 

diff --git a/patterns/elastic-fabric-adapter/README.md b/patterns/elastic-fabric-adapter/README.md
@@ -8,6 +8,10 @@ See [here](https://aws-ia.github.io/terraform-aws-eks-blueprints/getting-started
 
 ## Validate
 
+!!! note
+
+ The following steps are shown with `g5.8xlarge` for frugality. Values shown below will change based on the instance type selected (i.e. - `p5.48xlarge` has 8 GPUs and 32 EFA interfaces)
+
 1. List the nodes by instance type:
 
  ```sh