Skip to content

Commit

Permalink
Merge branch 'main' of github.com:aws-ia/terraform-aws-eks-blueprints…
Browse files Browse the repository at this point in the history
… into feat/update-karpenter
  • Loading branch information
bryantbiggs committed Nov 4, 2023
2 parents 7e105fb + a20f0e2 commit ea571fc
Show file tree
Hide file tree
Showing 43 changed files with 2,164 additions and 336 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/e2e-parallel-destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
include:
- example_path: patterns/agones-game-controller
- example_path: patterns/fargate-serverless
- example_path: patterns/argocd
- example_path: patterns/gitops/getting-started-argocd
- example_path: patterns/ipv6-eks-cluster
- example_path: patterns/karpenter
- example_path: patterns/multi-tenancy-with-teams
Expand Down Expand Up @@ -65,6 +65,7 @@ jobs:
run: |
terraform init -upgrade=true
terraform destroy -target=module.eks_blueprints_kubernetes_addons -no-color -input=false -auto-approve
terraform destroy -target=module.eks_blueprints -no-color -input=false -auto-approve
terraform destroy -target=module.eks_blueprints_addons -no-color -input=false -auto-approve
terraform destroy -target=module.eks_blueprints -no-color -input=false -auto-approve
terraform destroy -target=module.eks -no-color -input=false -auto-approve
terraform destroy -no-color -input=false -auto-approve
10 changes: 6 additions & 4 deletions .github/workflows/e2e-parallel-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
include:
- example_path: patterns/agones-game-controller
- example_path: patterns/fargate-serverless
- example_path: patterns/argocd
- example_path: patterns/gitops/getting-started-argocd
- example_path: patterns/ipv6-eks-cluster
- example_path: patterns/karpenter
- example_path: patterns/multi-tenancy-with-teams
Expand Down Expand Up @@ -115,6 +115,7 @@ jobs:
terraform apply -target=module.eks_blueprints -no-color -input=false -auto-approve
terraform apply -target=module.eks -no-color -input=false -auto-approve
terraform apply -target=module.eks_blueprints_kubernetes_addons -no-color -input=false -auto-approve
terraform apply -target=module.eks_blueprints_addons -no-color -input=false -auto-approve
terraform apply -no-color -input=false -auto-approve
- name: Terraform Destroy
Expand All @@ -125,9 +126,10 @@ jobs:
export AWS_CSM_ENABLED=true
export AWS_CSM_PORT=31000
export AWS_CSM_HOST=127.0.0.1
terraform destroy -target=module.eks_blueprints_kubernetes_addons -no-color -input=false -auto-approve
terraform destroy -target=module.eks_blueprints -no-color -input=false -auto-approve
terraform destroy -target=module.eks -no-color -input=false -auto-approve
terraform destroy -target=module.eks_blueprints_kubernetes_addons -no-color -input=false -auto-approve
terraform destroy -target=module.eks_blueprints_addons -no-color -input=false -auto-approve
terraform destroy -target=module.eks_blueprints -no-color -input=false -auto-approve
terraform destroy -target=module.eks -no-color -input=false -auto-approve
terraform destroy -no-color -input=false -auto-approve
- name: Fail if TF apply failed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
egress-policy: audit

- uses: amannn/action-semantic-pull-request@v5.3.0
- uses: amannn/action-semantic-pull-request@v5.4.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
7 changes: 0 additions & 7 deletions docs/patterns/argocd.md

This file was deleted.

7 changes: 7 additions & 0 deletions docs/patterns/gitops-getting-started-argocd.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: GitOps Getting Started (ArgoCD)
---

{%
include-markdown "../../patterns/gitops/getting-started-argocd/README.md"
%}
7 changes: 7 additions & 0 deletions docs/patterns/gitops-multi-cluster-hub-spoke-argocd.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: GitOps Multi-Cluster Hub-Spoke Topology (ArgoCD)
---

{%
include-markdown "../../patterns/gitops/multi-cluster-hub-spoke-argocd/README.md"
%}
117 changes: 0 additions & 117 deletions patterns/argocd/README.md

This file was deleted.

188 changes: 0 additions & 188 deletions patterns/argocd/main.tf

This file was deleted.

4 changes: 0 additions & 4 deletions patterns/argocd/outputs.tf

This file was deleted.

Empty file removed patterns/argocd/variables.tf
Empty file.
Loading

0 comments on commit ea571fc

Please sign in to comment.