Merged in dev/igor/MPC-4171-adding-bruce-sandbox (pull request elasti…

…c#384) MPC-4171: adding bruce & kostiantyn sandbox * MPC-4171: adding bruce & kostiantyn sandbox * Merge remote-tracking branch 'origin/master' into dev/igor/MPC-4171-adding-bruce-sandbox * Drop eks service url tags as we exceed 50 tag limits on ec2 * update nikita creds Approved-by: Can Yildiz
mindw · Jan 12, 2022 · 93beff8 · 93beff8
1 parent f35a102
commit 93beff8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/aws/ams-cluster-v1-tf/main.tf b/aws/ams-cluster-v1-tf/main.tf
@@ -585,7 +585,7 @@ resource "aws_instance" "engageli" {
   root_block_device {
     volume_size = var.ebs_root_volume_size.engageli
   }
-  tags = merge({
+  tags = {
     Name           = "tf-${var.stack_name}-engageli"
     Role           = "engageli-api"
     Terraform      = true
@@ -622,10 +622,7 @@ resource "aws_instance" "engageli" {
     GalleriesPerInstance   = local.galleries_per_instance
     CloudWatchAgentEnabled = var.cloudwatch_agent_enabled
     TelegrafEnabled        = var.telegraf_enabled
-    },
-    { for pair in setproduct(keys(var.engageli_kubernetes_apps_defaults), var.sandboxes) :
-      "${pair[0]}_${pair[1]}_service_url" => "${pair[0]}.${pair[1]}.${local.stack_fqdn}"
-  })
+    }
 }
 
 # create EIPs for the engageli instance for ease of access

diff --git a/aws/ams-cluster-v1-tf/tfvars/dev1.tfvars b/aws/ams-cluster-v1-tf/tfvars/dev1.tfvars
@@ -4,10 +4,11 @@ stack_name  = "dev1"
 stack_env   = "dev"
 key_name    = "cany"
 domain      = "us.engageli-dev.com."
-sandboxes   = ["class", "liza", "alex", "dima", "paul", "alexander", "nikita", "ori", "rotem", "andrei", "nicolas", "benoit", "stas", "matan", "oleksii", "ana"]
-ems_enabled_sandboxes = ["class", "liza", "alex", "dima", "paul", "alexander", "nikita", "ori", "rotem", "andrei", "nicolas", "benoit", "stas", "matan", "oleksii", "ana"]
+cert_domain = "*.us.engageli-dev.com"
+sandboxes   = ["class", "liza", "alex", "dima", "paul", "alexander", "nikita", "ori", "rotem", "andrei", "nicolas", "benoit", "stas", "matan", "oleksii", "ana", "kostiantyn", "bruce"]
+ems_enabled_sandboxes = ["class", "liza", "alex", "dima", "paul", "alexander", "nikita", "ori", "rotem", "andrei", "nicolas", "benoit", "stas", "matan", "oleksii", "ana", "kostiantyn", "bruce"]
 
-sw_version = "v2.0"
+sw_version = "v2.1"
 
 instance_types = {
   "redis"     = "cache.t3.small"

diff --git a/aws/ams-cluster-v1-tf/variables.tf b/aws/ams-cluster-v1-tf/variables.tf
@@ -484,7 +484,7 @@ locals {
 
   # e.g. from curl https://checkip.amazonaws.com
   dev_user_ips = [
-    "85.250.219.183/32",  # nikita
+    "87.68.60.181/32",  # nikita
     "71.202.208.152/32",  # alan
     "98.33.38.126/32",    # ttang2
     "212.150.192.110/32", # Israel office
@@ -494,6 +494,9 @@ locals {
     "74.15.122.231/32",   # benoit
     "195.24.157.34/32",   # stas
     "80.178.205.84/32",   # rotem
+    "176.36.186.39/32",   # kostiantyn
+    "23.233.161.46/32",   # bruce
+
 
     # contractor IPs
     "109.87.152.216/32", # anton

diff --git a/aws/ssh-public-keys/bruce.pub b/aws/ssh-public-keys/bruce.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDbe/MiBUW8Gbbh+bS87H6sGTynjgl+wTP1r+GFMoD9U5UaYLAZJlEfhvbTp8EKkHcb26YqvgfnIs0mmDvjh+BoXyxbZD7AuQZu2eFlD/N8loF3B5HkK8Iv4mM4URciAWdEAJOxGwot4gmDy0bPKS6wn/+Q1jjgzI5vqbhSQE20aIbloTCgDVKAk3IlydIWWBbIN6QEPhMVGfhkqysDE1+HWBWk86kndJ/X/tKmKbmyEDsMi2lWjALBEDtZ9dFu6CCtiCs3CiRJ1n4jf4pvMP4If3uKWs0ZRGGocJklAHoVOWiHx5bna2qhNKnwzVSO8i1PLUwkOoUo1yrAm5NPhaPytmOr68OhSwCFY00Atak4ZN664onTu/d01Flmp7hrkh3eqJfs5CrFzIYn+dcL+nhzbm3ZCwuNbjibHj11ZBlScoUFcv+mD7E3DyKEZjKmsfUYKdIytS/ZacI6Tj8pq8PCkah0pRgCVtotvnacShLYz6E3ZZ9XhXcWG1d95OcEX6Mm03Ozjumpmuynb9sO+syAYn/1YR2H4UDJjqnhb5fUrzUVaOle97E9yiCOqb6Sv1UWyQiqcdp0yOLrnRvWvK73QwobBPSfiM0KQeIa7xxwO4Ta554E3Y7CQt4TXbd8ZUZ9gujuV/+VE7wpPz96BbMhnUA05JP1qCMAvmEu1+k+vQ== bruce@DESKTOP-DAT3NN2
diff --git a/aws/ssh-public-keys/kostiantyn.pub b/aws/ssh-public-keys/kostiantyn.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/eYROuv/QFFaUly0L2szz3XGtQHrIxTeVX+EywtP/7ncwjvwYuKqIS0S9Ehu/tA6qhmCoKqq/5vguyUJCjdCNZC13pygfQ3P72awma5WUqevMxgCz2+utI76G0yB7pezQ2Asvcnmx0aGg0F8TdbmrBj3B+9Htp/kX3Yh/Wk2FDWTgdox0vgMAIy2EyonFzRAbk/1XOFu1KeLYz5jtgY8wt7AfwHggdS1h5ysZaGncC88MnG2CFrrnf55GvuLfrEJiAsPYkWIlpDIAOF3+5jPDMsxlXgQEjEp/jDuBIoSTC/2E86jKv1n25RiMBd2I37yiKhhNRtsJwFg8KVdnGyRoFSNB6iXW00xczw+0g+CQEg2I7gqL1LXJfYwlB3jLcvIb9YL/pqkrSB+UyF5AfTIVxcHS2ks8AN2lEsiCIt8yZ9FD1ogca5N9sCKkOKj/aIxKaN9AtqDrD7Z8qKXKnjqS8QHCavtmk5FVKpBHyFrGS3kitR/boEo5YbGUG9H7tp+ga2tRcF2c1GwMI4JeIT/xI/upkfzhB5RB2JiSedLrHYeiBZVxQn/KeLMAn//POybzXNhp3arlSn53W461sMOTMxDzekGhfMHVhaGpxr+mLX26fnTMS/hewlVTTgKBH04fMQkE4gQNsIPDs82R5rwCs/VG56vTTqrgBxBPqoJ6lQ== k.povietkin@spd-ukraine.com
diff --git a/aws/ssh-public-keys/nikita.pub b/aws/ssh-public-keys/nikita.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDabQPfhCyRExEgt+bPvtSu/4YsnEsV2VPIjMySyKMky3pna/ys08e4CHuu5mhiJ+iQOEGz/Qs6QGGhWlUxveM9qrI9kt1WNMBHLw4GwQpzI+bXSedJSn2VO8ocZ4kvyVxHh+OWjAMAdfqQL7hW/0OOBcaR6cRsv6JolWNklMG6cxYQcvOyYoa+oooqONGHHXpjQ3qW30t0qqup6VSPrE1iSlAqMVAbt2x4iKGkikAHw6+bh05FCHog2B+4Gly0LlqxIrf3A/hpwMVwSIDxzx1ppiji5ISVNMcqUN0gxvDnIJWWzCeWmPyqPJJtd7KldjTE+YEorOiSIyrLez7hcOKKorXmKvu8rTPlAKYtLkiNg014HYvDgFbj8uVCEvGUOq9+zi6AnmnOw0sKrqsv00wwZMkP7+8Rk/FBk6M6fVZbJyv5lti1vwcbd3ppRHVSrgQC/gNmejWc8chvOVu9+k8qd4kWcgrBzXFsZKNLNJ2ftwAZR3K5huDSWDFuPmwsIu0= Nikita Dizhur@DESKTOP-1FH99TO
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC2xJJJq1LOhzmtD0NPOAjWbJKbwQJFWDcpugGWH/oeSH3c1W2X5OxlcoLxxHSc7g1hiE1+AigL6rI3IEl0kGBl84w+kU1C84jNRIWEzLoSr5inesHNDGXwWIhLdRuaL6ovUT41TAebkKLuJE5yluveuodoLoXoioFNIA1/yAw6nkKPngqTKEPVwmudn9+JyBRxZTxiwU9eqqMCGa0sA5pZQYQ3DsZlaA9fZH7Ah2USj6/rskFKt6Kc73E43RWcfWPN10DMSBP+uSGXXAnqZnTLhLCjcUfWS/tEo4+6bBOaBj+4oduo2dai4nH+kmMl8QlebOAKQAZwo1xb/J0FwBE5zfNhwQpqBgdUgOW0kjkmietQYHHcQk3k//I+cNmFSoFfeNt2+SuNbGdF2lkzU3uWyIsVrrsDFc3qjjej9M2JZc5JdzGju6wZeNM4jZPE7P/hYzKf+JEs/CjlSQ55yBJldTWx1MW0lx1cOEuvAOh6LSxnP78ltTt7l29VXMXGMs6PLxswNxpa8bR6yAbTPazpl8dUTUdiDnKCqkcuUdzisy8qe6RkdfY6IEPgbxehLb69sfRqsOrebvbrsey63tmb8DgCiFQQmfxhdW95HcxOdfXwHqLjZbIEgJcio1qwWrc1euttCuetGKNmSoWCbckN/t7dVCRPS/O9RnIEWZcvPQ== nikita@LAPTOP-URICMPRH
diff --git a/fabfile.py b/fabfile.py
@@ -32,10 +32,11 @@
     "rotem": 8100,
     "andrei": 8101,
     "andre": 8102,
-    # "free": 8103,
+    "bruce": 8103,
     "alexander": 8104,
     "anton": 8105,
     "intellias": 8106,
+    "kostiantyn": 8107,
     # Production
     "class": 8080,
     "gatech": 8081,