add ability to set image namespace, same as tag
This commit is contained in:
parent
7efd2d4a44
commit
7045952316
4 changed files with 10 additions and 4 deletions
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||
appVersion: v2.12.5
|
||||
description: A Helm chart for Argo Workflows
|
||||
name: argo
|
||||
version: 0.16.10
|
||||
version: 0.16.11
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
maintainers:
|
||||
|
|
|
@ -44,7 +44,7 @@ spec:
|
|||
{{- if .Values.singleNamespace }}
|
||||
- "--namespaced"
|
||||
{{- end }}
|
||||
image: "{{ .Values.images.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}"
|
||||
image: "{{ default .Values.images.namespace .Values.server.image.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}"
|
||||
imagePullPolicy: {{ .Values.images.pullPolicy }}
|
||||
{{- if .Values.server.podPortName }}
|
||||
ports:
|
||||
|
|
|
@ -32,14 +32,14 @@ spec:
|
|||
{{- end }}
|
||||
containers:
|
||||
- name: controller
|
||||
image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}"
|
||||
image: "{{ default .Values.images.namespace .Values.controller.image.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}"
|
||||
imagePullPolicy: {{ .Values.images.pullPolicy }}
|
||||
command: [ "workflow-controller" ]
|
||||
args:
|
||||
- "--configmap"
|
||||
- "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
|
||||
- "--executor-image"
|
||||
- "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ default .Values.images.tag .Values.executor.image.tag }}"
|
||||
- "{{default .Values.images.namespace .Values.executor.image.namespace }}/{{ .Values.images.executor }}:{{ default .Values.images.tag .Values.executor.image.tag }}"
|
||||
- "--loglevel"
|
||||
- "{{ .Values.controller.logging.level }}"
|
||||
- "--gloglevel"
|
||||
|
|
|
@ -36,6 +36,8 @@ controller:
|
|||
image:
|
||||
# Overrides .images.tag if defined.
|
||||
tag: ""
|
||||
# Overrides .images.namespace if defined.
|
||||
namespace: ""
|
||||
# parallelism dictates how many workflows can be running at the same time
|
||||
parallelism:
|
||||
# podAnnotations is an optional map of annotations to be applied to the controller Pods
|
||||
|
@ -144,6 +146,8 @@ executor:
|
|||
image:
|
||||
# Overrides .images.tag if defined.
|
||||
tag: ""
|
||||
# Overrides .images.namespace if defined.
|
||||
namespace: ""
|
||||
resources: {}
|
||||
# Adds environment variables for the executor.
|
||||
env: {}
|
||||
|
@ -159,6 +163,8 @@ server:
|
|||
image:
|
||||
# Overrides .images.tag if defined.
|
||||
tag: ""
|
||||
# Overrides .images.namespace if defined.
|
||||
namespace: ""
|
||||
# optional map of annotations to be applied to the ui Pods
|
||||
podAnnotations: {}
|
||||
# Optional labels to add to the UI pods
|
||||
|
|
Loading…
Reference in a new issue