Skip to content

Commit 9ee5c19

Browse files
author
Samuel Beaulieu
committed
(maint) Fix jruby startup
Added a required package netbase for jruby to startup without a warning Added an optoin for ec2 to specify the root_keys_script to use
1 parent aeab4e8 commit 9ee5c19

File tree

9 files changed

+44
-26
lines changed

9 files changed

+44
-26
lines changed

‎docker/dev/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV RACK_ENV=production
1515

1616
RUN apt-get update -qq && \
1717
apt-get upgrade -y && \
18-
apt-get install -y --no-install-recommends make git && \
18+
apt-get install -y --no-install-recommends make git netbase && \
1919
apt-get clean autoclean && \
2020
apt-get autoremove -y && \
2121
rm -rf /var/lib/apt/lists/*

‎docker/prod-all-providers/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV RACK_ENV=production
1818

1919
RUN apt-get update -qq && \
2020
apt-get upgrade -y && \
21-
apt-get install -y --no-install-recommends make git && \
21+
apt-get install -y --no-install-recommends make git netbase && \
2222
apt-get clean autoclean && \
2323
apt-get autoremove -y && \
2424
rm -rf /var/lib/apt/lists/*

‎docker/test-all-providers/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV RACK_ENV=production
1818

1919
RUN apt-get update -qq && \
2020
apt-get upgrade -y && \
21-
apt-get install -y --no-install-recommends make git && \
21+
apt-get install -y --no-install-recommends make git netbase && \
2222
apt-get clean autoclean && \
2323
apt-get autoremove -y && \
2424
rm -rf /var/lib/apt/lists/*

‎docker/test-all-providers/Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/puppetlabs/vmpooler-provider-ec2.git
3-
revision: 7f539321523d47ffa6c001f4f300f7b21eb9a4d9
3+
revision: 13d0de6dc035c46dcd099d0b5e9b02bc19e8fcdd
44
specs:
55
vmpooler-provider-ec2 (0.0.1)
66
aws-sdk-ec2 (~> 1)

‎docs/index.yaml‎

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,22 @@ entries:
33
vmpooler:
44
- apiVersion: v2
55
appVersion: 1.7.0-prod-all-providers
6-
created: "2022-07-26T09:02:53.10743-05:00"
6+
created: "2022-07-26T13:40:19.309277-05:00"
7+
dependencies:
8+
- name: redis
9+
repository: https://charts.bitnami.com/bitnami
10+
version: 16.10.1
11+
description: A Helm chart to deploy vmpooler
12+
digest: fe0c76c54b8d65c0010e13fc09de9c37c9f054548758ac459271f63a4ad5ba1b
13+
icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
14+
name: vmpooler
15+
type: application
16+
urls:
17+
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.19.0.tgz
18+
version: 1.19.0
19+
- apiVersion: v2
20+
appVersion: 1.7.0-prod-all-providers
21+
created: "2022-07-26T13:40:19.303464-05:00"
722
dependencies:
823
- name: redis
924
repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
1833
version: 1.18.0
1934
- apiVersion: v2
2035
appVersion: 1.7.0-prod-all-providers
21-
created: "2022-07-26T09:02:53.10191-05:00"
36+
created: "2022-07-26T13:40:19.297544-05:00"
2237
dependencies:
2338
- name: redis
2439
repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
3348
version: 1.17.0
3449
- apiVersion: v2
3550
appVersion: 1.6.0-prod-all-providers
36-
created: "2022-07-26T09:02:53.095376-05:00"
51+
created: "2022-07-26T13:40:19.290363-05:00"
3752
dependencies:
3853
- name: redis
3954
repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
4863
version: 1.16.0
4964
- apiVersion: v2
5065
appVersion: 1.6.0-prod-all-providers
51-
created: "2022-07-26T09:02:53.072716-05:00"
66+
created: "2022-07-26T13:40:19.283765-05:00"
5267
dependencies:
5368
- name: redis
5469
repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
6378
version: 1.15.0
6479
- apiVersion: v2
6580
appVersion: 1.6.0-prod-all-providers
66-
created: "2022-07-26T09:02:53.062114-05:00"
81+
created: "2022-07-26T13:40:19.273245-05:00"
6782
dependencies:
6883
- name: redis
6984
repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
7893
version: 1.14.0
7994
- apiVersion: v2
8095
appVersion: 1.5.0-prod-all-providers
81-
created: "2022-07-26T09:02:53.053642-05:00"
96+
created: "2022-07-26T13:40:19.265276-05:00"
8297
dependencies:
8398
- name: redis
8499
repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
93108
version: 1.13.0
94109
- apiVersion: v2
95110
appVersion: 1.5.0-prod-all-providers
96-
created: "2022-07-26T09:02:53.043694-05:00"
111+
created: "2022-07-26T13:40:19.241595-05:00"
97112
dependencies:
98113
- name: redis
99114
repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
108123
version: 1.12.0
109124
- apiVersion: v2
110125
appVersion: 1.4.0-prod-all-providers
111-
created: "2022-07-26T09:02:53.024266-05:00"
126+
created: "2022-07-26T13:40:19.23447-05:00"
112127
dependencies:
113128
- name: redis
114129
repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
123138
version: 1.11.1
124139
- apiVersion: v2
125140
appVersion: 1.3.0-prod-all-providers
126-
created: "2022-07-26T09:02:53.016888-05:00"
141+
created: "2022-07-26T13:40:19.227105-05:00"
127142
dependencies:
128143
- name: redis
129144
repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
138153
version: 1.11.0
139154
- apiVersion: v2
140155
appVersion: 1.2.0-prod-all-providers
141-
created: "2022-07-26T09:02:53.009934-05:00"
156+
created: "2022-07-26T13:40:19.219749-05:00"
142157
dependencies:
143158
- name: redis
144159
repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
153168
version: 1.10.1
154169
- apiVersion: v2
155170
appVersion: 1.2.0-prod-all-providers
156-
created: "2022-07-26T09:02:53.000152-05:00"
171+
created: "2022-07-26T13:40:19.212795-05:00"
157172
dependencies:
158173
- name: redis
159174
repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
168183
version: 1.10.0
169184
- apiVersion: v2
170185
appVersion: 1.2.0-prod-all-providers
171-
created: "2022-07-26T09:02:53.199957-05:00"
186+
created: "2022-07-26T13:40:19.38233-05:00"
172187
dependencies:
173188
- name: redis
174189
repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
183198
version: 1.9.0
184199
- apiVersion: v2
185200
appVersion: 1.2.0-prod-all-providers
186-
created: "2022-07-26T09:02:53.192071-05:00"
201+
created: "2022-07-26T13:40:19.37631-05:00"
187202
dependencies:
188203
- name: redis
189204
repository: https://charts.bitnami.com/bitnami
@@ -198,7 +213,7 @@ entries:
198213
version: 1.8.0
199214
- apiVersion: v2
200215
appVersion: 1.0.0-prod-all-providers
201-
created: "2022-07-26T09:02:53.169331-05:00"
216+
created: "2022-07-26T13:40:19.368419-05:00"
202217
dependencies:
203218
- name: redis
204219
repository: https://charts.bitnami.com/bitnami
@@ -213,7 +228,7 @@ entries:
213228
version: 1.7.1
214229
- apiVersion: v2
215230
appVersion: 1.0.0-prod-all-providers
216-
created: "2022-07-26T09:02:53.161587-05:00"
231+
created: "2022-07-26T13:40:19.362069-05:00"
217232
dependencies:
218233
- name: redis
219234
repository: https://charts.bitnami.com/bitnami
@@ -228,7 +243,7 @@ entries:
228243
version: 1.7.0
229244
- apiVersion: v2
230245
appVersion: 1.3.0
231-
created: "2022-07-26T09:02:53.154765-05:00"
246+
created: "2022-07-26T13:40:19.337857-05:00"
232247
dependencies:
233248
- name: redis
234249
repository: https://charts.bitnami.com/bitnami
@@ -243,7 +258,7 @@ entries:
243258
version: 1.6.3
244259
- apiVersion: v2
245260
appVersion: 1.3.0
246-
created: "2022-07-26T09:02:53.141575-05:00"
261+
created: "2022-07-26T13:40:19.329764-05:00"
247262
dependencies:
248263
- name: redis
249264
repository: https://charts.bitnami.com/bitnami
@@ -258,7 +273,7 @@ entries:
258273
version: 1.6.2
259274
- apiVersion: v2
260275
appVersion: 1.3.0
261-
created: "2022-07-26T09:02:53.121686-05:00"
276+
created: "2022-07-26T13:40:19.322639-05:00"
262277
dependencies:
263278
- name: redis
264279
repository: https://charts.bitnami.com/bitnami
@@ -273,7 +288,7 @@ entries:
273288
version: 1.6.1
274289
- apiVersion: v2
275290
appVersion: 1.3.0
276-
created: "2022-07-26T09:02:53.114677-05:00"
291+
created: "2022-07-26T13:40:19.314257-05:00"
277292
dependencies:
278293
- name: redis
279294
repository: https://charts.bitnami.com/bitnami
@@ -286,4 +301,4 @@ entries:
286301
urls:
287302
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
288303
version: 1.6.0
289-
generated: "2022-07-26T09:02:52.984817-05:00"
304+
generated: "2022-07-26T13:40:19.197161-05:00"

‎docs/vmpooler-1.19.0.tgz‎

92.2 KB
Binary file not shown.

‎helm-charts/vmpooler/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: vmpooler
33
description: A Helm chart to deploy vmpooler
44
type: application
55
icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
6-
version: 1.18.0
7-
appVersion: 1.7.0-prod-all-providers
6+
version: 1.19.0
7+
appVersion: 1.8.0-prod-all-providers
88
dependencies:
99
- name: redis
1010
repository: https://charts.bitnami.com/bitnami

‎helm-charts/vmpooler/templates/deployment-manager.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ spec:
6767
value: '{{ .Values.gce.keyfile }}'
6868
- name: AWS_KEY_FILE_LOCATION
6969
value: '{{ .Values.ec2.keyfile }}'
70+
- name: ROOT_KEYS_SCRIPT
71+
value: '{{ .Values.ec2.root_keys_script }}'
7072
- name: JRUBY_OPTS
7173
value: '-J-XX:+UseG1GC'
7274
- name: TASK_LIMIT

‎helm-charts/vmpooler/values.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ gce:
1616

1717
ec2:
1818
keyfile: '/vault/secrets/ec2-keyfile.rsa'
19+
root_keys_script: ''
1920

2021
tracing:
2122
enabled: 'false'

0 commit comments

Comments
 (0)