Merge branch 'main' into feat/update-karpenter

aws-ia · Dec 7, 2023 · ff333fb · ff333fb
2 parents 5b36b1f + a4c28f7
commit ff333fb
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 21 deletions.
diff --git 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@01bc87099ba56df1e897b6874784491ea6309bc4 # v3.1.4
diff --git 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 }}
 

diff --git 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@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
         with:
           sarif_file: results.sarif
diff --git 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
@@ -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 = "[email protected]:gitops-bridge-dev/gitops-bridge-argocd-control-plane-template"
-gitops_bridge_repo_revision = "HEAD"
+#gitops_addons_org      = "[email protected]: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      = "[email protected]: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      = "[email protected]: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"
diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,5 +10,6 @@ terraform { @@
           source  = "hashicorp/random"
           version = ">= 3.0"
         }
       }
     }