Merge pull request #47 from puppetlabs/DIO-3229

Add a new values parameter overrideCmd

docker/test-all-providers/Dockerfile

@@ -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"]

docker/test-all-providers/Gemfile

@@ -1,6 +1,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gem 'vmpooler',                    git: 'https://github.com/puppetlabs/vmpooler.git'
+gem 'vmpooler-provider-ec2',       git: 'https://github.com/puppetlabs/vmpooler-provider-ec2.git'
 gem 'vmpooler-provider-gce',       git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git'
 gem 'vmpooler-provider-vsphere',   git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git'
 

docker/test-all-providers/Gemfile.lock

@@ -1,8 +1,16 @@
+GIT
+  remote: https://github.com/puppetlabs/vmpooler-provider-ec2.git
+  revision: dcf12369483a3d904b20fae7374bdd4b89295f92
+  specs:
+    vmpooler-provider-ec2 (0.0.1)
+      aws-sdk-ec2 (~> 1)
+      net-ssh (>= 6.2, < 7.1)
+
 GIT
   remote: https://github.com/puppetlabs/vmpooler-provider-gce.git
-  revision: c6533af9eda0f80c2aeb5bdba0b870256e44b523
+  revision: 46b9c5aef06184f8a2bd0be6086ae2256b19020a
   specs:
-    vmpooler-provider-gce (0.2.0)
+    vmpooler-provider-gce (0.3.0)
       google-apis-compute_v1 (~> 0.14)
       google-cloud-dns (~> 0.35.1)
       googleauth (>= 0.16.2, < 1.2.0)
@@ -16,7 +24,7 @@ GIT
 
 GIT
   remote: https://github.com/puppetlabs/vmpooler.git
-  revision: c3a6fd25278092c2c1763e761dbcc68cfbc91390
+  revision: 35102d57cd57493034407057d2c3d328963d4db6
   specs:
     vmpooler (2.3.0)
       concurrent-ruby (~> 1.1)
@@ -46,6 +54,18 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.603.0)
+    aws-sdk-core (3.131.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.525.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ec2 (1.320.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.5.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     bindata (2.4.10)
     builder (3.2.4)
     concurrent-ruby (1.1.10)
@@ -68,16 +88,16 @@ GEM
     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-multipart (1.0.4)
+      multipart-post (~> 2)
     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.32.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-compute_v1 (0.41.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -86,8 +106,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-dns_v1 (0.19.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-dns_v1 (0.23.0)
+      google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
@@ -99,7 +119,7 @@ GEM
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    googleauth (1.1.2)
+    googleauth (1.1.3)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -107,23 +127,25 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    json (2.6.1)
-    json (2.6.1-java)
-    jwt (2.3.0)
+    jmespath (1.6.1)
+    json (2.6.2)
+    json (2.6.2-java)
+    jwt (2.4.1)
     memoist (0.16.2)
     mini_mime (1.1.2)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    net-ldap (0.17.0)
+    net-ldap (0.17.1)
+    net-ssh (6.3.0.beta1)
     nio4r (2.5.8)
     nio4r (2.5.8-java)
     nokogiri (1.12.5-java)
       racc (~> 1.4)
     nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
-    opentelemetry-api (1.0.1)
+    opentelemetry-api (1.0.2)
     opentelemetry-common (0.19.3)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-jaeger (0.20.1)
@@ -169,7 +191,7 @@ GEM
       nio4r (~> 2.0)
     racc (1.6.0)
     racc (1.6.0-java)
-    rack (2.2.3)
+    rack (2.2.4)
     rack-protection (2.2.0)
       rack
     rake (13.0.6)
@@ -178,8 +200,8 @@ GEM
       json (~> 2.3)
       nokogiri (~> 1.10)
       optimist (~> 3.0)
-    redis (4.6.0)
-    representable (3.1.1)
+    redis (4.7.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -212,8 +234,9 @@ PLATFORMS
 
 DEPENDENCIES
   vmpooler!
+  vmpooler-provider-ec2!
   vmpooler-provider-gce!
   vmpooler-provider-vsphere!
 
 BUNDLED WITH
-   2.3.11
+   2.3.17

docs/index.yaml

@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-06-21T09:34:10.994204-05:00"
+    created: "2022-07-07T11:20:20.126008-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.10.1
+    description: A Helm chart to deploy vmpooler
+    digest: bec45ee506f5fcb1dc069511fcee8fc44a66bb40659f8756f7dccca31327e263
+    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.15.0.tgz
+    version: 1.15.0
+  - apiVersion: v2
+    appVersion: 1.6.0-prod-all-providers
+    created: "2022-07-07T11:20:20.121125-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-06-21T09:34:10.988782-05:00"
+    created: "2022-07-07T11:20:20.113811-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-06-21T09:34:10.982767-05:00"
+    created: "2022-07-07T11:20:20.10659-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2022-06-21T09:34:10.975765-05:00"
+    created: "2022-07-07T11:20:20.101641-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2022-06-21T09:34:10.971488-05:00"
+    created: "2022-07-07T11:20:20.095716-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-21T09:34:10.966822-05:00"
+    created: "2022-07-07T11:20:20.090787-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-21T09:34:10.960126-05:00"
+    created: "2022-07-07T11:20:20.084207-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-21T09:34:11.025219-05:00"
+    created: "2022-07-07T11:20:20.158097-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-06-21T09:34:11.021768-05:00"
+    created: "2022-07-07T11:20:20.154432-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-06-21T09:34:11.018298-05:00"
+    created: "2022-07-07T11:20:20.150058-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-06-21T09:34:11.013709-05:00"
+    created: "2022-07-07T11:20:20.146176-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-21T09:34:11.009666-05:00"
+    created: "2022-07-07T11:20:20.142318-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-21T09:34:11.00618-05:00"
+    created: "2022-07-07T11:20:20.13796-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +213,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-21T09:34:11.001745-05:00"
+    created: "2022-07-07T11:20:20.134247-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -213,7 +228,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-06-21T09:34:10.998149-05:00"
+    created: "2022-07-07T11:20:20.13096-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -226,4 +241,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2022-06-21T09:34:10.955364-05:00"
+generated: "2022-07-07T11:20:20.077824-05:00"

helm-charts/vmpooler/Chart.yaml

@@ -3,7 +3,7 @@ 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.14.0
+version: 1.15.0
 appVersion: 1.6.0-prod-all-providers
 dependencies:
   - name: redis

helm-charts/vmpooler/templates/deployment-api.yaml

@@ -42,6 +42,12 @@ spec:
           - containerPort: {{ .Values.service.port }}
         resources:
           {{- toYaml .Values.api.resources | nindent 12 }}
+        {{- if .Values.overrideCmd -}}
+        {{- with .Values.overrideCmd }}
+        command:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
+        {{- end }}
         args:
           - 'api'
         livenessProbe:

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

@@ -44,6 +44,12 @@ spec:
         - containerPort: {{ .Values.service.port }}
         resources:
           {{- toYaml .Values.manager.resources | nindent 12 }}
+        {{- if .Values.overrideCmd -}}
+        {{- with .Values.overrideCmd }}
+        command:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
+        {{- end }}
         args:
           - 'manager'
         livenessProbe:

helm-charts/vmpooler/values.yaml

@@ -44,6 +44,10 @@ auth:
 
 additionalConfigFiles: '/etc/vmpooler/config/pools.yaml'
 
+# This overrides the deployment's spec.container.command (defaults to the Dockerfile entrypoint)
+# overrideCmd:
+#   - 'source foo && docker-entrypoint.sh'
+
 api:
   replicaCount: 1
   resources: