From 1fed7f37cfccca46fcf449080d7bd53246f3dba0 Mon Sep 17 00:00:00 2001 From: louis-murray Date: Mon, 4 Jun 2018 10:39:53 -0400 Subject: [PATCH] Updating helm chart and improving style (#7) * moved workflow CRD into helpers.tpl * added new values to values.yaml * added UI cluster role and binding * add workflow controller cluster role and binding * added ui service account creator * added workflow controller service account yaml * reformatted values.yaml to group similar items * tweaked files to reflect values.yaml changes * setup minio stuff to match subchart model * changes to reflect minio rework * added README to explain chart a bit * changes made to reflect minio values changes * changes to reflect minio values changes (again) * updating minio to latest version * move the crd definition into it's own tpl file --- charts/argo/README.md | 17 ++++++ charts/argo/charts/minio-0.4.3.tgz | Bin 9030 -> 0 bytes charts/argo/charts/minio-1.3.3.tgz | Bin 0 -> 10463 bytes charts/argo/requirements.lock | 6 +-- charts/argo/requirements.yaml | 4 +- charts/argo/templates/NOTES.txt | 4 +- charts/argo/templates/_helpers.tpl | 20 +++++++ .../{_workflow-crd.json => _workflow-crd.tpl} | 2 +- charts/argo/templates/ui-cluster-role.yaml | 29 +++++++++++ charts/argo/templates/ui-crb.yaml | 12 +++++ charts/argo/templates/ui-deployment.yaml | 7 +-- charts/argo/templates/ui-sa.yaml | 5 ++ charts/argo/templates/ui-service.yaml | 7 +-- .../workflow-controller-clusterrole.yaml | 42 +++++++++++++++ .../workflow-controller-config-map.yaml | 13 ++--- .../templates/workflow-controller-crb.yaml | 23 ++++++++ .../workflow-controller-deployment.yaml | 11 ++-- .../templates/workflow-controller-sa.yaml | 5 ++ charts/argo/values.yaml | 49 +++++++++++------- 19 files changed, 213 insertions(+), 43 deletions(-) create mode 100644 charts/argo/README.md delete mode 100644 charts/argo/charts/minio-0.4.3.tgz create mode 100644 charts/argo/charts/minio-1.3.3.tgz rename charts/argo/templates/{_workflow-crd.json => _workflow-crd.tpl} (97%) create mode 100644 charts/argo/templates/ui-cluster-role.yaml create mode 100644 charts/argo/templates/ui-crb.yaml create mode 100644 charts/argo/templates/ui-sa.yaml create mode 100644 charts/argo/templates/workflow-controller-clusterrole.yaml create mode 100644 charts/argo/templates/workflow-controller-crb.yaml create mode 100644 charts/argo/templates/workflow-controller-sa.yaml diff --git a/charts/argo/README.md b/charts/argo/README.md new file mode 100644 index 00000000..8bd449b6 --- /dev/null +++ b/charts/argo/README.md @@ -0,0 +1,17 @@ +## Argo Chart +This chart is used to set up argo and it's needed dependencies through one command. This is used in conjunction with [helm](https://github.com/kubernetes/helm). + +If you want your deployment of this helm chart to most closely match the [argo CLI](https://github.com/argoproj/argo), you should deploy it in the `kube-system` namespace. + +## Values + +The `values.yaml` contains items used to tweak a deployment of this chart. +Fields to note: +* `controller.useReleaseAsInstanceID`: If set to true then chart set controller instance id to release name + - __Note:__ If this is set to false then `controller.instanceId` must be set +* `controller.workflowNamespaces`: This is a list of namespaces where workflows will be ran +* `ui.enableWebConsole`: Enables ability to SSH into pod using web UI +* `minio.install`: If this is true, we'll install [minio](https://github.com/kubernetes/charts/tree/master/stable/minio) and build out the artifactRepository section in workflow controller config map. +* `artifactRepository.s3.accessKeySecret` and `artifactRepository.s3.secretKeySecret` These by default have the minio default credentials in them. + + diff --git a/charts/argo/charts/minio-0.4.3.tgz b/charts/argo/charts/minio-0.4.3.tgz deleted file mode 100644 index 8ce446100017d7a18cad9a9cfbed57cfe3e4e02c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9030 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 diff --git a/charts/argo/charts/minio-1.3.3.tgz b/charts/argo/charts/minio-1.3.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..97803de85c2347b9c6322266b05c5a7b9b238a5d GIT binary patch literal 10463 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 V@mcx&{{R30|Nn}m>Usda006I9r27B> literal 0 HcmV?d00001 diff --git a/charts/argo/requirements.lock b/charts/argo/requirements.lock index ef788117..c0b8525b 100644 --- a/charts/argo/requirements.lock +++ b/charts/argo/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: minio repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.4.3 -digest: sha256:2282e3be8457161f7fb79fe1a6a871a972146574b365e69b18d9c46e16d6c47d -generated: 2018-01-03T12:09:41.060101-08:00 + version: 1.3.3 +digest: sha256:d53e797d51304b850951bf6ecb57ad60d34cbccfa39a7d7bd0adf65435bbee78 +generated: 2018-06-01T10:03:04.087865-04:00 diff --git a/charts/argo/requirements.yaml b/charts/argo/requirements.yaml index fd789f07..452a3e76 100644 --- a/charts/argo/requirements.yaml +++ b/charts/argo/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: minio - version: 0.4.3 + version: 1.3.3 repository: https://kubernetes-charts.storage.googleapis.com/ - condition: installMinio + condition: minio.install diff --git a/charts/argo/templates/NOTES.txt b/charts/argo/templates/NOTES.txt index d86b4b2d..4fc67e30 100644 --- a/charts/argo/templates/NOTES.txt +++ b/charts/argo/templates/NOTES.txt @@ -9,9 +9,9 @@ echo '{"apiVersion": "apiextensions.k8s.io/v1beta1","kind": "CustomResourceDefin kubectl get services -o wide | grep {{ .Release.Name }}-{{ .Values.uiName }} -{{ if .Values.installMinio }} +{{ if .Values.minio.install }} -3. Access Minio UI and create bucket '{{ .Values.minioBucketName }}'. Minio UI is available on port 9000 and available via external URL. URL might be retrieved using following +3. Access Minio UI and create bucket '{{ .Values.minio.defaultBucket.name }}'. Minio UI is available on port 9000 and available via external URL. URL might be retrieved using following command: kubectl get services -o wide | grep {{ .Release.Name }}-minio-svc diff --git a/charts/argo/templates/_helpers.tpl b/charts/argo/templates/_helpers.tpl index f0d83d2e..2e375b59 100644 --- a/charts/argo/templates/_helpers.tpl +++ b/charts/argo/templates/_helpers.tpl @@ -14,3 +14,23 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "workflow-crd-json" }} +{ + "apiVersion": "apiextensions.k8s.io/v1beta1", + "kind": "CustomResourceDefinition", + "metadata": { + "name": "workflows.argoproj.io" + }, + "spec": { + "group": "argoproj.io", + "names": { + "kind": "Workflow", + "plural": "workflows", + "shortNames": ["wf"] + }, + "scope": "Namespaced", + "version": "v1alpha1" + } +} +{{- end}} diff --git a/charts/argo/templates/_workflow-crd.json b/charts/argo/templates/_workflow-crd.tpl similarity index 97% rename from charts/argo/templates/_workflow-crd.json rename to charts/argo/templates/_workflow-crd.tpl index ef26b415..29bc2b27 100644 --- a/charts/argo/templates/_workflow-crd.json +++ b/charts/argo/templates/_workflow-crd.tpl @@ -16,4 +16,4 @@ "version": "v1alpha1" } } -{{- end}} \ No newline at end of file +{{- end}} diff --git a/charts/argo/templates/ui-cluster-role.yaml b/charts/argo/templates/ui-cluster-role.yaml new file mode 100644 index 00000000..b66f29b8 --- /dev/null +++ b/charts/argo/templates/ui-cluster-role.yaml @@ -0,0 +1,29 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ .Release.name }}-{{ .Values.ui.name}}-cluster-role +rules: +- apiGroups: + - "" + resources: + - pods + - pods/exec + - pods/log + verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - secrets + verbs: + - get +- apiGroups: + - argoproj.io + resources: + - workflows + verbs: + - get + - list + - watch diff --git a/charts/argo/templates/ui-crb.yaml b/charts/argo/templates/ui-crb.yaml new file mode 100644 index 00000000..bb7ccd62 --- /dev/null +++ b/charts/argo/templates/ui-crb.yaml @@ -0,0 +1,12 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ .Release.name }}-{{ .Values.ui.name}}-crb +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ .Release.name }}-{{ .Values.ui.name}}-cluster-role +subjects: +- kind: ServiceAccount + name: {{ .Values.ui.serviceAccount }} + namespace: {{ .Release.Name }} diff --git a/charts/argo/templates/ui-deployment.yaml b/charts/argo/templates/ui-deployment.yaml index bf237b6b..661ce610 100644 --- a/charts/argo/templates/ui-deployment.yaml +++ b/charts/argo/templates/ui-deployment.yaml @@ -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" diff --git a/charts/argo/templates/ui-sa.yaml b/charts/argo/templates/ui-sa.yaml new file mode 100644 index 00000000..bba4b093 --- /dev/null +++ b/charts/argo/templates/ui-sa.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Values.ui.serviceAccount }} + namspace: {{ .Release.Namespace }} diff --git a/charts/argo/templates/ui-service.yaml b/charts/argo/templates/ui-service.yaml index 96e2c38f..83d0b25e 100644 --- a/charts/argo/templates/ui-service.yaml +++ b/charts/argo/templates/ui-service.yaml @@ -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 }} diff --git a/charts/argo/templates/workflow-controller-clusterrole.yaml b/charts/argo/templates/workflow-controller-clusterrole.yaml new file mode 100644 index 00000000..7e6368ff --- /dev/null +++ b/charts/argo/templates/workflow-controller-clusterrole.yaml @@ -0,0 +1,42 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ .Release.name }}-{{ .Values.controller.name}}-cluster-role +rules: +- apiGroups: + - "" + resources: + - pods + - pods/exec + verbs: + - create + - get + - list + - watch + - update + - patch +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - watch + - list +- apiGroups: + - "" + resources: + - persistentvolumeclaims + verbs: + - create + - delete +- apiGroups: + - argoproj.io + resources: + - workflows + verbs: + - get + - list + - watch + - update + - patch diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml index b0d9038f..081719f4 100644 --- a/charts/argo/templates/workflow-controller-config-map.yaml +++ b/charts/argo/templates/workflow-controller-config-map.yaml @@ -1,20 +1,21 @@ 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 }} + {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }} s3: {{- if .Values.useStaticCredentials }} accessKeySecret: @@ -24,8 +25,8 @@ data: key: {{ .Values.artifactRepository.s3.secretKeySecret.key }} name: {{ .Values.artifactRepository.s3.secretKeySecret.name | default (printf "%s-%s" .Release.Name "minio-user") }} {{- end }} - bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minioBucketName }} + bucket: {{ .Values.artifactRepository.s3.bucket | default .Values.minio.defaultBucket.name }} 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 }}" diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml new file mode 100644 index 00000000..2af560f0 --- /dev/null +++ b/charts/argo/templates/workflow-controller-crb.yaml @@ -0,0 +1,23 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ .Release.name }}-{{ .Values.controller.name}}-binding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ .Release.name }}-{{ .Values.controller.name}}-cluster-role +subjects: + - kind: ServiceAccount + name: {{ .Values.controller.serviceAccount }} + namespace: {{ .Release.Namespace }} +{{- if .Values.controller.workflowNamespaces }} +{{- $uiServiceAccount := .Values.controller.serviceAccount }} +{{- $namespace := .Release.Namespace }} +{{- range $key := .Values.controller.workflowNamespaces }} + {{- if not (eq $key $namespace) }} + - kind: ServiceAccount + name: {{ $uiServiceAccount }} + namespace: {{ $key }} + {{- end }} +{{- end }} +{{- end }} diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml index 808e57dd..d4291bd3 100644 --- a/charts/argo/templates/workflow-controller-deployment.yaml +++ b/charts/argo/templates/workflow-controller-deployment.yaml @@ -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: diff --git a/charts/argo/templates/workflow-controller-sa.yaml b/charts/argo/templates/workflow-controller-sa.yaml new file mode 100644 index 00000000..c7fa24f0 --- /dev/null +++ b/charts/argo/templates/workflow-controller-sa.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Values.controller.serviceAccount }} + namespace: {{ .Release.Namespace }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 22311334..0372a288 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -1,31 +1,44 @@ -imagesNamespace: argoproj -controllerImage: workflow-controller -uiImage: argoui -executorImage: argoexec -imagesTag: v2.1.0-alpha1 -controllerName: workflow-controller +images: + namespace: argoproj + controller: workflow-controller + ui: argoui + executor: argoexec + tag: v2.1.1 + +controller: + serviceAccount: argo + name: workflow-controller + workflowNamespaces: + - default + # If set to true then chart set controller instance id to release name + useReleaseAsInstanceID: true + instanceID: + +ui: + name: ui + serviceType: LoadBalancer + serviceAccount: argo-ui + # Enables ability to SSH into pod using web UI + enableWebConsole: false -# Enables ability to SSH into pod using web UI -enableWebConsole: false -uiName: ui -uiServiceType: LoadBalancer crdVersion: v1alpha1 -# If set to true then chart set controller instance id to release name -useReleaseAsInstanceID: false -instanceID: - useDefaultArtifactRepo: false useStaticCredentials: true # If set to true then chart installs minio and generate according artifactRepository section in workflow controller config map -installMinio: true -minioBucketName: argo-artifacts +minio: + # This is not used by the subchart, but makes sense to group here. + install: true + defaultBucket: + enabled: true + name: argo-artifacts artifactRepository: s3: + #default minio creds accessKeySecret: - key: accesskey + key: AKIAIOSFODNN7EXAMPLE secretKeySecret: - key: secretkey + key: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY insecure: true