From 1aafbc3b81bd70ecec47a0ae8265fd0602cbe4ab Mon Sep 17 00:00:00 2001
From: Muwon Lum <muwonone@gmail.com>
Date: Mon, 30 Mar 2020 14:21:47 -0700
Subject: [PATCH] YC: ClusterRoleBinding, config checksum, and resources

---
 .../templates/argo-events-cluster-roles.yaml       |  4 +++-
 charts/argo-events/templates/argo-events-sa.yaml   |  2 ++
 .../templates/gateway-controller-deployment.yaml   |  2 ++
 .../templates/sensor-controller-deployment.yaml    |  2 ++
 .../templates/workflow-controller-deployment.yaml  | 14 +++++++++++---
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/charts/argo-events/templates/argo-events-cluster-roles.yaml
index a0b79f78..5736ffab 100644
--- a/charts/argo-events/templates/argo-events-cluster-roles.yaml
+++ b/charts/argo-events/templates/argo-events-cluster-roles.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.installRbac }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -54,6 +55,7 @@ rules:
     resources:
       - pods
       - pods/exec
+      - pods/log
       - configmaps
       - secrets
       - services
@@ -91,4 +93,4 @@ rules:
       - update
       - patch
       - delete
-
+{{- end }}
diff --git a/charts/argo-events/templates/argo-events-sa.yaml b/charts/argo-events/templates/argo-events-sa.yaml
index f13b8a1d..b3c18851 100644
--- a/charts/argo-events/templates/argo-events-sa.yaml
+++ b/charts/argo-events/templates/argo-events-sa.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.installRbac }}
 # All argo-events services are bound to the "argo-events" service account.
 # In RBAC enabled setups, this SA is bound to specific roles.
 apiVersion: v1
@@ -16,3 +17,4 @@ metadata:
   namespace: {{ $namespace }}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/argo-events/templates/gateway-controller-deployment.yaml b/charts/argo-events/templates/gateway-controller-deployment.yaml
index 63350fbf..6ca3ed33 100644
--- a/charts/argo-events/templates/gateway-controller-deployment.yaml
+++ b/charts/argo-events/templates/gateway-controller-deployment.yaml
@@ -31,3 +31,5 @@ spec:
                   fieldPath: metadata.namespace
             - name: CONTROLLER_CONFIG_MAP
               value: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap
+          resources:
+            {{- toYaml .Values.gatewayController.resources | nindent 12 }}
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 2dd9602e..fe509903 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -31,3 +31,5 @@ spec:
                   fieldPath: metadata.namespace
             - name: CONTROLLER_CONFIG_MAP
               value: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap
+          resources:
+            {{- toYaml .Values.sensorController.resources | nindent 12 }}
diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml
index 06b708c6..dc2781ee 100644
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@@ -21,8 +21,9 @@ spec:
         {{- if .Values.controller.podLabels }}
         {{ toYaml .Values.controller.podLabels | nindent 8}}
         {{- end }}
-      {{- if .Values.controller.podAnnotations }}
       annotations:
+        checksum/config-controller: {{ include (print $.Template.BasePath "/workflow-controller-config-map.yaml") . | sha256sum }}
+      {{- if .Values.controller.podAnnotations }}
 {{ toYaml .Values.controller.podAnnotations | indent 8}}{{- end }}
     spec:
       serviceAccountName: {{ .Values.controller.serviceAccount | quote }}
@@ -48,9 +49,16 @@ spec:
                 fieldPath: metadata.namespace
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
-          {{- if .Values.controller.metricsConfig.enabled }}
+          {{- if or .Values.controller.metricsConfig.enabled .Values.controller.telemetryConfig.enabled }}
           ports:
-          - containerPort: 8080
+          {{- if .Values.controller.metricsConfig.enabled }}
+          - containerPort: {{ .Values.controller.metricsConfig.port }}
+            name: metrics
+          {{- end }}
+          {{- if .Values.controller.telemetryConfig.enabled }}
+          - containerPort: {{ .Values.controller.telemetryConfig.port }}
+            name: telemetry
+          {{- end }}
           {{- end }}
       {{- with .Values.controller.nodeSelector }}
       nodeSelector: