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

Use the workflow configmap since that seems to be necessary for server

Browse source
This commit is contained in:
Andrew Suderman 2020-02-26 14:43:05 -07:00
parent e5bac691bf
commit 05db948dd3
No known key found for this signature in database
GPG key ID: 9C9CAE7EC2133DB7
2 changed files with 2 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
charts/argo/templates/server-configmap.yaml
View file

@ -1,50 +0,0 @@
{{- if .Values.server.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }}-configmap
labels:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
config: |
{{- if .Values.server.instanceID.enabled }}
{{- if .Values.server.instanceID.useReleaseName }}
instanceID: {{ .Release.Name }}
{{- else }}
instanceID: {{ .Values.server.instanceID.explicitID }}
{{- end }}
{{- end }}
containerRuntimeExecutor: {{ .Values.server.containerRuntimeExecutor }}
artifactRepository:
{{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
{{- if .Values.artifactRepository.archiveLogs }}
archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
{{- end }}
s3:
{{- if .Values.useStaticCredentials }}
accessKeySecret:
key: {{ .Values.artifactRepository.s3.accessKeySecret.key }}
name: {{ .Values.artifactRepository.s3.accessKeySecret.name | default (printf "%s-%s" .Release.Name "minio") }}
secretKeySecret:
key: {{ .Values.artifactRepository.s3.secretKeySecret.key }}
name: {{ .Values.artifactRepository.s3.secretKeySecret.name | default (printf "%s-%s" .Release.Name "minio") }}
{{- end }}
bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minio.defaultBucket.name }}
endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio:9000") }}
insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- if .Values.artifactRepository.s3.keyPrefix }}
keyPrefix: {{ .Values.artifactRepository.s3.keyPrefix }}
{{- end }}
{{- end}}
{{- if .Values.server.metricsConfig.enabled }}
metricsConfig:
{{ toYaml .Values.server.metricsConfig | indent 6}}{{- end }}
{{- if .Values.server.telemetryConfig.enabled }}
telemetryConfig:
{{ toYaml .Values.server.telemetryConfig | indent 6}}{{- end }}
{{- if .Values.server.persistence }}
persistence:
{{ toYaml .Values.server.persistence | indent 6 }}{{- end }}
{{- end }}

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

@ -33,6 +33,8 @@ spec:
imagePullPolicy: {{ .Values.images.pullPolicy }}
args:
- "server"
- "--configmap"
- "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
resources:
{{- toYaml .Values.server.resources | nindent 12 }}
{{- if .Values.server.metricsConfig.enabled }}