Skip to content

Commit

Permalink
increase number of projects, change network
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbueringer
sbueringer committed Jun 6, 2024
1 parent 147942e commit 847e1d7
Show file tree
Hide file tree
Showing 5 changed files with 178 additions and 13 deletions.
3 changes: 3 additions & 0 deletions hack/e2e.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ source "${REPO_ROOT}/hack/ensure-kubectl.sh"

make boskosctl
export BOSKOS_RESOURCE_OWNER=cluster-api-provider-vsphere
if [[ "${JOB_NAME}" != "" ]]; then
export BOSKOS_RESOURCE_OWNER="${JOB_NAME}-${JOB_NAME}"
fi
export BOSKOS_RESOURCE_TYPE=vsphere-project-cluster-api-provider

on_exit() {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/vsphere.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ variables:
VSPHERE_CONTENT_LIBRARY: "capv"
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0"
VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.30.0"
VSPHERE_NETWORK: "sddc-cgw-network-6"
VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-6"
VSPHERE_NETWORK: "sddc-cgw-network-10"
VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0"
VSPHERE_INSECURE_CSI: "true"
Expand Down
150 changes: 142 additions & 8 deletions tmp-boskos-poc/boskos-resources-user-data.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,154 @@ resources:
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/001
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/001
ipPool: '{\"addresses\":[\"192.168.6.235\",\"192.168.6.236\",\"192.168.6.237\",\"192.168.6.238\",\"192.168.6.239\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.361-192.168.24.376\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-002
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/002
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/002
ipPool: '{\"addresses\":[\"192.168.6.240\",\"192.168.6.241\",\"192.168.6.242\",\"192.168.6.243\",\"192.168.6.244\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.377-192.168.24.392\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-003
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/003
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/003
ipPool: '{\"addresses\":[\"192.168.6.245\",\"192.168.6.246\",\"192.168.6.247\",\"192.168.6.248\",\"192.168.6.249\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.393-192.168.24.408\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-004
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/004
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/004
ipPool: '{\"addresses\":[\"192.168.6.250\",\"192.168.6.251\",\"192.168.6.252\",\"192.168.6.253\",\"192.168.6.254\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.409-192.168.24.424\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-005
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/005
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/005
ipPool: '{\"addresses\":[\"192.168.24.425-192.168.24.440\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-006
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/006
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/006
ipPool: '{\"addresses\":[\"192.168.24.441-192.168.24.456\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-007
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/007
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/007
ipPool: '{\"addresses\":[\"192.168.24.457-192.168.24.472\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-008
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/008
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/008
ipPool: '{\"addresses\":[\"192.168.24.473-192.168.24.488\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-009
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/009
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/009
ipPool: '{\"addresses\":[\"192.168.24.489-192.168.24.504\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-010
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/010
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/010
ipPool: '{\"addresses\":[\"192.168.24.505-192.168.24.520\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-011
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/011
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/011
ipPool: '{\"addresses\":[\"192.168.24.521-192.168.24.536\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-012
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/012
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/012
ipPool: '{\"addresses\":[\"192.168.24.537-192.168.24.552\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-013
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/013
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/013
ipPool: '{\"addresses\":[\"192.168.24.553-192.168.24.568\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-014
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/014
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/014
ipPool: '{\"addresses\":[\"192.168.24.569-192.168.24.584\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-015
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/015
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/015
ipPool: '{\"addresses\":[\"192.168.24.585-192.168.24.600\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-016
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/016
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/016
ipPool: '{\"addresses\":[\"192.168.24.601-192.168.24.616\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-017
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/017
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/017
ipPool: '{\"addresses\":[\"192.168.24.617-192.168.24.632\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-018
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/018
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/018
ipPool: '{\"addresses\":[\"192.168.24.633-192.168.24.648\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-019
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/019
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/019
ipPool: '{\"addresses\":[\"192.168.24.649-192.168.24.664\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-020
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cluster-api-provider-vsphere-tmp/020
folder: /SDDC-Datacenter/vm/prow/cluster-api-provider-vsphere-tmp/020
ipPool: '{\"addresses\":[\"192.168.24.665-192.168.24.680\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- type: vsphere-project-cloud-provider
resources:
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-001
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/001
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/001
ipPool: '{\"addresses\":[\"192.168.6.227\",\"192.168.6.228\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.201-192.168.24.216\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-002
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/002
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/002
ipPool: '{\"addresses\":[\"192.168.6.229\",\"192.168.6.230\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.217-192.168.24.232\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-003
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/003
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/003
ipPool: '{\"addresses\":[\"192.168.6.231\",\"192.168.6.232\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.233-192.168.24.248\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-004
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/004
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/004
ipPool: '{\"addresses\":[\"192.168.6.233\",\"192.168.6.234\"],\"gateway\":\"192.168.6.1\",\"prefix\":24}'
ipPool: '{\"addresses\":[\"192.168.24.249-192.168.24.264\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-005
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/005
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/005
ipPool: '{\"addresses\":[\"192.168.24.265-192.168.24.280\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-006
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/006
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/006
ipPool: '{\"addresses\":[\"192.168.24.281-192.168.24.296\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-007
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/007
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/007
ipPool: '{\"addresses\":[\"192.168.24.297-192.168.24.312\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-008
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/008
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/008
ipPool: '{\"addresses\":[\"192.168.24.313-192.168.24.328\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-009
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/009
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/009
ipPool: '{\"addresses\":[\"192.168.24.329-192.168.24.344\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- name: k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-010
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/cloud-provider-vsphere-tmp/010
folder: /SDDC-Datacenter/vm/prow/cloud-provider-vsphere-tmp/010
ipPool: '{\"addresses\":[\"192.168.24.345-192.168.24.360\"],\"gateway\":\"192.168.24.1\",\"prefix\":24}'
- type: vsphere-project-image-builder
resources:
- name: k8s-infra-e2e-boskos-vsphere-image-builder-001
Expand All @@ -61,3 +171,27 @@ resources:
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/image-builder-tmp/004
folder: /SDDC-Datacenter/vm/prow/image-builder-tmp/004
- name: k8s-infra-e2e-boskos-vsphere-image-builder-005
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/image-builder-tmp/005
folder: /SDDC-Datacenter/vm/prow/image-builder-tmp/005
- name: k8s-infra-e2e-boskos-vsphere-image-builder-006
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/image-builder-tmp/006
folder: /SDDC-Datacenter/vm/prow/image-builder-tmp/006
- name: k8s-infra-e2e-boskos-vsphere-image-builder-007
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/image-builder-tmp/007
folder: /SDDC-Datacenter/vm/prow/image-builder-tmp/007
- name: k8s-infra-e2e-boskos-vsphere-image-builder-008
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/image-builder-tmp/008
folder: /SDDC-Datacenter/vm/prow/image-builder-tmp/008
- name: k8s-infra-e2e-boskos-vsphere-image-builder-009
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/image-builder-tmp/009
folder: /SDDC-Datacenter/vm/prow/image-builder-tmp/009
- name: k8s-infra-e2e-boskos-vsphere-image-builder-010
userData:
resourcePool: /SDDC-Datacenter/host/Cluster-1/Resources/prow/image-builder-tmp/010
folder: /SDDC-Datacenter/vm/prow/image-builder-tmp/010
28 changes: 28 additions & 0 deletions tmp-boskos-poc/boskos/boskos-resources-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,48 @@ data:
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-002
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-003
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-004
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-005
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-006
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-007
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-008
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-009
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-010
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-011
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-012
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-013
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-014
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-015
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-016
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-017
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-018
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-019
- k8s-infra-e2e-boskos-vsphere-cluster-api-provider-vsphere-020
state: dirty
type: vsphere-project-cluster-api-provider
- names:
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-001
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-002
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-003
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-004
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-005
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-006
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-007
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-008
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-009
- k8s-infra-e2e-boskos-vsphere-cloud-provider-vsphere-010
state: dirty
type: vsphere-project-cloud-provider
- names:
- k8s-infra-e2e-boskos-vsphere-image-builder-001
- k8s-infra-e2e-boskos-vsphere-image-builder-002
- k8s-infra-e2e-boskos-vsphere-image-builder-003
- k8s-infra-e2e-boskos-vsphere-image-builder-004
- k8s-infra-e2e-boskos-vsphere-image-builder-005
- k8s-infra-e2e-boskos-vsphere-image-builder-006
- k8s-infra-e2e-boskos-vsphere-image-builder-007
- k8s-infra-e2e-boskos-vsphere-image-builder-008
- k8s-infra-e2e-boskos-vsphere-image-builder-009
- k8s-infra-e2e-boskos-vsphere-image-builder-010
state: dirty
type: vsphere-project-image-builder
kind: ConfigMap
Expand Down
6 changes: 3 additions & 3 deletions tmp-boskos-poc/vsphere/top-level.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ variable "vsphere_server" {

variable "nr_cluster_api_provider_projects" {
type = number
default = 4
default = 20
}

variable "nr_cloud_provider_projects" {
type = number
default = 4
default = 10
}

variable "nr_image_builder_projects" {
type = number
default = 4
default = 10
}

provider "vsphere" {
Expand Down

0 comments on commit 847e1d7

Please sign in to comment.