Merge pull request #52 from puppetlabs/maint-fix-jruby

(maint) Fix jruby startup
puppetlabs · Jul 26, 2022 · 229b926 · 229b926
2 parents aeab4e8 + 9ee5c19
commit 229b926
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 26 deletions.
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
@@ -15,7 +15,7 @@ ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends make git && \
+    apt-get install -y --no-install-recommends make git netbase && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*

diff --git a/docker/prod-all-providers/Dockerfile b/docker/prod-all-providers/Dockerfile
@@ -18,7 +18,7 @@ ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends make git && \
+    apt-get install -y --no-install-recommends make git netbase && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*

diff --git a/docker/test-all-providers/Dockerfile b/docker/test-all-providers/Dockerfile
@@ -18,7 +18,7 @@ ENV RACK_ENV=production
 
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends make git && \
+    apt-get install -y --no-install-recommends make git netbase && \
     apt-get clean autoclean && \
     apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*

diff --git a/docker/test-all-providers/Gemfile.lock b/docker/test-all-providers/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/puppetlabs/vmpooler-provider-ec2.git
-  revision: 7f539321523d47ffa6c001f4f300f7b21eb9a4d9
+  revision: 13d0de6dc035c46dcd099d0b5e9b02bc19e8fcdd
   specs:
     vmpooler-provider-ec2 (0.0.1)
       aws-sdk-ec2 (~> 1)

diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2022-07-26T09:02:53.10743-05:00"
+    created: "2022-07-26T13:40:19.309277-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.10.1
+    description: A Helm chart to deploy vmpooler
+    digest: fe0c76c54b8d65c0010e13fc09de9c37c9f054548758ac459271f63a4ad5ba1b
+    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.19.0.tgz
+    version: 1.19.0
+  - apiVersion: v2
+    appVersion: 1.7.0-prod-all-providers
+    created: "2022-07-26T13:40:19.303464-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.18.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2022-07-26T09:02:53.10191-05:00"
+    created: "2022-07-26T13:40:19.297544-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.17.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-26T09:02:53.095376-05:00"
+    created: "2022-07-26T13:40:19.290363-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.16.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-26T09:02:53.072716-05:00"
+    created: "2022-07-26T13:40:19.283765-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.15.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-26T09:02:53.062114-05:00"
+    created: "2022-07-26T13:40:19.273245-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
     version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-07-26T09:02:53.053642-05:00"
+    created: "2022-07-26T13:40:19.265276-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-07-26T09:02:53.043694-05:00"
+    created: "2022-07-26T13:40:19.241595-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2022-07-26T09:02:53.024266-05:00"
+    created: "2022-07-26T13:40:19.23447-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2022-07-26T09:02:53.016888-05:00"
+    created: "2022-07-26T13:40:19.227105-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-26T09:02:53.009934-05:00"
+    created: "2022-07-26T13:40:19.219749-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-26T09:02:53.000152-05:00"
+    created: "2022-07-26T13:40:19.212795-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-26T09:02:53.199957-05:00"
+    created: "2022-07-26T13:40:19.38233-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-26T09:02:53.192071-05:00"
+    created: "2022-07-26T13:40:19.37631-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +213,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-07-26T09:02:53.169331-05:00"
+    created: "2022-07-26T13:40:19.368419-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -213,7 +228,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-07-26T09:02:53.161587-05:00"
+    created: "2022-07-26T13:40:19.362069-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -228,7 +243,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-26T09:02:53.154765-05:00"
+    created: "2022-07-26T13:40:19.337857-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -243,7 +258,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-26T09:02:53.141575-05:00"
+    created: "2022-07-26T13:40:19.329764-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -258,7 +273,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-26T09:02:53.121686-05:00"
+    created: "2022-07-26T13:40:19.322639-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -273,7 +288,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-26T09:02:53.114677-05:00"
+    created: "2022-07-26T13:40:19.314257-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -286,4 +301,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2022-07-26T09:02:52.984817-05:00"
+generated: "2022-07-26T13:40:19.197161-05:00"
diff --git a/docs/vmpooler-1.19.0.tgz b/docs/vmpooler-1.19.0.tgz
diff --git 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: 1.18.0
-appVersion: 1.7.0-prod-all-providers
+version: 1.19.0
+appVersion: 1.8.0-prod-all-providers
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami

diff --git a/helm-charts/vmpooler/templates/deployment-manager.yaml b/helm-charts/vmpooler/templates/deployment-manager.yaml
@@ -67,6 +67,8 @@ spec:
           value: '{{ .Values.gce.keyfile }}'
         - name: AWS_KEY_FILE_LOCATION
           value: '{{ .Values.ec2.keyfile }}'
+        - name: ROOT_KEYS_SCRIPT
+          value: '{{ .Values.ec2.root_keys_script }}'
         - name: JRUBY_OPTS
           value: '-J-XX:+UseG1GC'
         - name: TASK_LIMIT

diff --git a/helm-charts/vmpooler/values.yaml b/helm-charts/vmpooler/values.yaml
@@ -16,6 +16,7 @@ gce:
 
 ec2:
   keyfile: '/vault/secrets/ec2-keyfile.rsa'
+  root_keys_script: ''
 
 tracing:
   enabled: 'false'