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

tweaked files to reflect values.yaml changes

Browse source
This commit is contained in:
Louis Murray 2018-05-31 18:15:08 -04:00 committed by Louis Murray
parent 85e32a1394
commit 3b0c38b4ef
10 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo/templates/ui-cluster-role.yaml
View file

@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ .Release.name }}-{{ .Values.uiName}}-cluster-role
name: {{ .Release.name }}-{{ .Values.ui.name}}-cluster-role
rules:
- apiGroups:
- ""

6
charts/argo/templates/ui-crb.yaml
View file

@ -1,12 +1,12 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ .Release.name }}-{{ .Values.uiName}}-crb
name: {{ .Release.name }}-{{ .Values.ui.name}}-crb
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Release.name }}-{{ .Values.uiName}}-cluster-role
name: {{ .Release.name }}-{{ .Values.ui.name}}-cluster-role
subjects:
- kind: ServiceAccount
name: {{ .Values.uiServiceAccount }}
name: {{ .Values.ui.serviceAccount }}
namespace: {{ .Release.Name }}

7
charts/argo/templates/ui-deployment.yaml
View file

@ -1,21 +1,22 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ .Release.Name }}-{{ .Values.uiName}}
name: {{ .Release.Name }}-{{ .Values.ui.name}}
labels:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
namspace: {{ .Release.Namespace }}
spec:
template:
metadata:
labels:
app: {{ .Release.Name }}-{{ .Values.uiName}}
app: {{ .Release.Name }}-{{ .Values.ui.name}}
release: {{ .Release.Name }}
spec:
containers:
- name: ui
image: "{{ .Values.imagesNamespace }}/{{ .Values.uiImage }}:{{ .Values.imagesTag }}"
image: "{{ .Values.images.namespace }}/{{ .Values.images.ui }}:{{ .Values.images.tag }}"
env:
- name: IN_CLUSTER
value: "true"

4
charts/argo/templates/ui-sa.yaml
View file

@ -1,5 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.uiServiceAccount }}
namespace: kube-system
name: {{ .Values.ui.serviceAccount }}
namspace: {{ .Release.Namespace }}

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

@ -1,17 +1,18 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Release.Name }}-{{ .Values.uiName}}
name: {{ .Release.Name }}-{{ .Values.ui.name}}
labels:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
namspace: {{ .Release.Namespace }}
spec:
ports:
- port: 80
protocol: TCP
targetPort: 8001
selector:
app: {{ .Release.Name }}-{{ .Values.uiName}}
app: {{ .Release.Name }}-{{ .Values.ui.name }}
sessionAffinity: None
type: {{ .Values.uiServiceType }}
type: {{ .Values.ui.serviceType }}

2
charts/argo/templates/workflow-controller-clusterrole.yaml
View file

@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ .Release.name }}-{{ .Values.controllerName}}-cluster-role
name: {{ .Release.name }}-{{ .Values.controller.name}}-cluster-role
rules:
- apiGroups:
- ""

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

@ -1,17 +1,18 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-{{ .Values.controllerName }}-configmap
name: {{ .Release.Name }}-{{ .Values.controller.name }}-configmap
labels:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
namespace: {{ .Release.namespace }}
data:
config: |
{{- if .Values.useReleaseAsInstanceID }}
{{- if .Values.controller.useReleaseAsInstanceID }}
instanceID: {{ .Release.Name }}
{{- else }}
instanceID: {{ .Values.instanceID }}
instanceID: {{ .Values.controller.instanceID }}
{{- end }}
artifactRepository:
{{- if or .Values.installMinio .Values.useDefaultArtifactRepo }}
@ -28,4 +29,4 @@ data:
endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio-svc:9000") }}
insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- end}}
executorImage: "{{ .Values.imagesNamespace }}/{{ .Values.executorImage }}:{{ .Values.imagesTag }}"
executorImage: "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ .Values.images.tag }}"

12
charts/argo/templates/workflow-controller-crb.yaml
View file

@ -1,19 +1,19 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ .Release.name }}-{{ .Values.controllerName}}-binding
name: {{ .Release.name }}-{{ .Values.controller.name}}-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Release.name }}-{{ .Values.controllerName}}-cluster-role
name: {{ .Release.name }}-{{ .Values.controller.name}}-cluster-role
subjects:
- kind: ServiceAccount
name: {{ .Values.workflowServiceAccount }}
name: {{ .Values.controller.serviceAccount }}
namespace: {{ .Release.Namespace }}
{{- if .Values.workflowNamespaces }}
{{- $uiServiceAccount := .Values.workflowServiceAccount }}
{{- if .Values.controller.workflowNamespaces }}
{{- $uiServiceAccount := .Values.controller.serviceAccount }}
{{- $namespace := .Release.Namespace }}
{{- range $key := .Values.workflowNamespaces }}
{{- range $key := .Values.controller.workflowNamespaces }}
{{- if not (eq $key $namespace) }}
- kind: ServiceAccount
name: {{ $uiServiceAccount }}

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

@ -1,24 +1,25 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ .Release.Name }}-{{ .Values.controllerName}}
name: {{ .Release.Name }}-{{ .Values.controller.name}}
labels:
app: {{ .Release.Name }}-{{ .Values.controllerName}}
app: {{ .Release.Name }}-{{ .Values.controller.name}}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
namespace: {{ .Release.Namespace }}
heritage: {{ .Release.Service }}
spec:
template:
metadata:
labels:
app: {{ .Release.Name }}-{{ .Values.controllerName}}
app: {{ .Release.Name }}-{{ .Values.controller.name}}
release: {{ .Release.Name }}
spec:
containers:
- name: controller
image: "{{ .Values.imagesNamespace }}/{{ .Values.controllerImage }}:{{ .Values.imagesTag }}"
image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ .Values.images.tag }}"
command: [ "workflow-controller" ]
args: ["--configmap", "{{ .Release.Name }}-{{ .Values.controllerName}}-configmap"]
args: ["--configmap", "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"]
env:
- name: ARGO_NAMESPACE
valueFrom:

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

@ -1,5 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.workflowServiceAccount }}
namespace: kube-system
name: {{ .Values.controller.serviceAccount }}
namespace: {{ .Release.Namespace }}