Merge pull request #4867 from consideRatio/pr/openscapes-tags

openscapes: re-create node pools to get all relevant tags
2i2c-org · Sep 23, 2024 · d0b64bb · d0b64bb
2 parents 7987a85 + c8698b8
commit d0b64bb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/eksctl/openscapes.jsonnet b/eksctl/openscapes.jsonnet
@@ -25,13 +25,13 @@ local nodeAz = "us-west-2b";
 // A `node.kubernetes.io/instance-type label is added, so pods
 // can request a particular kind of node with a nodeSelector
 local notebookNodes = [
-    { 
+    {
         instanceType: "r5.xlarge",
         namePrefix: "nb-staging",
         labels+: { "2i2c/hub-name": "staging" },
         tags+: { "2i2c:hub-name": "staging" }
     },
-    { 
+    {
         instanceType: "r5.4xlarge",
         namePrefix: "nb-staging",
         labels+: { "2i2c/hub-name": "staging" },
@@ -43,13 +43,20 @@ local notebookNodes = [
         labels+: { "2i2c/hub-name": "staging" },
         tags+: { "2i2c:hub-name": "staging" }
     },
-    { 
+    {
+        // FIXME: tainted, to be deleted when empty, replaced by equivalent already
         instanceType: "r5.xlarge",
         namePrefix: "nb-prod",
         labels+: { "2i2c/hub-name": "prod" },
         tags+: { "2i2c:hub-name": "prod" }
     },
-    { 
+    {
+        instanceType: "r5.xlarge",
+        namePrefix: "nb-prod-a",
+        labels+: { "2i2c/hub-name": "prod" },
+        tags+: { "2i2c:hub-name": "prod" }
+    },
+    {
         instanceType: "r5.4xlarge",
         namePrefix: "nb-prod",
         labels+: { "2i2c/hub-name": "prod" },
@@ -61,13 +68,13 @@ local notebookNodes = [
         labels+: { "2i2c/hub-name": "prod" },
         tags+: { "2i2c:hub-name": "prod" }
     },
-    { 
+    {
         instanceType: "r5.xlarge",
         namePrefix: "nb-workshop",
         labels+: { "2i2c/hub-name": "workshop" },
         tags+: { "2i2c:hub-name": "workshop" }
     },
-    { 
+    {
         instanceType: "r5.4xlarge",
         namePrefix: "nb-workshop",
         labels+: { "2i2c/hub-name": "workshop" },
@@ -149,7 +156,7 @@ local daskNodes = [
     [
         ng + {
             namePrefix: 'core',
-            nameSuffix: 'b',
+            nameSuffix: 'a',
             nameIncludeInstanceType: false,
             availabilityZones: [nodeAz],
             ssh: {

diff --git a/helm-charts/aws-ce-grafana-backend/mounted-files/const.py b/helm-charts/aws-ce-grafana-backend/mounted-files/const.py
@@ -73,6 +73,11 @@
                 "MatchOptions": ["EQUALS"],
             },
         },
+        # FIXME: The inclusion of tags 2i2c:hub-name and 2i2c:node-purpose below
+        #        in this filter is a patch to capture openscapes data from 1st
+        #        July and up to 24th September 2024, and can be removed once
+        #        that date range is considered irrelevant.
+        #
         {
             "Not": {
                 "Tags": {