diff --git a/docker/data/vmpooler.yaml b/docker/data/vmpooler.yaml index 1355be2..7173815 100644 --- a/docker/data/vmpooler.yaml +++ b/docker/data/vmpooler.yaml @@ -1,7 +1,10 @@ --- :dns_configs: - ddns_domain: 'dynamic.example.com' + :delivery: + dns_class: dynamic-dns + domain: delivery.puppetlabs.net :gcp-clouddns: + dns_class: gcp project: vmpooler-example domain: vmpooler.example.com dns_zone_resource_name: vmpooler-example-com @@ -12,9 +15,14 @@ # project: vmpooler-example # title: gce # zone: us-west1-b - - :dummy: - filename: '/tmp/dummy-backing.yaml' + :vsphere: + connection_pool_size: 65 + connection_pool_timeout: 200 + insecure: true + password: 1Skip-vervain-alter-teethe + provider_class: vsphere + server: vcenter-ci-prod-2.it.puppet.net + username: vmpooler@vsphere.local :prometheus: prefix: 'vmpooler-local' @@ -38,19 +46,16 @@ - 'project' :pools: - # - name: 'fedora-36-x86_64' - # template: 'projects/fedora-cloud/global/images/fedora-cloud-base-gcp-36-20220506-n-0-x86-64' - # size: 0 - # provider: 'gce' - # dns_plugin: 'google-clouddns' - # machine_type: 'zones/us-west1-b/machineTypes/n1-standard-2' - # disk_type: 'pd-ssd' - # subnetwork_name: 'projects/vmpooler-example/regions/us-west1/subnetworks/default' - - name: 'debian-11-x86_64' - template: 'Templates/debian-11-x86_64' - folder: 'Pooled VMs/debian-11-x86_64' - datastore: 'vmstorage' - size: 5 - timeout: 15 - ready_ttl: 1440 - provider: dummy + - name: 'almalinux-8-x86_64' + alias: [ 'almalinux-8-64', 'almalinux-8-amd64' ] + template: 'templates/vmpooler_acceptance5/almalinux-8-x86_64-0.0.2' + folder: 'isaac/acceptance5/almalinux-8-x86_64' + datastore: 'vmpooler_acceptance5' + clone_target: 'acceptance5' + size: 0 + datacenter: 'pix' + provider: 'vsphere' + snapshot_mainMem_ioBlockPages: '2048' + snapshot_mainMem_iowait: '5' + network: 'vmpooler2' + dns_plugin: 'delivery' diff --git a/docker/data/vmpooler.yaml.c b/docker/data/vmpooler.yaml.c new file mode 100644 index 0000000..1355be2 --- /dev/null +++ b/docker/data/vmpooler.yaml.c @@ -0,0 +1,56 @@ +--- +:dns_configs: + ddns_domain: 'dynamic.example.com' + :gcp-clouddns: + project: vmpooler-example + domain: vmpooler.example.com + dns_zone_resource_name: vmpooler-example-com + +:providers: + # :gce: + # network_name: projects/vmpooler-example/global/networks/default + # project: vmpooler-example + # title: gce + # zone: us-west1-b + + :dummy: + filename: '/tmp/dummy-backing.yaml' + +:prometheus: + prefix: 'vmpooler-local' + +:redis: + server: 'redis-server' + +:auth: + provider: 'dummy' + +:config: + site_name: 'vmpooler' + logfile: '/var/log/vmpooler.log' + task_limit: 10 + timeout: 15 + vm_checktime: 1 + vm_lifetime: 12 + vm_lifetime_auth: 24 + allowed_tags: + - 'created_by' + - 'project' + +:pools: + # - name: 'fedora-36-x86_64' + # template: 'projects/fedora-cloud/global/images/fedora-cloud-base-gcp-36-20220506-n-0-x86-64' + # size: 0 + # provider: 'gce' + # dns_plugin: 'google-clouddns' + # machine_type: 'zones/us-west1-b/machineTypes/n1-standard-2' + # disk_type: 'pd-ssd' + # subnetwork_name: 'projects/vmpooler-example/regions/us-west1/subnetworks/default' + - name: 'debian-11-x86_64' + template: 'Templates/debian-11-x86_64' + folder: 'Pooled VMs/debian-11-x86_64' + datastore: 'vmstorage' + size: 5 + timeout: 15 + ready_ttl: 1440 + provider: dummy diff --git a/docker/data/vmpooler.yaml.c2 b/docker/data/vmpooler.yaml.c2 new file mode 100644 index 0000000..7173815 --- /dev/null +++ b/docker/data/vmpooler.yaml.c2 @@ -0,0 +1,61 @@ +--- +:dns_configs: + :delivery: + dns_class: dynamic-dns + domain: delivery.puppetlabs.net + :gcp-clouddns: + dns_class: gcp + project: vmpooler-example + domain: vmpooler.example.com + dns_zone_resource_name: vmpooler-example-com + +:providers: + # :gce: + # network_name: projects/vmpooler-example/global/networks/default + # project: vmpooler-example + # title: gce + # zone: us-west1-b + :vsphere: + connection_pool_size: 65 + connection_pool_timeout: 200 + insecure: true + password: 1Skip-vervain-alter-teethe + provider_class: vsphere + server: vcenter-ci-prod-2.it.puppet.net + username: vmpooler@vsphere.local + +:prometheus: + prefix: 'vmpooler-local' + +:redis: + server: 'redis-server' + +:auth: + provider: 'dummy' + +:config: + site_name: 'vmpooler' + logfile: '/var/log/vmpooler.log' + task_limit: 10 + timeout: 15 + vm_checktime: 1 + vm_lifetime: 12 + vm_lifetime_auth: 24 + allowed_tags: + - 'created_by' + - 'project' + +:pools: + - name: 'almalinux-8-x86_64' + alias: [ 'almalinux-8-64', 'almalinux-8-amd64' ] + template: 'templates/vmpooler_acceptance5/almalinux-8-x86_64-0.0.2' + folder: 'isaac/acceptance5/almalinux-8-x86_64' + datastore: 'vmpooler_acceptance5' + clone_target: 'acceptance5' + size: 0 + datacenter: 'pix' + provider: 'vsphere' + snapshot_mainMem_ioBlockPages: '2048' + snapshot_mainMem_iowait: '5' + network: 'vmpooler2' + dns_plugin: 'delivery' diff --git a/docs/index.yaml b/docs/index.yaml index 15a8f59..0e726b3 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,7 +3,7 @@ entries: vmpooler: - apiVersion: v2 appVersion: 5.1.0 - created: "2023-08-03T14:06:33.753208438Z" + created: "2023-08-10T16:25:40.014437992Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -17,23 +17,23 @@ entries: - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-3.1.0.tgz version: 3.1.0 - apiVersion: v2 - appVersion: pr105-ce44d46931462ca2d6d36ea1add57f72e84b07f6 - created: "2023-08-03T14:06:33.744010555Z" + appVersion: pr105-f41a5f83e93a4da560bb2df7a1ce950f0ec7bb70 + created: "2023-08-10T16:25:40.004466861Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami version: 17.11.3 description: A Helm chart to deploy vmpooler - digest: 3a1a5b0a8c5be1a34a130770c9886ee1df2bc09e9553114d4d7b0c7d9485c112 + digest: 2b8c2cf747b8b3cfb6070decefcfd252d56cc68ed6786ce8839c1cfe97624a5f icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png name: vmpooler type: application urls: - - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-3.1.0-rc.4.tgz - version: 3.1.0-rc.4 + - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-3.1.0-rc.3.tgz + version: 3.1.0-rc.3 - apiVersion: v2 appVersion: 5.0.0 - created: "2023-08-03T14:06:33.734597839Z" + created: "2023-08-10T16:25:39.99509118Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -48,7 +48,7 @@ entries: version: 3.0.0 - apiVersion: v2 appVersion: 4.1.0 - created: "2023-08-03T14:06:33.724308809Z" + created: "2023-08-10T16:25:39.984516745Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -63,7 +63,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 4.0.0 - created: "2023-08-03T14:06:33.715585764Z" + created: "2023-08-10T16:25:39.974967239Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -78,7 +78,7 @@ entries: version: 2.1.0 - apiVersion: v2 appVersion: 4.0.0 - created: "2023-08-03T14:06:33.705109412Z" + created: "2023-08-10T16:25:39.965188073Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -93,7 +93,7 @@ entries: version: 2.0.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2023-08-03T14:06:33.628840651Z" + created: "2023-08-10T16:25:39.897455767Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -108,7 +108,7 @@ entries: version: 1.19.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2023-08-03T14:06:33.617105466Z" + created: "2023-08-10T16:25:39.888137947Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -123,7 +123,7 @@ entries: version: 1.18.0 - apiVersion: v2 appVersion: 1.7.0-prod-all-providers - created: "2023-08-03T14:06:33.603694601Z" + created: "2023-08-10T16:25:39.878311086Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -138,7 +138,7 @@ entries: version: 1.17.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2023-08-03T14:06:33.591807225Z" + created: "2023-08-10T16:25:39.868677415Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -153,7 +153,7 @@ entries: version: 1.16.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2023-08-03T14:06:33.578952735Z" + created: "2023-08-10T16:25:39.857837577Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -168,7 +168,7 @@ entries: version: 1.15.0 - apiVersion: v2 appVersion: 1.6.0-prod-all-providers - created: "2023-08-03T14:06:33.566878748Z" + created: "2023-08-10T16:25:39.848900975Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -183,7 +183,7 @@ entries: version: 1.14.0 - apiVersion: v2 appVersion: 1.5.0-prod-all-providers - created: "2023-08-03T14:06:33.553772245Z" + created: "2023-08-10T16:25:39.837905208Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -198,7 +198,7 @@ entries: version: 1.13.0 - apiVersion: v2 appVersion: 1.5.0-prod-all-providers - created: "2023-08-03T14:06:33.541534277Z" + created: "2023-08-10T16:25:39.827548962Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -213,7 +213,7 @@ entries: version: 1.12.0 - apiVersion: v2 appVersion: 1.4.0-prod-all-providers - created: "2023-08-03T14:06:33.528438551Z" + created: "2023-08-10T16:25:39.819193178Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -228,7 +228,7 @@ entries: version: 1.11.1 - apiVersion: v2 appVersion: 1.3.0-prod-all-providers - created: "2023-08-03T14:06:33.518014035Z" + created: "2023-08-10T16:25:39.81061807Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -243,7 +243,7 @@ entries: version: 1.11.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2023-08-03T14:06:33.507810392Z" + created: "2023-08-10T16:25:39.801319353Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -258,7 +258,7 @@ entries: version: 1.10.1 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2023-08-03T14:06:33.496091276Z" + created: "2023-08-10T16:25:39.792291137Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -273,7 +273,7 @@ entries: version: 1.10.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2023-08-03T14:06:33.696414982Z" + created: "2023-08-10T16:25:39.955947855Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -288,7 +288,7 @@ entries: version: 1.9.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2023-08-03T14:06:33.688301897Z" + created: "2023-08-10T16:25:39.948192297Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -303,7 +303,7 @@ entries: version: 1.8.0 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2023-08-03T14:06:33.680637982Z" + created: "2023-08-10T16:25:39.940884248Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -318,7 +318,7 @@ entries: version: 1.7.1 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2023-08-03T14:06:33.672084904Z" + created: "2023-08-10T16:25:39.933903297Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -333,7 +333,7 @@ entries: version: 1.7.0 - apiVersion: v2 appVersion: 1.3.0 - created: "2023-08-03T14:06:33.663206327Z" + created: "2023-08-10T16:25:39.927017337Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -348,7 +348,7 @@ entries: version: 1.6.3 - apiVersion: v2 appVersion: 1.3.0 - created: "2023-08-03T14:06:33.65521661Z" + created: "2023-08-10T16:25:39.919118343Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -363,7 +363,7 @@ entries: version: 1.6.2 - apiVersion: v2 appVersion: 1.3.0 - created: "2023-08-03T14:06:33.647731967Z" + created: "2023-08-10T16:25:39.912238338Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -378,7 +378,7 @@ entries: version: 1.6.1 - apiVersion: v2 appVersion: 1.3.0 - created: "2023-08-03T14:06:33.637180861Z" + created: "2023-08-10T16:25:39.904381717Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -391,4 +391,4 @@ entries: urls: - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz version: 1.6.0 -generated: "2023-08-03T14:06:33.480694148Z" +generated: "2023-08-10T16:25:39.781207465Z" diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml index d6a36ba..912ad23 100644 --- a/helm-charts/vmpooler/Chart.yaml +++ b/helm-charts/vmpooler/Chart.yaml @@ -3,8 +3,8 @@ name: vmpooler description: A Helm chart to deploy vmpooler type: application icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png -version: 3.1.0-rc.4 -appVersion: pr105-ce44d46931462ca2d6d36ea1add57f72e84b07f6 +version: 3.1.0-rc.3 +appVersion: pr105-f41a5f83e93a4da560bb2df7a1ce950f0ec7bb70 dependencies: - name: redis repository: https://charts.bitnami.com/bitnami