mirror of
https://github.com/puppetlabs/vmpooler-deployment.git
synced 2026-01-26 03:28:41 -05:00
Including vmpooler-provider-gce in the Gemfile
Also assing a required ENV var and the location of the keyfile create helm tarball version 1.8.0 and index file
This commit is contained in:
Samuel Beaulieu
parent
4d15af416a
commit
46935a716a
10 changed files with 144 additions and 51 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
|||
/*/**/vendor/bundle/
|
||||
/docker/**/vmpooler.yaml
|
||||
.vagrant/
|
||||
.idea/
|
||||
|
|
@ -23,14 +23,16 @@ RUN apt-get update -qq && \
|
|||
apt-get autoremove -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN gem install bundler && \
|
||||
gem update --system 3.2.3
|
||||
|
||||
COPY ./docker-entrypoint.sh /usr/local/bin/
|
||||
|
||||
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
|
||||
|
||||
COPY ./Gemfile* ./
|
||||
|
||||
RUN gem install bundler && \
|
||||
bundle config set --local jobs 3 && \
|
||||
RUN bundle config set --local jobs 3 && \
|
||||
bundle install
|
||||
|
||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
||||
|
||||
gem 'vmpooler', '~> 2.1'
|
||||
gem 'vmpooler', '~> 2.2'
|
||||
gem 'vmpooler-provider-vsphere', '~> 1.5'
|
||||
gem 'vmpooler-provider-gce', '~> 0.1'
|
||||
|
|
|
|||
|
|
@ -1,32 +1,74 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
bindata (2.4.10)
|
||||
builder (3.2.4)
|
||||
concurrent-ruby (1.1.9)
|
||||
connection_pool (2.2.5)
|
||||
faraday (1.8.0)
|
||||
declarative (0.0.20)
|
||||
deep_merge (1.2.2)
|
||||
faraday (1.9.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.1)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
google-apis-compute_v1 (0.23.0)
|
||||
google-apis-core (>= 0.4, < 2.a)
|
||||
google-apis-core (0.4.1)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
httpclient (>= 2.8.1, < 3.a)
|
||||
mini_mime (~> 1.0)
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.a)
|
||||
rexml
|
||||
webrick
|
||||
google-apis-dns_v1 (0.17.0)
|
||||
google-apis-core (>= 0.4, < 2.a)
|
||||
google-cloud-core (1.6.0)
|
||||
google-cloud-env (~> 1.0)
|
||||
google-cloud-errors (~> 1.0)
|
||||
google-cloud-dns (0.35.1)
|
||||
google-apis-dns_v1 (~> 0.1)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
zonefile (~> 1.04)
|
||||
google-cloud-env (1.5.0)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
google-cloud-errors (1.2.0)
|
||||
googleauth (0.16.2)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
memoist (~> 0.16)
|
||||
multi_json (~> 1.11)
|
||||
os (>= 0.9, < 2.0)
|
||||
signet (~> 0.14)
|
||||
httpclient (2.8.3)
|
||||
json (2.6.1-java)
|
||||
jwt (2.3.0)
|
||||
memoist (0.16.2)
|
||||
mini_mime (1.1.2)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.1.1)
|
||||
mustermann (1.1.1)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
|
|
@ -34,36 +76,42 @@ GEM
|
|||
nio4r (2.5.8-java)
|
||||
nokogiri (1.12.5-java)
|
||||
racc (~> 1.4)
|
||||
opentelemetry-api (0.17.0)
|
||||
opentelemetry-common (0.17.0)
|
||||
opentelemetry-api (~> 0.17.0)
|
||||
opentelemetry-exporter-jaeger (0.17.0)
|
||||
opentelemetry-api (~> 0.17.0)
|
||||
opentelemetry-common (~> 0.17.0)
|
||||
opentelemetry-sdk (~> 0.17.0)
|
||||
opentelemetry-api (1.0.1)
|
||||
opentelemetry-common (0.19.3)
|
||||
opentelemetry-api (~> 1.0)
|
||||
opentelemetry-exporter-jaeger (0.20.1)
|
||||
opentelemetry-api (~> 1.0)
|
||||
opentelemetry-common (~> 0.19.2)
|
||||
opentelemetry-sdk (~> 1.0)
|
||||
thrift
|
||||
opentelemetry-instrumentation-base (0.17.0)
|
||||
opentelemetry-api (~> 0.17.0)
|
||||
opentelemetry-instrumentation-concurrent_ruby (0.17.0)
|
||||
opentelemetry-api (~> 0.17.0)
|
||||
opentelemetry-instrumentation-base (~> 0.17.0)
|
||||
opentelemetry-instrumentation-redis (0.17.0)
|
||||
opentelemetry-api (~> 0.17.0)
|
||||
opentelemetry-common (~> 0.17.0)
|
||||
opentelemetry-instrumentation-base (~> 0.17.0)
|
||||
opentelemetry-instrumentation-sinatra (0.17.0)
|
||||
opentelemetry-api (~> 0.17.0)
|
||||
opentelemetry-instrumentation-base (~> 0.17.0)
|
||||
opentelemetry-resource_detectors (0.17.0)
|
||||
opentelemetry-instrumentation-base (0.19.0)
|
||||
opentelemetry-api (~> 1.0)
|
||||
opentelemetry-instrumentation-concurrent_ruby (0.19.2)
|
||||
opentelemetry-api (~> 1.0)
|
||||
opentelemetry-instrumentation-base (~> 0.19.0)
|
||||
opentelemetry-instrumentation-redis (0.21.2)
|
||||
opentelemetry-api (~> 1.0)
|
||||
opentelemetry-common (~> 0.19.3)
|
||||
opentelemetry-instrumentation-base (~> 0.19.0)
|
||||
opentelemetry-instrumentation-sinatra (0.19.3)
|
||||
opentelemetry-api (~> 1.0)
|
||||
opentelemetry-common (~> 0.19.3)
|
||||
opentelemetry-instrumentation-base (~> 0.19.0)
|
||||
opentelemetry-resource_detectors (0.19.1)
|
||||
google-cloud-env
|
||||
opentelemetry-sdk
|
||||
opentelemetry-sdk (0.17.0)
|
||||
opentelemetry-api (~> 0.17.0)
|
||||
opentelemetry-common (~> 0.17.0)
|
||||
opentelemetry-instrumentation-base (~> 0.17.0)
|
||||
opentelemetry-sdk (1.0.2)
|
||||
opentelemetry-api (~> 1.0)
|
||||
opentelemetry-common (~> 0.19.3)
|
||||
opentelemetry-instrumentation-base (~> 0.19.0)
|
||||
opentelemetry-semantic_conventions
|
||||
opentelemetry-semantic_conventions (1.8.0)
|
||||
opentelemetry-api (~> 1.0)
|
||||
optimist (3.0.1)
|
||||
os (1.1.4)
|
||||
pickup (0.0.11)
|
||||
prometheus-client (2.1.0)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.5.2-java)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.6.0-java)
|
||||
|
|
@ -77,7 +125,18 @@ GEM
|
|||
nokogiri (~> 1.10)
|
||||
optimist (~> 3.0)
|
||||
redis (4.5.1)
|
||||
representable (3.1.1)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.1.2)
|
||||
rexml (3.2.5)
|
||||
ruby2_keywords (0.0.5)
|
||||
signet (0.16.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
sinatra (2.1.0)
|
||||
mustermann (~> 1.0)
|
||||
rack (~> 2.2)
|
||||
|
|
@ -88,17 +147,20 @@ GEM
|
|||
statsd-ruby (1.5.0)
|
||||
thrift (0.15.0)
|
||||
tilt (2.0.10)
|
||||
vmpooler (2.1.0)
|
||||
trailblazer-option (0.1.2)
|
||||
uber (0.1.0)
|
||||
vmpooler (2.2.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
connection_pool (~> 2.2)
|
||||
deep_merge (~> 1.2)
|
||||
net-ldap (~> 0.16)
|
||||
nokogiri (~> 1.10)
|
||||
opentelemetry-exporter-jaeger (= 0.17.0)
|
||||
opentelemetry-instrumentation-concurrent_ruby (= 0.17.0)
|
||||
opentelemetry-instrumentation-redis (= 0.17.0)
|
||||
opentelemetry-instrumentation-sinatra (= 0.17.0)
|
||||
opentelemetry-resource_detectors (= 0.17.0)
|
||||
opentelemetry-sdk (= 0.17.0)
|
||||
opentelemetry-exporter-jaeger (= 0.20.1)
|
||||
opentelemetry-instrumentation-concurrent_ruby (= 0.19.2)
|
||||
opentelemetry-instrumentation-redis (= 0.21.2)
|
||||
opentelemetry-instrumentation-sinatra (= 0.19.3)
|
||||
opentelemetry-resource_detectors (= 0.19.1)
|
||||
opentelemetry-sdk (~> 1.0, >= 1.0.2)
|
||||
pickup (~> 0.0.11)
|
||||
prometheus-client (~> 2.0)
|
||||
puma (~> 5.0, >= 5.0.4)
|
||||
|
|
@ -108,15 +170,22 @@ GEM
|
|||
sinatra (~> 2.0)
|
||||
spicy-proton (~> 2.1)
|
||||
statsd-ruby (~> 1.4)
|
||||
vmpooler-provider-gce (0.1.2)
|
||||
google-apis-compute_v1 (~> 0.14)
|
||||
google-cloud-dns (~> 0.35.1)
|
||||
googleauth (~> 0.16.2)
|
||||
vmpooler-provider-vsphere (1.5.0)
|
||||
rbvmomi (>= 2.1, < 4.0)
|
||||
webrick (1.7.0)
|
||||
zonefile (1.06)
|
||||
|
||||
PLATFORMS
|
||||
universal-java-1.8
|
||||
|
||||
DEPENDENCIES
|
||||
vmpooler (~> 2.1)
|
||||
vmpooler (~> 2.2)
|
||||
vmpooler-provider-gce (~> 0.1)
|
||||
vmpooler-provider-vsphere (~> 1.5)
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.33
|
||||
2.3.4
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
docker run -it --rm \
|
||||
-v $(pwd):/app \
|
||||
$(grep ^FROM ./Dockerfile |cut -d ' ' -f2) \
|
||||
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
|
||||
/bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make && cd /app && gem install bundler && gem update --system 3.2.3 && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
|
||||
|
|
|
|||
|
|
@ -1,9 +1,24 @@
|
|||
apiVersion: v1
|
||||
entries:
|
||||
vmpooler:
|
||||
- apiVersion: v2
|
||||
appVersion: 1.2.0-prod-all-providers
|
||||
created: "2022-01-12T08:59:02.996495-06:00"
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
version: 10.7.12
|
||||
description: A Helm chart to deploy vmpooler
|
||||
digest: d4dbe07b51f498c50d9d622b84af163992775e236a72d34f2c5760499c7520aa
|
||||
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-1.8.0.tgz
|
||||
version: 1.8.0
|
||||
- apiVersion: v2
|
||||
appVersion: 1.0.0-prod-all-providers
|
||||
created: "2021-12-13T12:57:32.31814774-05:00"
|
||||
created: "2022-01-12T08:59:02.992362-06:00"
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
@ -18,7 +33,7 @@ entries:
|
|||
version: 1.7.1
|
||||
- apiVersion: v2
|
||||
appVersion: 1.0.0-prod-all-providers
|
||||
created: "2021-12-13T12:57:32.315394959-05:00"
|
||||
created: "2022-01-12T08:59:02.987978-06:00"
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
@ -33,7 +48,7 @@ entries:
|
|||
version: 1.7.0
|
||||
- apiVersion: v2
|
||||
appVersion: 1.3.0
|
||||
created: "2021-12-13T12:57:32.312208652-05:00"
|
||||
created: "2022-01-12T08:59:02.98291-06:00"
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
@ -48,7 +63,7 @@ entries:
|
|||
version: 1.6.3
|
||||
- apiVersion: v2
|
||||
appVersion: 1.3.0
|
||||
created: "2021-12-13T12:57:32.308927559-05:00"
|
||||
created: "2022-01-12T08:59:02.978542-06:00"
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
@ -63,7 +78,7 @@ entries:
|
|||
version: 1.6.2
|
||||
- apiVersion: v2
|
||||
appVersion: 1.3.0
|
||||
created: "2021-12-13T12:57:32.306210785-05:00"
|
||||
created: "2022-01-12T08:59:02.973556-06:00"
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
@ -78,7 +93,7 @@ entries:
|
|||
version: 1.6.1
|
||||
- apiVersion: v2
|
||||
appVersion: 1.3.0
|
||||
created: "2021-12-13T12:57:32.302874489-05:00"
|
||||
created: "2022-01-12T08:59:02.96866-06:00"
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
@ -91,4 +106,4 @@ entries:
|
|||
urls:
|
||||
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
|
||||
version: 1.6.0
|
||||
generated: "2021-12-13T12:57:32.298620936-05:00"
|
||||
generated: "2022-01-12T08:59:02.961652-06:00"
|
||||
|
|
|
|||
BIN
docs/vmpooler-1.8.0.tgz
Normal file
BIN
docs/vmpooler-1.8.0.tgz
Normal file
Binary file not shown.
|
|
@ -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: 1.7.1
|
||||
appVersion: 1.0.0-prod-all-providers
|
||||
version: 1.8.0
|
||||
appVersion: 1.2.0-prod-all-providers
|
||||
dependencies:
|
||||
- name: redis
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
|
|
|
|||
|
|
@ -63,6 +63,8 @@ spec:
|
|||
initialDelaySeconds: 40
|
||||
periodSeconds: 10
|
||||
env:
|
||||
- name: GOOGLE_APPLICATION_CREDENTIALS
|
||||
value: '{{ .Values.gce.keyfile }}'
|
||||
- name: JRUBY_OPTS
|
||||
value: '-J-XX:+UseG1GC -Xinvokedynamic.yield=false'
|
||||
- name: TASK_LIMIT
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@ configmapName: 'vmpooler-baseconfig'
|
|||
sut_domain: 'vmpooler.example.com'
|
||||
usage_stats: true
|
||||
|
||||
gce:
|
||||
keyfile: '/vault/secrets/gce-keyfile.json' #.json private key, set in ENV var
|
||||
|
||||
tracing:
|
||||
enabled: 'false'
|
||||
# jaegerHost: 'http://otel-collector.otel-collector.svc:14268/api/traces'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue