Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openscapes: re-create node pools to get all relevant tags #4867

Merged
merged 2 commits into from
Sep 23, 2024
Merged

openscapes: re-create node pools to get all relevant tags #4867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fec33cb
openscapes: re-create node pools to get all relevant tags
consideRatio Sep 23, 2024
c8698b8
aws-ce-grafana-backend: add fixme note
consideRatio Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions eksctl/openscapes.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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" },
Expand All @@ -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" },
Expand Down Expand Up @@ -149,7 +156,7 @@ local daskNodes = [
[
ng + {
namePrefix: 'core',
nameSuffix: 'b',
nameSuffix: 'a',
nameIncludeInstanceType: false,
availabilityZones: [nodeAz],
ssh: {
Expand Down
5 changes: 5 additions & 0 deletions helm-charts/aws-ce-grafana-backend/mounted-files/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down