Skip to content

Add necessary bits for Vexxhost operator cluster profile #30774

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ref:
- namespace: test-credentials
name: cluster-secrets-openstack-vexxhost
mount_path: /var/run/cluster-secrets/openstack-vexxhost
- namespace: test-credentials
name: cluster-secrets-openstack-operators-vexxhost
mount_path: /var/run/cluster-secrets/openstack-operators-vexxhost
- namespace: test-credentials
name: cluster-secrets-openstack-moc
mount_path: /var/run/cluster-secrets/openstack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLUSTER_TYPE="${CLUSTER_TYPE_OVERRIDE:-$CLUSTER_TYPE}"
declare -A external_network=(
['openstack-kuryr']='external'
['openstack-vexxhost']='public'
['openstack-operators-vexxhost']='public'
['openstack-vh-mecha-central']='external'
['openstack-vh-mecha-az0']='external'
['openstack-nfv']='intel-dpdk'
Expand All @@ -17,6 +18,7 @@ declare -A external_network=(
declare -A controlplane_flavor=(
['openstack-kuryr']='m1.xlarge'
['openstack-vexxhost']='ci.m1.xlarge'
['openstack-operators-vexxhost']='ci.m1.large'
['openstack-vh-mecha-central']='m1.xlarge'
['openstack-vh-mecha-az0']='m1.xlarge'
['openstack-nfv']='m1.xlarge'
Expand All @@ -27,6 +29,7 @@ declare -A controlplane_flavor=(
declare -A compute_flavor=(
['openstack-kuryr']='m1.xlarge'
['openstack-vexxhost']='ci.m1.xlarge'
['openstack-operators-vexxhost']='ci.m1.large'
['openstack-vh-mecha-central']='m1.xlarge'
['openstack-vh-mecha-az0']='m1.xlarge'
['openstack-nfv']='m1.xlarge.nfv'
Expand All @@ -37,6 +40,7 @@ declare -A compute_flavor=(
declare -A compute_azs=(
['openstack-kuryr']=''
['openstack-vexxhost']=''
['openstack-operators-vexxhost']=''
['openstack-vh-mecha-central']=''
['openstack-vh-mecha-az0']='az0'
['openstack-nfv']=''
Expand All @@ -47,6 +51,7 @@ declare -A compute_azs=(
declare -A bastion_flavor=(
['openstack-kuryr']=''
['openstack-vexxhost']='1vcpu_2gb'
['openstack-operators-vexxhost']='ci.m1.small'
['openstack-vh-mecha-central']='m1.small'
['openstack-vh-mecha-az0']='m1.small'
['openstack-nfv']='m1.small'
Expand Down
2 changes: 1 addition & 1 deletion clusters/app.ci/prow/03_deployment/boskos_reaper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ spec:
image: gcr.io/k8s-staging-boskos/reaper:v20220711-6cb8a6f
args:
- --boskos-url=http://boskos
- --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
- --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
- --target-state=free
39 changes: 39 additions & 0 deletions core-services/ci-secret-bootstrap/_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1311,6 +1311,45 @@ secret_configs:
- non_app_ci
name: cluster-secrets-openstack-osuosl
namespace: ci
- from:
.awscred:
field: .awscred
item: openstack
clouds.yaml:
field: clouds.yaml
item: openstack
pull-secret:
dockerconfigJSON:
- auth_field: token_image-puller_app.ci_reg_auth_value.txt
item: build_farm
registry_url: registry.ci.openshift.org
- auth_field: auth
email_field: email
item: cloud.openshift.com-pull-secret
registry_url: cloud.openshift.com
- auth_field: auth
email_field: email
item: quay.io-pull-secret
registry_url: quay.io
- auth_field: auth
email_field: email
item: registry.connect.redhat.com-pull-secret
registry_url: registry.connect.redhat.com
- auth_field: auth
email_field: email
item: registry.redhat.io-pull-secret
registry_url: registry.redhat.io
ssh-privatekey:
field: ssh-privatekey
item: openstack
ssh-publickey:
field: ssh-publickey
item: openstack
to:
- cluster_groups:
- non_app_ci
name: cluster-secrets-openstack-operators-vexxhost
namespace: ci
- from:
ops-mirror.pem:
field: cert-key.pem
Expand Down
4 changes: 4 additions & 0 deletions core-services/prow/02_config/_boskos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,10 @@ resources:
min-count: 5
state: free
type: openstack-nfv-quota-slice
- max-count: 2
min-count: 2
state: free
type: openstack-operators-vexxhost-quota-slice
- names:
- openstack-osuosl-00
- openstack-osuosl-01
Expand Down
3 changes: 3 additions & 0 deletions core-services/prow/02_config/generate-boskos.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@
'openstack-vexxhost-quota-slice': {
'default': 18,
},
'openstack-operators-vexxhost-quota-slice': {
'default': 2,
},
'openstack-hwoffload-quota-slice': {
'default': 5,
},
Expand Down