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 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: {{ .Release.name }}-{{ .Values.uiName}}-cluster-role name: {{ .Release.name }}-{{ .Values.ui.name}}-cluster-role
rules: rules:
- apiGroups: - apiGroups:
- "" - ""

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

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

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

@ -1,21 +1,22 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ .Release.Name }}-{{ .Values.uiName}} name: {{ .Release.Name }}-{{ .Values.ui.name}}
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 }}
namspace: {{ .Release.Namespace }}
spec: spec:
template: template:
metadata: metadata:
labels: labels:
app: {{ .Release.Name }}-{{ .Values.uiName}} app: {{ .Release.Name }}-{{ .Values.ui.name}}
release: {{ .Release.Name }} release: {{ .Release.Name }}
spec: spec:
containers: containers:
- name: ui - name: ui
image: "{{ .Values.imagesNamespace }}/{{ .Values.uiImage }}:{{ .Values.imagesTag }}" image: "{{ .Values.images.namespace }}/{{ .Values.images.ui }}:{{ .Values.images.tag }}"
env: env:
- name: IN_CLUSTER - name: IN_CLUSTER
value: "true" value: "true"

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

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

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

@ -1,17 +1,18 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ .Release.Name }}-{{ .Values.uiName}} name: {{ .Release.Name }}-{{ .Values.ui.name}}
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 }}
namspace: {{ .Release.Namespace }}
spec: spec:
ports: ports:
- port: 80 - port: 80
protocol: TCP protocol: TCP
targetPort: 8001 targetPort: 8001
selector: selector:
app: {{ .Release.Name }}-{{ .Values.uiName}} app: {{ .Release.Name }}-{{ .Values.ui.name }}
sessionAffinity: None 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 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: {{ .Release.name }}-{{ .Values.controllerName}}-cluster-role name: {{ .Release.name }}-{{ .Values.controller.name}}-cluster-role
rules: rules:
- apiGroups: - apiGroups:
- "" - ""

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

@ -1,17 +1,18 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ .Release.Name }}-{{ .Values.controllerName }}-configmap name: {{ .Release.Name }}-{{ .Values.controller.name }}-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 }}
namespace: {{ .Release.namespace }}
data: data:
config: | config: |
{{- if .Values.useReleaseAsInstanceID }} {{- if .Values.controller.useReleaseAsInstanceID }}
instanceID: {{ .Release.Name }} instanceID: {{ .Release.Name }}
{{- else }} {{- else }}
instanceID: {{ .Values.instanceID }} instanceID: {{ .Values.controller.instanceID }}
{{- end }} {{- end }}
artifactRepository: artifactRepository:
{{- if or .Values.installMinio .Values.useDefaultArtifactRepo }} {{- 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") }} endpoint: {{ .Values.artifactRepository.s3.endpoint | default (printf "%s-%s" .Release.Name "minio-svc:9000") }}
insecure: {{ .Values.artifactRepository.s3.insecure }} insecure: {{ .Values.artifactRepository.s3.insecure }}
{{- end}} {{- 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 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: {{ .Release.name }}-{{ .Values.controllerName}}-binding name: {{ .Release.name }}-{{ .Values.controller.name}}-binding
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: {{ .Release.name }}-{{ .Values.controllerName}}-cluster-role name: {{ .Release.name }}-{{ .Values.controller.name}}-cluster-role
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ .Values.workflowServiceAccount }} name: {{ .Values.controller.serviceAccount }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- if .Values.workflowNamespaces }} {{- if .Values.controller.workflowNamespaces }}
{{- $uiServiceAccount := .Values.workflowServiceAccount }} {{- $uiServiceAccount := .Values.controller.serviceAccount }}
{{- $namespace := .Release.Namespace }} {{- $namespace := .Release.Namespace }}
{{- range $key := .Values.workflowNamespaces }} {{- range $key := .Values.controller.workflowNamespaces }}
{{- if not (eq $key $namespace) }} {{- if not (eq $key $namespace) }}
- kind: ServiceAccount - kind: ServiceAccount
name: {{ $uiServiceAccount }} name: {{ $uiServiceAccount }}

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

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

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

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