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

Parameterize artifact configuration

Browse source 
**What**
- Add parameterization of artifact store configuration

**Why**
Enables configuration of artifact repo secrets or omitting for use with IAM credentials
This commit is contained in:
Lukasz Lempart 2018-03-15 12:59:34 -07:00
parent 7ac7a9b193
commit 65a2b2df38
3 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo/templates/ui-service.yaml
View file

@ -14,4 +14,4 @@ spec:
selector: selector:
app: {{ .Release.Name }}-{{ .Values.uiName}} app: {{ .Release.Name }}-{{ .Values.uiName}}
sessionAffinity: None sessionAffinity: None
type: LoadBalancer type: {{ .Values.uiServiceType }}

28
charts/argo/templates/workflow-controller-config-map.yaml
View file

@ -1,29 +1,31 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ .Release.Name }}-{{ .Values.controllerName}}-configmap name: {{ .Release.Name }}-{{ .Values.controllerName }}-configmap
labels: labels:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
data: data:
config: | config: |
{{ if .Values.useReleaseAsInstanceID }} {{- if .Values.useReleaseAsInstanceID }}
instanceID: {{ .Release.Name }} instanceID: {{ .Release.Name }}
{{ else }} {{- else }}
instanceID: {{ .Values.instanceID }} instanceID: {{ .Values.instanceID }}
{{ end }} {{- end }}
artifactRepository: artifactRepository:
{{ if .Values.installMinio }} {{- if or .Values.installMinio .Values.useDefaultArtifactRepo }}
s3: s3:
{{- if .Values.useStaticCredentials }}
accessKeySecret: accessKeySecret:
key: accesskey key: {{ .Values.artifactAccessKeySecret }}
name: {{ .Release.Name }}-minio-user name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }}
bucket: {{ .Values.minioBucketName }}
endpoint: {{ .Release.Name }}-minio-svc:9000
insecure: true
secretKeySecret: secretKeySecret:
key: secretkey key: {{ .Values.artifactSecretKeySecret }}
name: {{ .Release.Name }}-minio-user name: {{ .Values.artifactSecretName | default (printf "%s-%s" .Release.Name "minio-user") }}
{{ end }} {{- end }}
bucket: {{ .Values.artifactBucketName | default .Values.minioBucketName }}
endpoint: {{ .Values.artifactEndpoint | default (printf "%s-%s" .Release.Name "minio-svc:9000") }}
insecure: {{ .Values.artifactInsecure }}
{{- end}}
executorImage: "{{ .Values.imagesNamespace }}/{{ .Values.executorImage }}:{{ .Values.imagesTag }}" executorImage: "{{ .Values.imagesNamespace }}/{{ .Values.executorImage }}:{{ .Values.imagesTag }}"

9
charts/argo/values.yaml
View file

@ -4,14 +4,23 @@ uiImage: argoui
executorImage: argoexec executorImage: argoexec
imagesTag: v2.0.0-alpha3 imagesTag: v2.0.0-alpha3
controllerName: workflow-controller controllerName: workflow-controller
# Enables ability to SSH into pod using web UI # Enables ability to SSH into pod using web UI
enableWebConsole: false enableWebConsole: false
uiName: ui uiName: ui
uiServiceType: LoadBalancer
crdVersion: v1alpha1 crdVersion: v1alpha1
# If set to true then chart set controller instance id to release name # If set to true then chart set controller instance id to release name
useReleaseAsInstanceID: false useReleaseAsInstanceID: false
instanceID: instanceID:
useDefaultArtifactRepo: false
useStaticCredentials: true
# If set to true then chart installs minio and generate according artifactRepository section in workflow controller config map # If set to true then chart installs minio and generate according artifactRepository section in workflow controller config map
installMinio: true installMinio: true
minioBucketName: argo-artifacts minioBucketName: argo-artifacts
artifactAccessKeySecret: accesskey
artifactSecretKeySecret: secretkey
artifactInsecure: true