Skip to content

Commit fabadba

Browse files
Add necessary bits for Vexxhost operator cluster profile (#30774)
* Add the cloud resource names into openstack-conf-resourcenames * Add secrets into openstack-conf-clouds * Add infos for Bosko * Configure quotas for 2 leases (for now)
1 parent 1b9d179 commit fabadba

File tree

6 files changed

+55
-1
lines changed

6 files changed

+55
-1
lines changed

ci-operator/step-registry/openstack/conf/clouds/openstack-conf-clouds-ref.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ ref:
1010
- namespace: test-credentials
1111
name: cluster-secrets-openstack-vexxhost
1212
mount_path: /var/run/cluster-secrets/openstack-vexxhost
13+
- namespace: test-credentials
14+
name: cluster-secrets-openstack-operators-vexxhost
15+
mount_path: /var/run/cluster-secrets/openstack-operators-vexxhost
1316
- namespace: test-credentials
1417
name: cluster-secrets-openstack-moc
1518
mount_path: /var/run/cluster-secrets/openstack

ci-operator/step-registry/openstack/conf/resourcenames/openstack-conf-resourcenames-commands.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ CLUSTER_TYPE="${CLUSTER_TYPE_OVERRIDE:-$CLUSTER_TYPE}"
77
declare -A external_network=(
88
['openstack-kuryr']='external'
99
['openstack-vexxhost']='public'
10+
['openstack-operators-vexxhost']='public'
1011
['openstack-vh-mecha-central']='external'
1112
['openstack-vh-mecha-az0']='external'
1213
['openstack-nfv']='intel-dpdk'
@@ -17,6 +18,7 @@ declare -A external_network=(
1718
declare -A controlplane_flavor=(
1819
['openstack-kuryr']='m1.xlarge'
1920
['openstack-vexxhost']='ci.m1.xlarge'
21+
['openstack-operators-vexxhost']='ci.m1.large'
2022
['openstack-vh-mecha-central']='m1.xlarge'
2123
['openstack-vh-mecha-az0']='m1.xlarge'
2224
['openstack-nfv']='m1.xlarge'
@@ -27,6 +29,7 @@ declare -A controlplane_flavor=(
2729
declare -A compute_flavor=(
2830
['openstack-kuryr']='m1.xlarge'
2931
['openstack-vexxhost']='ci.m1.xlarge'
32+
['openstack-operators-vexxhost']='ci.m1.large'
3033
['openstack-vh-mecha-central']='m1.xlarge'
3134
['openstack-vh-mecha-az0']='m1.xlarge'
3235
['openstack-nfv']='m1.xlarge.nfv'
@@ -37,6 +40,7 @@ declare -A compute_flavor=(
3740
declare -A compute_azs=(
3841
['openstack-kuryr']=''
3942
['openstack-vexxhost']=''
43+
['openstack-operators-vexxhost']=''
4044
['openstack-vh-mecha-central']=''
4145
['openstack-vh-mecha-az0']='az0'
4246
['openstack-nfv']=''
@@ -47,6 +51,7 @@ declare -A compute_azs=(
4751
declare -A bastion_flavor=(
4852
['openstack-kuryr']=''
4953
['openstack-vexxhost']='1vcpu_2gb'
54+
['openstack-operators-vexxhost']='ci.m1.small'
5055
['openstack-vh-mecha-central']='m1.small'
5156
['openstack-vh-mecha-az0']='m1.small'
5257
['openstack-nfv']='m1.small'

clusters/app.ci/prow/03_deployment/boskos_reaper.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ spec:
2323
image: gcr.io/k8s-staging-boskos/reaper:v20220729-35595e8
2424
args:
2525
- --boskos-url=http://boskos
26-
- --resource-type=aws-quota-slice,aws-qe-quota-slice,azure4-quota-slice,azure-2-quota-slice,azurestack-quota-slice,azuremag-quota-slice,azure-qe-quota-slice,azuremag-qe-quota-slice,equinix-ocp-metal-quota-slice,gcp-qe-quota-slice,gcp-quota-slice,libvirt-ppc64le-quota-slice,libvirt-s390x-quota-slice,openstack-quota-slice,openstack-hwoffload-quota-slice,openstack-kuryr-quota-slice,openstack-nfv-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,openstack-osuosl-quota-slice,aws-cpaas-quota-slice,hypershift-quota-slice,alibaba-quota-slice,alibabacloud-qe-quota-slice,alibabacloud-cn-qe-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,aws-china-qe-quota-slice,aws-usgov-qe-quota-slice,aws-c2s-qe-quota-slice,aws-sc2s-qe-quota-slice,vsphere-discon-quota-slice,vsphere-clusterbot-quota-slice,vsphere-clusterbot-quota-slice
26+
- --resource-type=aws-quota-slice,aws-qe-quota-slice,azure4-quota-slice,azure-2-quota-slice,azurestack-quota-slice,azuremag-quota-slice,azure-qe-quota-slice,azuremag-qe-quota-slice,equinix-ocp-metal-quota-slice,gcp-qe-quota-slice,gcp-quota-slice,libvirt-ppc64le-quota-slice,libvirt-s390x-quota-slice,openstack-quota-slice,openstack-hwoffload-quota-slice,openstack-kuryr-quota-slice,openstack-nfv-quota-slice,openstack-vexxhost-quota-slice,openstack-operators-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,openstack-osuosl-quota-slice,aws-cpaas-quota-slice,hypershift-quota-slice,alibaba-quota-slice,alibabacloud-qe-quota-slice,alibabacloud-cn-qe-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,aws-china-qe-quota-slice,aws-usgov-qe-quota-slice,aws-c2s-qe-quota-slice,aws-sc2s-qe-quota-slice,vsphere-discon-quota-slice,vsphere-clusterbot-quota-slice,vsphere-clusterbot-quota-slice
2727
- --target-state=free

core-services/ci-secret-bootstrap/_config.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,6 +1311,45 @@ secret_configs:
13111311
- non_app_ci
13121312
name: cluster-secrets-openstack-osuosl
13131313
namespace: ci
1314+
- from:
1315+
.awscred:
1316+
field: .awscred
1317+
item: openstack
1318+
clouds.yaml:
1319+
field: clouds.yaml
1320+
item: openstack
1321+
pull-secret:
1322+
dockerconfigJSON:
1323+
- auth_field: token_image-puller_app.ci_reg_auth_value.txt
1324+
item: build_farm
1325+
registry_url: registry.ci.openshift.org
1326+
- auth_field: auth
1327+
email_field: email
1328+
item: cloud.openshift.com-pull-secret
1329+
registry_url: cloud.openshift.com
1330+
- auth_field: auth
1331+
email_field: email
1332+
item: quay.io-pull-secret
1333+
registry_url: quay.io
1334+
- auth_field: auth
1335+
email_field: email
1336+
item: registry.connect.redhat.com-pull-secret
1337+
registry_url: registry.connect.redhat.com
1338+
- auth_field: auth
1339+
email_field: email
1340+
item: registry.redhat.io-pull-secret
1341+
registry_url: registry.redhat.io
1342+
ssh-privatekey:
1343+
field: ssh-privatekey
1344+
item: openstack
1345+
ssh-publickey:
1346+
field: ssh-publickey
1347+
item: openstack
1348+
to:
1349+
- cluster_groups:
1350+
- non_app_ci
1351+
name: cluster-secrets-openstack-operators-vexxhost
1352+
namespace: ci
13141353
- from:
13151354
ops-mirror.pem:
13161355
field: cert-key.pem

core-services/prow/02_config/_boskos.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,10 @@ resources:
978978
min-count: 5
979979
state: free
980980
type: openstack-nfv-quota-slice
981+
- max-count: 2
982+
min-count: 2
983+
state: free
984+
type: openstack-operators-vexxhost-quota-slice
981985
- names:
982986
- openstack-osuosl-00
983987
- openstack-osuosl-01

core-services/prow/02_config/generate-boskos.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
'openstack-vexxhost-quota-slice': {
9696
'default': 18,
9797
},
98+
'openstack-operators-vexxhost-quota-slice': {
99+
'default': 2,
100+
},
98101
'openstack-hwoffload-quota-slice': {
99102
'default': 5,
100103
},

0 commit comments

Comments
 (0)