DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add ability to set image namespace, same as tag

Browse source
This commit is contained in:
Brandon Mayfield 2021-04-27 16:47:00 -05:00
parent 7efd2d4a44
commit 7045952316
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.12.5 appVersion: v2.12.5
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
name: argo name: argo
version: 0.16.10 version: 0.16.11
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
maintainers: maintainers:

2
charts/argo/templates/server-deployment.yaml
View file

@ -44,7 +44,7 @@ spec:
{{- if .Values.singleNamespace }} {{- if .Values.singleNamespace }}
- "--namespaced" - "--namespaced"
{{- end }} {{- 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 }} imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.server.podPortName }} {{- if .Values.server.podPortName }}
ports: ports:

4
charts/argo/templates/workflow-controller-deployment.yaml
View file

@ -32,14 +32,14 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: controller - 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 }} imagePullPolicy: {{ .Values.images.pullPolicy }}
command: [ "workflow-controller" ] command: [ "workflow-controller" ]
args: args:
- "--configmap" - "--configmap"
- "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap" - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
- "--executor-image" - "--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" - "--loglevel"
- "{{ .Values.controller.logging.level }}" - "{{ .Values.controller.logging.level }}"
- "--gloglevel" - "--gloglevel"

6
charts/argo/values.yaml
View file

@ -36,6 +36,8 @@ controller:
image: image:
# Overrides .images.tag if defined. # Overrides .images.tag if defined.
tag: "" tag: ""
# Overrides .images.namespace if defined.
namespace: ""
# parallelism dictates how many workflows can be running at the same time # parallelism dictates how many workflows can be running at the same time
parallelism: parallelism:
# podAnnotations is an optional map of annotations to be applied to the controller Pods # podAnnotations is an optional map of annotations to be applied to the controller Pods
@ -144,6 +146,8 @@ executor:
image: image:
# Overrides .images.tag if defined. # Overrides .images.tag if defined.
tag: "" tag: ""
# Overrides .images.namespace if defined.
namespace: ""
resources: {} resources: {}
# Adds environment variables for the executor. # Adds environment variables for the executor.
env: {} env: {}
@ -159,6 +163,8 @@ server:
image: image:
# Overrides .images.tag if defined. # Overrides .images.tag if defined.
tag: "" tag: ""
# Overrides .images.namespace if defined.
namespace: ""
# optional map of annotations to be applied to the ui Pods # optional map of annotations to be applied to the ui Pods
podAnnotations: {} podAnnotations: {}
# Optional labels to add to the UI pods # Optional labels to add to the UI pods