Skip to content

Add isolated diego cells for devtools #979

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

Merged
cweibel merged 8 commits into from
May 28, 2025
Merged

Add isolated diego cells for devtools #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4df2bad
Add iso seg devtools cells
cweibel May 28, 2025
dbf3aa2
Adding tf to associate org to iso seg
cweibel May 28, 2025
061ee24
Remove count
cweibel May 28, 2025
2f4678d
force devtools org to use iso seg
cweibel May 28, 2025
56cbbc7
Update iso seg name to the same as the cf deployment placement tag
cweibel May 28, 2025
37ffbb6
Renaming segment
cweibel May 28, 2025
45ddce5
Put desired iso seg back, need to clean up state
cweibel May 28, 2025
a11f31c
Prep for rolling to staging via main
cweibel May 28, 2025
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
14 changes: 7 additions & 7 deletions bosh/opsfiles/scaling-development.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@


# iso-segs
#- type: replace
# path: /instance_groups/name=diego-cell-iso-seg1/vm_type
# value: r6i.4xlarge
#
#- type: replace
# path: /instance_groups/name=diego-cell-iso-seg1/instances
# value: 2
- type: replace
path: /instance_groups/name=diego-cell-iso-seg-devtools/vm_type
value: t3.large

- type: replace
path: /instance_groups/name=diego-cell-iso-seg-devtools/instances
value: 1
9 changes: 9 additions & 0 deletions bosh/opsfiles/scaling-production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,12 @@
- type: replace
path: /instance_groups/name=rotate-cc-database-key/vm_type
value: t3.medium

# iso-segs
- type: replace
path: /instance_groups/name=diego-cell-iso-seg-devtools/vm_type
value: r6i.2xlarge

- type: replace
path: /instance_groups/name=diego-cell-iso-seg-devtools/instances
value: 3
9 changes: 9 additions & 0 deletions bosh/opsfiles/scaling-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,12 @@
- type: replace
path: /instance_groups/name=rotate-cc-database-key/vm_type
value: t3.medium

# iso-segs
- type: replace
path: /instance_groups/name=diego-cell-iso-seg-devtools/vm_type
value: r6i.2xlarge

- type: replace
path: /instance_groups/name=diego-cell-iso-seg-devtools/instances
value: 1
8 changes: 4 additions & 4 deletions ci/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
image: general-task
file: cf-manifests/ci/create-diego-cell-iso-seg.yml
params:
ISO_SEG_NAMES: "" #((names_of_iso_segs_development)) # Value in credhub
ISO_SEG_NAMES: ((names_of_iso_segs_development))
- put: cf-deployment-development
params: &deploy-params
manifest: cf-deployment/cf-deployment.yml
Expand Down Expand Up @@ -612,7 +612,7 @@ jobs:
image: general-task
file: cf-manifests/ci/create-diego-cell-iso-seg.yml
params:
ISO_SEG_NAMES: "" #((names_of_iso_segs_staging)) # Value in credhub
ISO_SEG_NAMES: ((names_of_iso_segs_staging))
- put: cf-deployment-staging
params:
<<: *deploy-params
Expand Down Expand Up @@ -1172,7 +1172,7 @@ jobs:
image: general-task
file: cf-manifests/ci/create-diego-cell-iso-seg.yml
params:
ISO_SEG_NAMES: "" #((names_of_iso_segs_production)) # Value in credhub
ISO_SEG_NAMES: ((names_of_iso_segs_production))
- put: cf-deployment-production
params: &prod-deploy-params
<<: *deploy-params
Expand Down Expand Up @@ -1288,7 +1288,7 @@ jobs:
image: general-task
file: cf-manifests/ci/create-diego-cell-iso-seg.yml
params:
ISO_SEG_NAMES: "" #((names_of_iso_segs_production)) # Value in credhub
ISO_SEG_NAMES: ((names_of_iso_segs_production))
- put: cf-deployment-production
params:
<<: *prod-deploy-params
Expand Down
12 changes: 12 additions & 0 deletions terraform/stacks/cf/iso.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@ resource "cloudfoundry_isolation_segment_entitlement" "platform" {
]
default = false
}

resource "cloudfoundry_isolation_segment" "devtools" {
name = "diego-cell-iso-seg-devtools"
}

resource "cloudfoundry_isolation_segment_entitlement" "devtools" {
segment = cloudfoundry_isolation_segment.devtools.id
orgs = [
cloudfoundry_org.cloud-gov-devtools.id
]
default = true
}