Skip to content

Add boskos leases for the 2nd azure subscription #21633

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
openshift-merge-robot merged 1 commit into from
Sep 9, 2021
Merged

Add boskos leases for the 2nd azure subscription #21633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion clusters/app.ci/prow/03_deployment/boskos_reaper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ spec:
image: gcr.io/k8s-staging-boskos/reaper:v20210823-ae371c6
args:
- --boskos-url=http://boskos
- --resource-type=aws-quota-slice,azure4-quota-slice,gcp-quota-slice,libvirt-ppc64le-quota-slice,libvirt-s390x-quota-slice,openstack-quota-slice,openstack-kuryr-quota-slice,openstack-vexxhost-quota-slice,openstack-vh-mecha-central-quota-slice,openstack-vh-mecha-az0-quota-slice,openstack-ppc64le-quota-slice,vsphere-quota-slice,ovirt-quota-slice,packet-quota-slice,packet-edge-quota-slice,kubevirt-quota-slice,openstack-osuosl-quota-slice,aws-cpaas-quota-slice,hypershift-quota-slice,alibaba-quota-slice,aws-2-quota-slice,aws-arm64-quota-slice,azurestack-quota-slice,gcp-openshift-gce-devel-ci-2-quota-slice,ibmcloud-quota-slice,metal-quota-slice,osd-ephemeral-quota-slice,ovirt-upgrade-quota-slice
- --resource-type=aws-quota-slice,azure4-quota-slice,azure-2-quota-slice,gcp-quota-slice,libvirt-ppc64le-quota-slice,libvirt-s390x-quota-slice,openstack-quota-slice,openstack-kuryr-quota-slice,openstack-vexxhost-quota-slice,openstack-vh-mecha-central-quota-slice,openstack-vh-mecha-az0-quota-slice,openstack-ppc64le-quota-slice,vsphere-quota-slice,ovirt-quota-slice,packet-quota-slice,packet-edge-quota-slice,kubevirt-quota-slice,openstack-osuosl-quota-slice,aws-cpaas-quota-slice,hypershift-quota-slice,alibaba-quota-slice,aws-2-quota-slice,aws-arm64-quota-slice,azurestack-quota-slice,gcp-openshift-gce-devel-ci-2-quota-slice,ibmcloud-quota-slice,metal-quota-slice,osd-ephemeral-quota-slice,ovirt-upgrade-quota-slice
- --target-state=free
60 changes: 60 additions & 0 deletions core-services/prow/02_config/_boskos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,66 @@ resources:
- us-west-2--aws-quota-slice-34
state: free
type: aws-quota-slice
- names:
- centralus--azure-2-quota-slice-00
- centralus--azure-2-quota-slice-01
- centralus--azure-2-quota-slice-02
- centralus--azure-2-quota-slice-03
- centralus--azure-2-quota-slice-04
- centralus--azure-2-quota-slice-05
- centralus--azure-2-quota-slice-06
- centralus--azure-2-quota-slice-07
- centralus--azure-2-quota-slice-08
- centralus--azure-2-quota-slice-09
- centralus--azure-2-quota-slice-10
- centralus--azure-2-quota-slice-11
- centralus--azure-2-quota-slice-12
- centralus--azure-2-quota-slice-13
- centralus--azure-2-quota-slice-14
- centralus--azure-2-quota-slice-15
- centralus--azure-2-quota-slice-16
- centralus--azure-2-quota-slice-17
- centralus--azure-2-quota-slice-18
- centralus--azure-2-quota-slice-19
- centralus--azure-2-quota-slice-20
- centralus--azure-2-quota-slice-21
- centralus--azure-2-quota-slice-22
- centralus--azure-2-quota-slice-23
- centralus--azure-2-quota-slice-24
- centralus--azure-2-quota-slice-25
- centralus--azure-2-quota-slice-26
- centralus--azure-2-quota-slice-27
- centralus--azure-2-quota-slice-28
- centralus--azure-2-quota-slice-29
- centralus--azure-2-quota-slice-30
- centralus--azure-2-quota-slice-31
- centralus--azure-2-quota-slice-32
- eastus--azure-2-quota-slice-0
- eastus--azure-2-quota-slice-1
- eastus--azure-2-quota-slice-2
- eastus--azure-2-quota-slice-3
- eastus--azure-2-quota-slice-4
- eastus--azure-2-quota-slice-5
- eastus--azure-2-quota-slice-6
- eastus--azure-2-quota-slice-7
- eastus2--azure-2-quota-slice-0
- eastus2--azure-2-quota-slice-1
- eastus2--azure-2-quota-slice-2
- eastus2--azure-2-quota-slice-3
- eastus2--azure-2-quota-slice-4
- eastus2--azure-2-quota-slice-5
- eastus2--azure-2-quota-slice-6
- eastus2--azure-2-quota-slice-7
- westus--azure-2-quota-slice-0
- westus--azure-2-quota-slice-1
- westus--azure-2-quota-slice-2
- westus--azure-2-quota-slice-3
- westus--azure-2-quota-slice-4
- westus--azure-2-quota-slice-5
- westus--azure-2-quota-slice-6
- westus--azure-2-quota-slice-7
state: free
type: azure-2-quota-slice
- names:
- centralus--azure4-quota-slice-00
- centralus--azure4-quota-slice-01
Expand Down
6 changes: 6 additions & 0 deletions core-services/prow/02_config/generate-boskos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
'eastus2': 8,
'westus': 8
},
'azure-2-quota-slice': {
'centralus': 33,
'eastus': 8,
'eastus2': 8,
'westus': 8
},
Copy link
Member

@petr-muller petr-muller Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How were these numbers computed?

Copy link
Member Author

@droslean droslean Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used the same with azure4.

Copy link
Member

@petr-muller petr-muller Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which may not be correct. How do we know we have enough quota in the second account?

Copy link
Member

@petr-muller petr-muller Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a similar spreadsheet like we used for AWS2 and GCP2? If yes, have you checked the quotas? If no, can we get one?

Copy link
Member Author

@droslean droslean Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 2nd subscription has exactly the same quotas as the 1st one.

Copy link
Member Author

@droslean droslean Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me correct me here. The 2nd subscription with specific quotas have been requested in https://issues.redhat.com/browse/DPP-7124. Let me /hold this and ask James for the speadsheet so we can calculate the boskos leases with an exact number.

Copy link
Member Author

@droslean droslean Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wking How can we calculate this like you did in #12840 ?

Copy link
Member

@wking wking Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit/PR message in #12840 has the method I used previously. Is there a particular step that wasn't clear?

Copy link
Member Author

@droslean droslean Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok so we are

  • Central US:

    • 1200 standardDSv3Family / 40 = 30 clusters
    • 600 LowPriorityCores / 18 vCPUs per spot test = 33 clusters
    • 100 Public IPs / 3 = 33 clusters

  • eastus/eastus2/westus

    • 350 / 40 = 8 clusters
    • 350 LowPriorityCores / 18 = 19 clusters
    • 100 Public IPs / 3 = 33 clusters

So we are good to merge :)

'azurestack-quota-slice': {
'ppe3': 2
},
Expand Down