mirror of
https://github.com/puppetlabs/vmpooler-deployment.git
synced 2026-01-26 03:28:41 -05:00
Add a new values parameter overrideCmd
when set the parameter overrides the container.command that defaults to the entrypoint Updated the test-all-providers Dockerfile to match prod file Updated test-all-providers Gemfile to import the new ec2 provider
This commit is contained in:
parent
e077739c3b
commit
c96029fa87
9 changed files with 97 additions and 40 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue