updating sample to gitops-bridge

patterns/blue-green-upgrade/bootstrap/addons.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:

patterns/blue-green-upgrade/bootstrap/workloads.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
@@ -25,7 +24,7 @@ spec:
                 - path: '{{.metadata.annotations.gitops_workloads_path}}/*'
   template:
     metadata:
-      name: 'bootstrap-workload-{{.name}}'
+      name: 'bootstrap-workloads-{{.name}}'
     spec:
       project: default
       sources:
@@ -34,7 +33,7 @@ spec:
           ref: values
           path: '{{.metadata.annotations.gitops_workloads_path}}'
           helm:
-            releaseName: 'bootstrap-workload-{{.name}}'
+            releaseName: 'bootstrap-workloads-{{.name}}'
             ignoreMissingValueFiles: true
             values: |
               "account": "{{.metadata.annotations.aws_account_id}}"

patterns/blue-green-upgrade/eks-blue/variables.tf

@@ -5,7 +5,7 @@ variable "aws_region" {
 }
 
 variable "environment_name" {
-  description = "The name of Environment Infrastructure stack name, feel free to rename it. Used for cluster and VPC names."
+  description = "The name of Environment Infrastructure stack, feel free to rename it. Used for cluster and VPC names."
   type        = string
   default     = "eks-blueprint"
 }
@@ -40,51 +40,52 @@ variable "argocd_secret_manager_name_suffix" {
   default     = "argocd-admin-secret"
 }
 
-variable "gitops_workloads_org" {
-  type        = string
-  description = "Git repository org/user contains for workloads"
-  default     = "https://github.com/aws-samples"
-}
-
-variable "gitops_workloads_repo" {
-  type        = string
-  description = "Git repository contains for workloads"
-  default     = "eks-blueprints-workloads"
-}
-
-variable "gitops_workloads_revision" {
-  type        = string
-  description = "Git repo revision in workload_repo_url for the ArgoCD workload deployment"
-  default     = "main"
-}
-
-variable "gitops_workloads_path" {
-  type        = string
-  description = "Git repo path in workload_repo_url for the ArgoCD workload deployment"
-  default     = "envs/dev"
-}
 variable "gitops_addons_org" {
   type        = string
   description = "Git repository org/user contains for addons"
-  default     = "https://github.com/gitops-bridge-dev"
+  default     = "git@github.com:aws-samples"
 }
 variable "gitops_addons_repo" {
   type        = string
   description = "Git repository contains for addons"
-  default     = "gitops-bridge-argocd-control-plane-template"
+  default     = "eks-blueprints-add-ons"
 }
 variable "gitops_addons_basepath" {
   type        = string
   description = "Git repository base path for addons"
-  default     = ""
+  default     = "argocd/"
 }
 variable "gitops_addons_path" {
   type        = string
   description = "Git repository path for addons"
-  default     = "bootstrap/control-plane/addons"
+  default     = "argocd/bootstrap/control-plane/addons"
 }
 variable "gitops_addons_revision" {
   type        = string
   description = "Git repository revision/branch/ref for addons"
   default     = "HEAD"
 }
+
+variable "gitops_workloads_org" {
+  type        = string
+  description = "Git repository org/user contains for workloads"
+  default     = "git@github.com:aws-samples"
+}
+
+variable "gitops_workloads_repo" {
+  type        = string
+  description = "Git repository contains for workloads"
+  default     = "eks-blueprints-workloads"
+}
+
+variable "gitops_workloads_path" {
+  type        = string
+  description = "Git repo path in workload_repo_url for the ArgoCD workload deployment"
+  default     = "envs/dev"
+}
+
+variable "gitops_workloads_revision" {
+  type        = string
+  description = "Git repo revision in workload_repo_url for the ArgoCD workload deployment"
+  default     = "main"
+}

patterns/blue-green-upgrade/eks-green/variables.tf

@@ -10,6 +10,12 @@ variable "environment_name" {
   default     = "eks-blueprint"
 }
 
+variable "ingress_type" {
+  type        = string
+  description = "Type of ingress to uses (alb | nginx | ...). this parameter will be sent to arocd via gitops bridge"
+  default     = "alb"
+}
+
 variable "hosted_zone_name" {
   type        = string
   description = "Route53 domain for the cluster."
@@ -34,29 +40,6 @@ variable "argocd_secret_manager_name_suffix" {
   default     = "argocd-admin-secret"
 }
 
-variable "gitops_workloads_org" {
-  type        = string
-  description = "Git repository org/user contains for workloads"
-  default     = "https://github.com/aws-samples"
-}
-
-variable "gitops_workloads_repo" {
-  type        = string
-  description = "Git repository contains for workloads"
-  default     = "eks-blueprints-workloads"
-}
-
-variable "gitops_workloads_revision" {
-  type        = string
-  description = "Git repo revision in workload_repo_url for the ArgoCD workload deployment"
-  default     = "main"
-}
-
-variable "gitops_workloads_path" {
-  type        = string
-  description = "Git repo path in workload_repo_url for the ArgoCD workload deployment"
-  default     = "envs/dev"
-}
 variable "gitops_addons_org" {
   type        = string
   description = "Git repository org/user contains for addons"
@@ -82,3 +65,27 @@ variable "gitops_addons_revision" {
   description = "Git repository revision/branch/ref for addons"
   default     = "HEAD"
 }
+
+variable "gitops_workloads_org" {
+  type        = string
+  description = "Git repository org/user contains for workloads"
+  default     = "https://github.com/aws-samples"
+}
+
+variable "gitops_workloads_repo" {
+  type        = string
+  description = "Git repository contains for workloads"
+  default     = "eks-blueprints-workloads"
+}
+
+variable "gitops_workloads_path" {
+  type        = string
+  description = "Git repo path in workload_repo_url for the ArgoCD workload deployment"
+  default     = "envs/dev"
+}
+
+variable "gitops_workloads_revision" {
+  type        = string
+  description = "Git repo revision in workload_repo_url for the ArgoCD workload deployment"
+  default     = "main"
+}