From 0917a6ef5bb459fdab3342f969dc4f59764ce822 Mon Sep 17 00:00:00 2001 From: Ashvin Sharma Date: Tue, 30 Apr 2024 15:10:33 +0530 Subject: [PATCH 1/5] INFRA-3199 | Ashvin | Add details for training account I also created a blacklist for all the verticals where deployment portal is not available. This blacklist will be considered when attempting to send deployment status of terraform resources. If the vertical is in the blacklist, then the status will NOT be sent. --- environment_config.go | 18 +++++++++++++++--- resource.go | 12 ++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/environment_config.go b/environment_config.go index b8887ca..b3f028c 100644 --- a/environment_config.go +++ b/environment_config.go @@ -97,6 +97,9 @@ var defaultWorkspaceMap = map[string]map[string]string{ "navi-ppl-uat": "aps1-np-navi-ppl", "navi-ppl-prod": "aps1-prod-navi-ppl", }, + "training-account": { + // fixme: fill this after eks cluster is created + }, } var storageBackendBucketMap = map[string]map[string]string{ @@ -108,6 +111,9 @@ var storageBackendBucketMap = map[string]map[string]string{ "automation": "navi-bank-terraform-nonprod-state", "spike": "navi-bank-terraform-nonprod-state", }, + "training": { + "prod": "navi-bank-terraform-test-bank-state", + }, } var globalTagsMap = map[string]map[string]string{ @@ -192,12 +198,16 @@ var globalTagsMap = map[string]map[string]string{ "navi-ppl-prod": { "environment": "prod", }, + "training": { + "environment": "prod", + }, } var storageBackendAWSProfileMap = map[string]string{ - "navi-bank-terraform-command-state": "cmd", - "navi-bank-terraform-nonprod-state": "nonprod", - "navi-gi-terraform-nonprod-state": "gi-nonprod", + "navi-bank-terraform-command-state": "cmd", + "navi-bank-training-terraform-command-state": "training-account", + "navi-bank-terraform-nonprod-state": "nonprod", + "navi-gi-terraform-nonprod-state": "gi-nonprod", } var ownerMap = map[string]string{ @@ -210,6 +220,7 @@ var ownerMap = map[string]string{ "navi-saas": "saas", "navi-data-platform": "DataPlatform", "navi-ppl": "navi-ppl", + "training": "lending", } var productMap = map[string]string{ @@ -222,4 +233,5 @@ var productMap = map[string]string{ "navi-saas": "saas", "navi-data-platform": "DataPlatform", "navi-ppl": "navi-ppl", + "training": "lending", } diff --git a/resource.go b/resource.go index 1bf24a4..825469d 100644 --- a/resource.go +++ b/resource.go @@ -17,6 +17,8 @@ import ( "github.com/navi-infra/infra-provisioner/v2/bindata" ) +type void struct{} + const TemplatesDir = "templates" const InitScript = "./deploy.sh" const deploymentPortalUrl = "deployment-portal-backend.cmd.navi-tech.in" @@ -114,7 +116,17 @@ func handlePanic() { } } +// sendResourceDeploymentStatusBlackList is a list of verticals for which deployment status should not be sent +var sendResourceDeploymentStatusBlackList = map[string]void{ + "training": {}, +} + func sendResourceDeploymentStatus(manifest *Manifest) { + if _, ok := sendResourceDeploymentStatusBlackList[manifest.InfraVertical]; ok { + log.Printf("Skipping sending deployment status for vertical %s", manifest.InfraVertical) + return + } + defer handlePanic() client := &http.Client{} url := getDeploymentPortalUrl(manifest.InfraVertical, manifest.Environment, manifest.Name) From c521ca62ae4b86720716f902569784c79b8f82a5 Mon Sep 17 00:00:00 2001 From: Ashvin Sharma Date: Mon, 6 May 2024 18:12:44 +0530 Subject: [PATCH 2/5] INFRA-3199 | Ashvin | Add KTK details --- environment_config.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/environment_config.go b/environment_config.go index b3f028c..e27b913 100644 --- a/environment_config.go +++ b/environment_config.go @@ -97,8 +97,8 @@ var defaultWorkspaceMap = map[string]map[string]string{ "navi-ppl-uat": "aps1-np-navi-ppl", "navi-ppl-prod": "aps1-prod-navi-ppl", }, - "training-account": { - // fixme: fill this after eks cluster is created + "ktk": { + "prod": "aps1-prod-navi-ppl", }, } @@ -111,8 +111,8 @@ var storageBackendBucketMap = map[string]map[string]string{ "automation": "navi-bank-terraform-nonprod-state", "spike": "navi-bank-terraform-nonprod-state", }, - "training": { - "prod": "navi-bank-terraform-test-bank-state", + "ktk": { + "prod": "navi-ktk-terraform-state", }, } @@ -198,7 +198,7 @@ var globalTagsMap = map[string]map[string]string{ "navi-ppl-prod": { "environment": "prod", }, - "training": { + "ktk": { "environment": "prod", }, } @@ -220,7 +220,7 @@ var ownerMap = map[string]string{ "navi-saas": "saas", "navi-data-platform": "DataPlatform", "navi-ppl": "navi-ppl", - "training": "lending", + "ktk": "ktk", } var productMap = map[string]string{ @@ -233,5 +233,5 @@ var productMap = map[string]string{ "navi-saas": "saas", "navi-data-platform": "DataPlatform", "navi-ppl": "navi-ppl", - "training": "lending", + "ktk": "navi-ktk", } From 595948b0ba4f9d82ff705b93bdba5522f93e58de Mon Sep 17 00:00:00 2001 From: Ashvin Sharma Date: Mon, 6 May 2024 19:04:56 +0530 Subject: [PATCH 3/5] INFRA-3199 | Ashvin | Fix KTK workspace value --- environment_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_config.go b/environment_config.go index e27b913..0a03021 100644 --- a/environment_config.go +++ b/environment_config.go @@ -98,7 +98,7 @@ var defaultWorkspaceMap = map[string]map[string]string{ "navi-ppl-prod": "aps1-prod-navi-ppl", }, "ktk": { - "prod": "aps1-prod-navi-ppl", + "prod": "aps1-prod-navi-ktk", }, } From 55984d8a240fdd2edb6bd5cc09d4ab8290cfce79 Mon Sep 17 00:00:00 2001 From: Ashvin Sharma Date: Mon, 6 May 2024 19:07:53 +0530 Subject: [PATCH 4/5] INFRA-3199 | Ashvin | Fix KTK backend storage value --- environment_config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/environment_config.go b/environment_config.go index 0a03021..428e6ae 100644 --- a/environment_config.go +++ b/environment_config.go @@ -204,10 +204,10 @@ var globalTagsMap = map[string]map[string]string{ } var storageBackendAWSProfileMap = map[string]string{ - "navi-bank-terraform-command-state": "cmd", - "navi-bank-training-terraform-command-state": "training-account", - "navi-bank-terraform-nonprod-state": "nonprod", - "navi-gi-terraform-nonprod-state": "gi-nonprod", + "navi-bank-terraform-command-state": "cmd", + "navi-ktk-terraform-state": "prod", + "navi-bank-terraform-nonprod-state": "nonprod", + "navi-gi-terraform-nonprod-state": "gi-nonprod", } var ownerMap = map[string]string{ From a8900884ad3a02c2cf17e06abc80f3d48abff28b Mon Sep 17 00:00:00 2001 From: Ashvin Sharma Date: Mon, 6 May 2024 19:10:37 +0530 Subject: [PATCH 5/5] INFRA-3199 | Ashvin | Add KTK in deploy status blacklist --- resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource.go b/resource.go index 825469d..af9aba8 100644 --- a/resource.go +++ b/resource.go @@ -118,7 +118,7 @@ func handlePanic() { // sendResourceDeploymentStatusBlackList is a list of verticals for which deployment status should not be sent var sendResourceDeploymentStatusBlackList = map[string]void{ - "training": {}, + "ktk": {}, } func sendResourceDeploymentStatus(manifest *Manifest) {