Codecommit (#12)

* replace git with codecommit Co-authored-by: Sébastien Allamand <[email protected]> --------- Signed-off-by: Sébastien Allamand <[email protected]> Co-authored-by: EC2 Default User <[email protected]> Co-authored-by: Sébastien Allamand <[email protected]>
aws-samples · Jul 15, 2024 · e70706a · e70706a
1 parent 883fc8d
commit e70706a
Show file tree

Hide file tree

Showing 117 changed files with 810 additions and 397 deletions.
diff --git a/assets/scripts/destroy-git.sh b/assets/scripts/destroy-git.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -uo pipefail
+
+[[ -n "${DEBUG:-}" ]] && set -x
+
+cd ~/environment/codecommit/
+
+
+terraform destroy  -auto-approve
diff --git a/assets/scripts/destroy.sh b/assets/scripts/destroy.sh
@@ -2,15 +2,15 @@
 
 set -uo pipefail
 
-~/environment/wgit/assets/scripts/destroy-applications.sh
+$SOURCE_DIR/assets/scripts/destroy-applications.sh
 
-~/environment/wgit/assets/scripts/destroy-spoke.sh staging
+$SOURCE_DIR/assets/scripts/destroy-spoke.sh staging
 
-~/environment/wgit/assets/scripts/destroy-hub.sh
+$SOURCE_DIR/assets/scripts/destroy-hub.sh
 
+$SOURCE_DIR/assets/scripts/destroy-git.sh
 
-~/environment/wgit/assets/scripts/destroy-vpc.sh 
-
+$SOURCE_DIR/assets/scripts/destroy-vpc.sh 
 
 
 

diff --git a/...loper/webstore/assets/base/configMap.yaml → ...kload/webstore/assets/base/configMap.yaml b/...loper/webstore/assets/base/configMap.yaml → ...kload/webstore/assets/base/configMap.yaml
diff --git a/...oper/webstore/assets/base/deployment.yaml → ...load/webstore/assets/base/deployment.yaml b/...oper/webstore/assets/base/deployment.yaml → ...load/webstore/assets/base/deployment.yaml
diff --git a/...r/webstore/assets/base/kustomization.yaml → ...d/webstore/assets/base/kustomization.yaml b/...r/webstore/assets/base/kustomization.yaml → ...d/webstore/assets/base/kustomization.yaml
diff --git a/...veloper/webstore/assets/base/service.yaml → ...orkload/webstore/assets/base/service.yaml b/...veloper/webstore/assets/base/service.yaml → ...orkload/webstore/assets/base/service.yaml
diff --git a/.../webstore/assets/base/serviceAccount.yaml → .../webstore/assets/base/serviceAccount.yaml b/.../webstore/assets/base/serviceAccount.yaml → .../webstore/assets/base/serviceAccount.yaml
diff --git a/...er/webstore/assets/hub/kustomization.yaml → ...ad/webstore/assets/hub/kustomization.yaml b/...er/webstore/assets/hub/kustomization.yaml → ...ad/webstore/assets/hub/kustomization.yaml
diff --git a/...r/webstore/assets/prod/kustomization.yaml → ...d/webstore/assets/prod/kustomization.yaml b/...r/webstore/assets/prod/kustomization.yaml → ...d/webstore/assets/prod/kustomization.yaml
diff --git a/...ebstore/assets/staging/kustomization.yaml → ...ebstore/assets/staging/kustomization.yaml b/...ebstore/assets/staging/kustomization.yaml → ...ebstore/assets/staging/kustomization.yaml
diff --git a/...loper/webstore/carts/base/deployment.yaml → ...kload/webstore/carts/base/deployment.yaml b/...loper/webstore/carts/base/deployment.yaml → ...kload/webstore/carts/base/deployment.yaml
diff --git a/...store/carts/base/infra-mng/configMap.yaml → ...store/carts/base/infra-mng/configMap.yaml b/...store/carts/base/infra-mng/configMap.yaml → ...store/carts/base/infra-mng/configMap.yaml
diff --git a/...store/carts/base/infra-mng/ddb-table.yaml → ...store/carts/base/infra-mng/ddb-table.yaml b/...store/carts/base/infra-mng/ddb-table.yaml → ...store/carts/base/infra-mng/ddb-table.yaml
diff --git a/...e/carts/base/infra-mng/kustomization.yaml → ...e/carts/base/infra-mng/kustomization.yaml b/...e/carts/base/infra-mng/kustomization.yaml → ...e/carts/base/infra-mng/kustomization.yaml
diff --git a/.../webstore/carts/base/infra/configMap.yaml → .../webstore/carts/base/infra/configMap.yaml b/.../webstore/carts/base/infra/configMap.yaml → .../webstore/carts/base/infra/configMap.yaml
diff --git a/...store/carts/base/infra/deployment-db.yaml → ...store/carts/base/infra/deployment-db.yaml b/...store/carts/base/infra/deployment-db.yaml → ...store/carts/base/infra/deployment-db.yaml
diff --git a/...store/carts/base/infra/kustomization.yaml → ...store/carts/base/infra/kustomization.yaml b/...store/carts/base/infra/kustomization.yaml → ...store/carts/base/infra/kustomization.yaml
diff --git a/...webstore/carts/base/infra/service-db.yaml → ...webstore/carts/base/infra/service-db.yaml b/...webstore/carts/base/infra/service-db.yaml → ...webstore/carts/base/infra/service-db.yaml
diff --git a/...ebstore/carts/base/kustomization-mng.yaml → ...ebstore/carts/base/kustomization-mng.yaml b/...ebstore/carts/base/kustomization-mng.yaml → ...ebstore/carts/base/kustomization-mng.yaml
diff --git a/...er/webstore/carts/base/kustomization.yaml → ...ad/webstore/carts/base/kustomization.yaml b/...er/webstore/carts/base/kustomization.yaml → ...ad/webstore/carts/base/kustomization.yaml
diff --git a/...eveloper/webstore/carts/base/service.yaml → ...workload/webstore/carts/base/service.yaml b/...eveloper/webstore/carts/base/service.yaml → ...workload/webstore/carts/base/service.yaml
diff --git a/...r/webstore/carts/base/serviceAccount.yaml → ...d/webstore/carts/base/serviceAccount.yaml b/...r/webstore/carts/base/serviceAccount.yaml → ...d/webstore/carts/base/serviceAccount.yaml
diff --git a/...per/webstore/carts/hub/kustomization.yaml → ...oad/webstore/carts/hub/kustomization.yaml b/...per/webstore/carts/hub/kustomization.yaml → ...oad/webstore/carts/hub/kustomization.yaml
diff --git a/...ebstore/carts/prod/kustomization-mng.yaml → ...ebstore/carts/prod/kustomization-mng.yaml b/...ebstore/carts/prod/kustomization-mng.yaml → ...ebstore/carts/prod/kustomization-mng.yaml
diff --git a/...er/webstore/carts/prod/kustomization.yaml → ...ad/webstore/carts/prod/kustomization.yaml b/...er/webstore/carts/prod/kustomization.yaml → ...ad/webstore/carts/prod/kustomization.yaml
diff --git a/...tore/carts/staging/kustomization-mng.yaml → ...tore/carts/staging/kustomization-mng.yaml b/...tore/carts/staging/kustomization-mng.yaml → ...tore/carts/staging/kustomization-mng.yaml
diff --git a/...webstore/carts/staging/kustomization.yaml → ...webstore/carts/staging/kustomization.yaml b/...webstore/carts/staging/kustomization.yaml → ...webstore/carts/staging/kustomization.yaml
diff --git a/...webstore/carts/staging/try-namespace.yaml → ...webstore/carts/staging/try-namespace.yaml b/...webstore/carts/staging/try-namespace.yaml → ...webstore/carts/staging/try-namespace.yaml
diff --git a/...oper/webstore/catalog/base/configMap.yaml → ...load/webstore/catalog/base/configMap.yaml b/...oper/webstore/catalog/base/configMap.yaml → ...load/webstore/catalog/base/configMap.yaml
diff --git a/...per/webstore/catalog/base/deployment.yaml → ...oad/webstore/catalog/base/deployment.yaml b/...per/webstore/catalog/base/deployment.yaml → ...oad/webstore/catalog/base/deployment.yaml
diff --git a/.../webstore/catalog/base/kustomization.yaml → .../webstore/catalog/base/kustomization.yaml b/.../webstore/catalog/base/kustomization.yaml → .../webstore/catalog/base/kustomization.yaml
diff --git a/...eloper/webstore/catalog/base/secrets.yaml → ...rkload/webstore/catalog/base/secrets.yaml b/...eloper/webstore/catalog/base/secrets.yaml → ...rkload/webstore/catalog/base/secrets.yaml
diff --git a/.../webstore/catalog/base/service-mysql.yaml → .../webstore/catalog/base/service-mysql.yaml b/.../webstore/catalog/base/service-mysql.yaml → .../webstore/catalog/base/service-mysql.yaml
diff --git a/...eloper/webstore/catalog/base/service.yaml → ...rkload/webstore/catalog/base/service.yaml b/...eloper/webstore/catalog/base/service.yaml → ...rkload/webstore/catalog/base/service.yaml
diff --git a/...webstore/catalog/base/serviceAccount.yaml → ...webstore/catalog/base/serviceAccount.yaml b/...webstore/catalog/base/serviceAccount.yaml → ...webstore/catalog/base/serviceAccount.yaml
diff --git a/...store/catalog/base/statefulset-mysql.yaml → ...store/catalog/base/statefulset-mysql.yaml b/...store/catalog/base/statefulset-mysql.yaml → ...store/catalog/base/statefulset-mysql.yaml
diff --git a/...r/webstore/catalog/hub/kustomization.yaml → ...d/webstore/catalog/hub/kustomization.yaml b/...r/webstore/catalog/hub/kustomization.yaml → ...d/webstore/catalog/hub/kustomization.yaml
diff --git a/.../webstore/catalog/prod/kustomization.yaml → .../webstore/catalog/prod/kustomization.yaml b/.../webstore/catalog/prod/kustomization.yaml → .../webstore/catalog/prod/kustomization.yaml
diff --git a/...bstore/catalog/staging/kustomization.yaml → ...bstore/catalog/staging/kustomization.yaml b/...bstore/catalog/staging/kustomization.yaml → ...bstore/catalog/staging/kustomization.yaml
diff --git a/...per/webstore/checkout/base/configMap.yaml → ...oad/webstore/checkout/base/configMap.yaml b/...per/webstore/checkout/base/configMap.yaml → ...oad/webstore/checkout/base/configMap.yaml
diff --git a/...store/checkout/base/deployment-redis.yaml → ...store/checkout/base/deployment-redis.yaml b/...store/checkout/base/deployment-redis.yaml → ...store/checkout/base/deployment-redis.yaml
diff --git a/...er/webstore/checkout/base/deployment.yaml → ...ad/webstore/checkout/base/deployment.yaml b/...er/webstore/checkout/base/deployment.yaml → ...ad/webstore/checkout/base/deployment.yaml
diff --git a/...webstore/checkout/base/kustomization.yaml → ...webstore/checkout/base/kustomization.yaml b/...webstore/checkout/base/kustomization.yaml → ...webstore/checkout/base/kustomization.yaml
diff --git a/...webstore/checkout/base/service-redis.yaml → ...webstore/checkout/base/service-redis.yaml b/...webstore/checkout/base/service-redis.yaml → ...webstore/checkout/base/service-redis.yaml
diff --git a/...loper/webstore/checkout/base/service.yaml → ...kload/webstore/checkout/base/service.yaml b/...loper/webstore/checkout/base/service.yaml → ...kload/webstore/checkout/base/service.yaml
diff --git a/...ebstore/checkout/base/serviceAccount.yaml → ...ebstore/checkout/base/serviceAccount.yaml b/...ebstore/checkout/base/serviceAccount.yaml → ...ebstore/checkout/base/serviceAccount.yaml
diff --git a/.../webstore/checkout/hub/kustomization.yaml → .../webstore/checkout/hub/kustomization.yaml b/.../webstore/checkout/hub/kustomization.yaml → .../webstore/checkout/hub/kustomization.yaml
diff --git a/...webstore/checkout/prod/kustomization.yaml → ...webstore/checkout/prod/kustomization.yaml b/...webstore/checkout/prod/kustomization.yaml → ...webstore/checkout/prod/kustomization.yaml
diff --git a/...store/checkout/staging/kustomization.yaml → ...store/checkout/staging/kustomization.yaml b/...store/checkout/staging/kustomization.yaml → ...store/checkout/staging/kustomization.yaml
diff --git a/...loper/webstore/orders/base/configMap.yaml → ...kload/webstore/orders/base/configMap.yaml b/...loper/webstore/orders/base/configMap.yaml → ...kload/webstore/orders/base/configMap.yaml
diff --git a/...ebstore/orders/base/deployment-mysql.yaml → ...ebstore/orders/base/deployment-mysql.yaml b/...ebstore/orders/base/deployment-mysql.yaml → ...ebstore/orders/base/deployment-mysql.yaml
diff --git a/...oper/webstore/orders/base/deployment.yaml → ...load/webstore/orders/base/deployment.yaml b/...oper/webstore/orders/base/deployment.yaml → ...load/webstore/orders/base/deployment.yaml
diff --git a/...r/webstore/orders/base/kustomization.yaml → ...d/webstore/orders/base/kustomization.yaml b/...r/webstore/orders/base/kustomization.yaml → ...d/webstore/orders/base/kustomization.yaml
diff --git a/...veloper/webstore/orders/base/secrets.yaml → ...orkload/webstore/orders/base/secrets.yaml b/...veloper/webstore/orders/base/secrets.yaml → ...orkload/webstore/orders/base/secrets.yaml
diff --git a/...r/webstore/orders/base/service-mysql.yaml → ...d/webstore/orders/base/service-mysql.yaml b/...r/webstore/orders/base/service-mysql.yaml → ...d/webstore/orders/base/service-mysql.yaml
diff --git a/...veloper/webstore/orders/base/service.yaml → ...orkload/webstore/orders/base/service.yaml b/...veloper/webstore/orders/base/service.yaml → ...orkload/webstore/orders/base/service.yaml
diff --git a/.../webstore/orders/base/serviceAccount.yaml → .../webstore/orders/base/serviceAccount.yaml b/.../webstore/orders/base/serviceAccount.yaml → .../webstore/orders/base/serviceAccount.yaml
diff --git a/...er/webstore/orders/hub/kustomization.yaml → ...ad/webstore/orders/hub/kustomization.yaml b/...er/webstore/orders/hub/kustomization.yaml → ...ad/webstore/orders/hub/kustomization.yaml
diff --git a/...r/webstore/orders/prod/kustomization.yaml → ...d/webstore/orders/prod/kustomization.yaml b/...r/webstore/orders/prod/kustomization.yaml → ...d/webstore/orders/prod/kustomization.yaml
diff --git a/...ebstore/orders/staging/kustomization.yaml → ...ebstore/orders/staging/kustomization.yaml b/...ebstore/orders/staging/kustomization.yaml → ...ebstore/orders/staging/kustomization.yaml
diff --git a/...developer/webstore/ui/base/configMap.yaml → .../workload/webstore/ui/base/configMap.yaml b/...developer/webstore/ui/base/configMap.yaml → .../workload/webstore/ui/base/configMap.yaml
diff --git a/...eveloper/webstore/ui/base/deployment.yaml → ...workload/webstore/ui/base/deployment.yaml b/...eveloper/webstore/ui/base/deployment.yaml → ...workload/webstore/ui/base/deployment.yaml
diff --git a/assets/developer/webstore/ui/base/hpa.yaml → assets/workload/webstore/ui/base/hpa.yaml b/assets/developer/webstore/ui/base/hpa.yaml → assets/workload/webstore/ui/base/hpa.yaml
diff --git a/...loper/webstore/ui/base/kustomization.yaml → ...kload/webstore/ui/base/kustomization.yaml b/...loper/webstore/ui/base/kustomization.yaml → ...kload/webstore/ui/base/kustomization.yaml
diff --git a/assets/developer/webstore/ui/base/nlb.yaml → assets/workload/webstore/ui/base/nlb.yaml b/assets/developer/webstore/ui/base/nlb.yaml → assets/workload/webstore/ui/base/nlb.yaml
diff --git a/...s/developer/webstore/ui/base/service.yaml → ...ts/workload/webstore/ui/base/service.yaml b/...s/developer/webstore/ui/base/service.yaml → ...ts/workload/webstore/ui/base/service.yaml
diff --git a/...oper/webstore/ui/base/serviceAccount.yaml → ...load/webstore/ui/base/serviceAccount.yaml b/...oper/webstore/ui/base/serviceAccount.yaml → ...load/webstore/ui/base/serviceAccount.yaml
diff --git a/...eloper/webstore/ui/hub/kustomization.yaml → ...rkload/webstore/ui/hub/kustomization.yaml b/...eloper/webstore/ui/hub/kustomization.yaml → ...rkload/webstore/ui/hub/kustomization.yaml
diff --git a/assets/developer/webstore/ui/prod/hpa.yaml → assets/workload/webstore/ui/prod/hpa.yaml b/assets/developer/webstore/ui/prod/hpa.yaml → assets/workload/webstore/ui/prod/hpa.yaml
diff --git a/...loper/webstore/ui/prod/kustomization.yaml → ...kload/webstore/ui/prod/kustomization.yaml b/...loper/webstore/ui/prod/kustomization.yaml → ...kload/webstore/ui/prod/kustomization.yaml
diff --git a/...er/webstore/ui/staging/kustomization.yaml → ...ad/webstore/ui/staging/kustomization.yaml b/...er/webstore/ui/staging/kustomization.yaml → ...ad/webstore/ui/staging/kustomization.yaml
diff --git a/content/010_prerequisites/index.en.md → content/010-prerequisites.md b/content/010_prerequisites/index.en.md → content/010-prerequisites.md
@@ -7,8 +7,6 @@ weight: 10
 
 1. Basic knowledge of [Terraform](https://developer.hashicorp.com/terraform/tutorials/aws-get-started), Terraform [workspaces](https://developer.hashicorp.com/terraform/language/state/workspaces) 
 2. Basic knowledge of [Argo CD](https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/) Application, ApplicationSet, Projects, App of App pattern and Generator concepts - Cluster, Git, and Matrix, 
-3. GitHub account
-4. Familiarity with GitHub cli commands clone, commit, pull, push
-5. GitHub [access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token)
-6. Basic knowledge of [GitOps Bridge](https://github.com/gitops-bridge-dev/kubecon-2023-na-argocon/blob/main/terraform/eks-argocd/README.md)
-7. Basic knowledge of [Helm](https://helm.sh/docs/)
+3. Familiarity with Git cli commands clone, commit, pull, push
+4. Basic knowledge of [GitOps Bridge](https://github.com/gitops-bridge-dev/kubecon-2023-na-argocon/blob/main/terraform/eks-argocd/README.md)
+5. Basic knowledge of [Helm](https://helm.sh/docs/)
diff --git a/content/010_prerequisites/010-fork-github.md b/content/010_prerequisites/010-fork-github.md
diff --git a/content/030_base/030_create-vpc/010-create-vpc.md b/content/030_base/030_create-vpc/010-create-vpc.md
@@ -160,6 +160,4 @@ terraform apply -auto-approve
 
 Once completed, you can see the VPC in the [console](https://console.aws.amazon.com/vpc/home?#vpcs:tag:Name=eks-blueprint)
 
-Next, you will create an EKS cluster.
-
 ::alert[This workshop uses local Terraform state. To learn about a proper setup, take a look at https://www.terraform.io/language/state]{header="Terraform State Management"}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,6 +160,4 @@ terraform apply -auto-approve

		Once completed, you can see the VPC in the [console](https://console.aws.amazon.com/vpc/home?#vpcs:tag:Name=eks-blueprint)

		Next, you will create an EKS cluster.

		::alert[This workshop uses local Terraform state. To learn about a proper setup, take a look at https://www.terraform.io/language/state]{header="Terraform State Management"}