From 619b514a6d227912f42a7a24c306b209ae2ae28a Mon Sep 17 00:00:00 2001
From: sungil <si.im@sk.com>
Date: Thu, 1 Jul 2021 08:53:27 +0000
Subject: [PATCH 1/2] TACODEV-774: enable metric on argo series

---
 roles/decapod/tasks/argo.yml             | 23 ++++++----------
 roles/decapod/templates/argocd_values.j2 |  6 +++++
 roles/decapod/templates/argowf_values.j2 | 34 ++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100755 roles/decapod/templates/argowf_values.j2

diff --git a/roles/decapod/tasks/argo.yml b/roles/decapod/tasks/argo.yml
index fa85d997..a8418f12 100644
--- a/roles/decapod/tasks/argo.yml
+++ b/roles/decapod/tasks/argo.yml
@@ -5,23 +5,16 @@
   ignore_errors: true
   become: false
 
-- name: install argo chart
+- name: templating values file for argo-wf chart
+  template:
+    src: "{{ role_path }}/templates/argowf_values.j2"
+    dest: "{{ role_path }}/files/argowf.vo"
+  become: false
+
+- name: install argo-wf chart
   shell: >-
     {{ bin_dir }}/helm install argo {{ argo_chart_source }} -n argo \
-    --set workflowArchive.enabled={{ argo_workflow_archive_enabled }} \
-    --set mysql.enabled={{ argo_workflow_archive_enabled }} \
-    --set workflowController.image.repository={{ argo_workflow_controller_image_repo }} \
-    --set workflowController.image.tag={{ argo_version }} \
-    --set workflowController.executor.image.repository={{ argo_workflow_executor_image_repo }} \
-    --set workflowController.executor.image.tag={{ argo_version }} \
-    --set argoServer.image.repository={{ argo_server_image_repo }} \
-    --set argoServer.image.tag={{ argo_version }} \
-    --set nodeSelector={{ argo_node_selector }} \
-    --set mysql.image.repository={{ argo_mysql_image_repo }} \
-    --set mysql.image.tag={{ argo_mysql_version }} \
-    --set mysql.persistence.storageClass={{ taco_storageclass_name }} \
-    --set mysql.persistence.size={{ argo_archive_storage_size }} \
-    --set mysql.nodeSelector={{ argo_node_selector }}
+    -f {{ role_path }}/files/argowf.vo
   become: false
 
 - name: wait for argo pods become ready
diff --git a/roles/decapod/templates/argocd_values.j2 b/roles/decapod/templates/argocd_values.j2
index 11457a7c..98cceb0e 100644
--- a/roles/decapod/templates/argocd_values.j2
+++ b/roles/decapod/templates/argocd_values.j2
@@ -9,6 +9,8 @@ dex:
   image:
     repository: {{ argocd_dex_image_repo }}
     tag: {{ argocd_dex_version }}
+  metrics:
+    enabled: true
 
 redis:
   image:
@@ -17,12 +19,16 @@ redis:
 
 controller:
   replicas: {{ argocd_app_ctrl_replicas }}
+  metrics:
+    enabled: true
 
 repoServer:
   replicas: {{ argocd_repo_server_replicas }}
 
 server:
   replicas: {{ argocd_server_replicas }}
+  metrics:
+    enabled: true
   service:
     type: NodePort
   configEnabled: true
diff --git a/roles/decapod/templates/argowf_values.j2 b/roles/decapod/templates/argowf_values.j2
new file mode 100755
index 00000000..36237961
--- /dev/null
+++ b/roles/decapod/templates/argowf_values.j2
@@ -0,0 +1,34 @@
+
+workflowArchive:
+  enabled: {{ argo_workflow_archive_enabled }} 
+workflowController:
+  image:
+    repository: {{ argo_workflow_controller_image_repo }} 
+    tag: {{ argo_version }} 
+  executor:
+    image:
+      repository: {{ argo_workflow_executor_image_repo }} 
+      tag: {{ argo_version }} 
+argoServer:
+  image:
+    repository: {{ argo_server_image_repo }} 
+    tag: {{ argo_version }} 
+nodeSelector: {{ argo_node_selector }} 
+mysql:
+  enabled: {{ argo_workflow_archive_enabled }} 
+  image:
+    repository: {{ argo_mysql_image_repo }} 
+    tag: {{ argo_mysql_version }} 
+  persistence:
+    storageClass: {{ taco_storageclass_name }} 
+    size: {{ argo_archive_storage_size }} 
+  nodeSelector: {{ argo_node_selector }}
+server:
+  servicePortName: http
+controller:
+  metricsConfig:
+  enabled: true
+  telemetryConfig:
+    enabled: true
+  metricsConfig:
+    enabled: true
\ No newline at end of file

From debbb0f72bbbab63508976d431175b01e72e20a2 Mon Sep 17 00:00:00 2001
From: sungil <si.im@sk.com>
Date: Tue, 6 Jul 2021 04:27:05 +0000
Subject: [PATCH 2/2] typo: remove miss typed lines

---
 roles/decapod/templates/argowf_values.j2 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/roles/decapod/templates/argowf_values.j2 b/roles/decapod/templates/argowf_values.j2
index 36237961..e2161f4d 100755
--- a/roles/decapod/templates/argowf_values.j2
+++ b/roles/decapod/templates/argowf_values.j2
@@ -26,8 +26,6 @@ mysql:
 server:
   servicePortName: http
 controller:
-  metricsConfig:
-  enabled: true
   telemetryConfig:
     enabled: true
   metricsConfig: