Merge branch 'master' into master
This commit is contained in:
commit
380606de8e
5 changed files with 14 additions and 8 deletions
|
@ -2,7 +2,7 @@ apiVersion: v1
|
||||||
appVersion: "0.9.1"
|
appVersion: "0.9.1"
|
||||||
description: A Helm chart for Argo Rollouts
|
description: A Helm chart for Argo Rollouts
|
||||||
name: argo-rollouts
|
name: argo-rollouts
|
||||||
version: 0.3.9
|
version: 0.3.10
|
||||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
|
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
maintainers:
|
maintainers:
|
||||||
|
|
|
@ -2,12 +2,6 @@ apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}
|
name: {{ .Release.Name }}
|
||||||
{{- if .Values.podAnnotations }}
|
|
||||||
annotations:
|
|
||||||
{{- range $key, $value := .Values.podAnnotations }}
|
|
||||||
{{ $key }}: {{ $value | quote }}
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: {{ .Values.controller.component }}
|
app.kubernetes.io/component: {{ .Values.controller.component }}
|
||||||
app.kubernetes.io/name: {{ .Release.Name }}
|
app.kubernetes.io/name: {{ .Release.Name }}
|
||||||
|
@ -21,6 +15,12 @@ spec:
|
||||||
app.kubernetes.io/name: {{ .Release.Name }}
|
app.kubernetes.io/name: {{ .Release.Name }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
|
{{- if .Values.podAnnotations }}
|
||||||
|
annotations:
|
||||||
|
{{- range $key, $value := .Values.podAnnotations }}
|
||||||
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ .Release.Name }}
|
app.kubernetes.io/name: {{ .Release.Name }}
|
||||||
spec:
|
spec:
|
||||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
||||||
appVersion: v2.11.7
|
appVersion: v2.11.7
|
||||||
description: A Helm chart for Argo Workflows
|
description: A Helm chart for Argo Workflows
|
||||||
name: argo
|
name: argo
|
||||||
version: 0.13.10
|
version: 0.13.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:
|
||||||
|
|
|
@ -61,6 +61,9 @@ spec:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
|
{{- with .Values.controller.extraEnv }}
|
||||||
|
{{ toYaml . | nindent 10 }}
|
||||||
|
{{- end }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.controller.resources | nindent 12 }}
|
{{- toYaml .Values.controller.resources | nindent 12 }}
|
||||||
{{- if .Values.controller.metricsConfig.enabled }}
|
{{- if .Values.controller.metricsConfig.enabled }}
|
||||||
|
|
|
@ -115,6 +115,9 @@ controller:
|
||||||
# service type `LoadBalancer`
|
# service type `LoadBalancer`
|
||||||
loadBalancerSourceRanges: []
|
loadBalancerSourceRanges: []
|
||||||
resources: {}
|
resources: {}
|
||||||
|
# The list of environment variable definitions to be added to the controller
|
||||||
|
# manages container verbatim.
|
||||||
|
extraEnv: []
|
||||||
replicas: 1
|
replicas: 1
|
||||||
pdb:
|
pdb:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
Loading…
Reference in a new issue