Skip to content

Commit c081251

Browse files
committed
Update local development for vmpooler 3.0
1 parent 9b12364 commit c081251

File tree

7 files changed

+55
-33
lines changed

7 files changed

+55
-33
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*/**/vendor/bundle/
22
/docker/**/vmpooler.yaml
3+
/docker/data/*.json
34
.vagrant/
45
.idea/
56
helm-charts/vmpooler/charts/

README.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# vmpooler-deployment
22

3-
- [vmpooler-deployment](#vmpooler-deployment)
4-
- [VMPooler Components](#vmpooler-components)
5-
- [Docker Registry](#docker-registry)
6-
- [Helm Repository](#helm-repository)
7-
- [Adding / updating charts](#adding--updating-charts)
8-
- [Development](#development)
9-
- [Docker Compose URLs](#docker-compose-urls)
10-
- [Deploy Chart for Testing](#deploy-chart-for-testing)
11-
- [Releasing](#releasing)
12-
- [Contributing](#contributing)
13-
- [License](#license)
3+
- [VMPooler Components](#vmpooler-components)
4+
- [Docker Registry](#docker-registry)
5+
- [Helm Repository](#helm-repository)
6+
- [Adding / updating charts](#adding--updating-charts)
7+
- [Development](#development)
8+
- [Docker Compose URLs](#docker-compose-urls)
9+
- [Deploy Chart for Testing](#deploy-chart-for-testing)
10+
- [Releasing](#releasing)
11+
- [Contributing](#contributing)
12+
- [License](#license)
1413

1514
This repo contains Dockerfiles and a Helm chart that can be used to deploy [VMPooler](https://github.com/puppetlabs/vmpooler). The Release Engineering team at Puppet uses the code here as part of operating our VMPooler instances.
1615

@@ -19,6 +18,7 @@ This repo contains Dockerfiles and a Helm chart that can be used to deploy [VMPo
1918
The docker image gnerated and hosted by this project contain the following VMPooler components:
2019

2120
- [VMPooler Core](https://github.com/puppetlabs/vmpooler)
21+
- [VMPooler Google CloudDNS Plugin](https://github.com/puppetlabs/vmpooler-dns-google-clouddns)
2222
- [VMPooler EC2 Provider](https://github.com/puppetlabs/vmpooler-provider-ec2)
2323
- [VMPooler GCE Provider](https://github.com/puppetlabs/vmpooler-provider-gce)
2424
- [VMPooler vSphere Provider](https://github.com/puppetlabs/vmpooler-provider-vsphere)
@@ -56,13 +56,16 @@ Prerequisites:
5656
- [vmpooler-provider-ec2](https://github.com/puppetlabs/vmpooler-provider-ec2)
5757
- [vmpooler-provider-gce](https://github.com/puppetlabs/vmpooler-provider-gce)
5858
- [vmpooler-provider-vsphere](https://github.com/puppetlabs/vmpooler-provider-vsphere)
59+
- If you are not using Dynamic DNS, then the following DNS plugins can be used to manage records across different compute providers:
60+
- [VMPooler Google CloudDNS Plugin](https://github.com/puppetlabs/vmpooler-dns-google-clouddns)
5961
2. Chose a Development method:
6062
- Develop via local source:
6163
1. Clone all of the known vmpooler projects listed at [vmpooler-components](#vmpooler-components) under a common directory, for example:
6264

6365
```bash
6466
|-- vmpooler-projects
6567
| |--vmpooler-deployment
68+
| |--vmpooler-dns-google-clouddns
6669
| |--vmpooler-provider-ec2
6770
| |--vmpooler-provider-gce
6871
| |--vmpooler-provider-vsphere
@@ -72,10 +75,10 @@ Prerequisites:
7275
3. Run `docker compose -f vmpooler-deployment/docker/docker-compose.local.yml up`
7376

7477
- Develop via Git source:
75-
1. For the component(s) you are developing on, commit and push changes to a branch.
76-
2. Change to the `docker` directory and modify the `Gemfile` as needed to pull the gem(s) from your git branch.
77-
3. Run `./update-gemfile-lock` to update the `Gemfile.lock`
78-
4. Run `docker compose build && docker compose up`.
78+
4. For the component(s) you are developing on, commit and push changes to a branch.
79+
5. Change to the `docker` directory and modify the `Gemfile` as needed to pull the gem(s) from your git branch.
80+
6. Run `./update-gemfile-lock` to update the `Gemfile.lock`
81+
7. Run `docker compose build && docker compose up`.
7982

8083
When a dependency Helm chart is updated, be sure to run `./update-chart-lock` to update the lockfile, otherwise the test and release workflows will fail.
8184

docker/Dockerfile.local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN apt-get update -qq && \
2525
rm -rf /var/lib/apt/lists/*
2626

2727
COPY vmpooler /opt/vmpooler
28+
COPY vmpooler-dns-gcp /opt/vmpooler-dns-gcp
2829
COPY vmpooler-provider-ec2 /opt/vmpooler-provider-ec2
2930
COPY vmpooler-provider-gce /opt/vmpooler-provider-gce
3031
COPY vmpooler-provider-vsphere /opt/vmpooler-provider-vsphere

docker/Gemfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

docker/Gemfile.local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
22

33
gem 'vmpooler', path: '/opt/vmpooler'
4+
gem 'vmpooler-dns-gcp', path: '/opt/vmpooler-dns-gcp'
45
gem 'vmpooler-provider-ec2', path: '/opt/vmpooler-provider-ec2'
56
gem 'vmpooler-provider-gce', path: '/opt/vmpooler-provider-gce'
67
gem 'vmpooler-provider-vsphere', path: '/opt/vmpooler-provider-vsphere'

docker/data/vmpooler.yaml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
---
2+
:dns_configs:
3+
ddns_domain: 'dynamic.example.com'
4+
:gcp-clouddns:
5+
project: vmpooler-example
6+
domain: vmpooler.example.com
7+
dns_zone_resource_name: vmpooler-example-com
8+
29
:providers:
10+
# :gce:
11+
# network_name: projects/vmpooler-example/global/networks/default
12+
# project: vmpooler-example
13+
# title: gce
14+
# zone: us-west1-b
15+
316
:dummy:
417
filename: '/tmp/dummy-backing.yaml'
518

@@ -23,13 +36,19 @@
2336
allowed_tags:
2437
- 'created_by'
2538
- 'project'
26-
domain: 'example.com'
27-
# domain: 'localhost' # Flip these out for local requests
2839

2940
:pools:
30-
- name: 'debian-10-x86_64'
31-
template: 'Templates/debian-7-x86_64'
32-
folder: 'Pooled VMs/debian-7-x86_64'
41+
# - name: 'fedora-36-x86_64'
42+
# template: 'projects/fedora-cloud/global/images/fedora-cloud-base-gcp-36-20220506-n-0-x86-64'
43+
# size: 0
44+
# provider: 'gce'
45+
# dns_plugin: 'google-clouddns'
46+
# machine_type: 'zones/us-west1-b/machineTypes/n1-standard-2'
47+
# disk_type: 'pd-ssd'
48+
# subnetwork_name: 'projects/vmpooler-example/regions/us-west1/subnetworks/default'
49+
- name: 'debian-11-x86_64'
50+
template: 'Templates/debian-11-x86_64'
51+
folder: 'Pooled VMs/debian-11-x86_64'
3352
datastore: 'vmstorage'
3453
size: 5
3554
timeout: 15

docker/docker-compose.local.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,21 @@ services:
4141
- type: bind
4242
source: ./data/vmpooler.yaml
4343
target: /etc/vmpooler/vmpooler.yaml
44+
# - type: bind
45+
# source: ./data/vmpooler-example-key.json
46+
# target: /etc/vmpooler/vmpooler-example-key.json
4447
ports:
4548
- "8082:4567"
4649
environment:
4750
- VMPOOLER_DEBUG=true # for use of dummy auth
51+
- DEBUG_FLAG=true
4852
- VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
4953
- REDIS_SERVER=redis-server
5054
- REDIS_PASSWORD=vmpooler
5155
- LOGFILE=/dev/null
5256
- VMPOOLER_TRACING_ENABLED=true
5357
- VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
58+
# - GOOGLE_APPLICATION_CREDENTIALS=/etc/vmpooler/vmpooler-example-key.json
5459
command: api
5560
links:
5661
- redis-server
@@ -63,16 +68,21 @@ services:
6368
- type: bind
6469
source: ./data/vmpooler.yaml
6570
target: /etc/vmpooler/vmpooler.yaml
71+
# - type: bind
72+
# source: ./data/vmpooler-example-key.json
73+
# target: /etc/vmpooler/vmpooler-example-key.json
6674
ports:
6775
- "8083:4567"
6876
environment:
6977
- VMPOOLER_DEBUG=true # for use of dummy auth
78+
- DEBUG_FLAG=true
7079
- VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
7180
- REDIS_SERVER=redis-server
7281
- REDIS_PASSWORD=vmpooler
7382
- LOGFILE=/dev/null
7483
- VMPOOLER_TRACING_ENABLED=true
7584
- VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
85+
# - GOOGLE_APPLICATION_CREDENTIALS=/etc/vmpooler/vmpooler-example-key.json
7686
command: manager
7787
links:
7888
- redis-server

0 commit comments

Comments
 (0)