updated runner image to 1.10.1 (#393)

* updated runner image to `1.10.1`
* add runner pod monitor

---------

Co-authored-by: mikhail-klimko <[email protected]>

Author: ATGardner

charts/cf-runtime/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Codefresh Runner
 name: cf-runtime
-version: 6.1.1
+version: 6.1.2
 keywords:
   - codefresh
   - runner
@@ -14,8 +14,12 @@ maintainers:
     url: https://codefresh-io.github.io/
 annotations:
   artifacthub.io/changes: |
-    - kind: security
-      description: Updated default COMPOSE_IMAGE tag to `v2.20.3-1.4.0`
+    - kind: changed
+      description: Updated runner image to `1.10.1`
+    - kind: added
+      description: Add pod monitor for Runner deployment
+    - kind: fixed
+      description: Add default nameOverride to .Values.serviceMonitor and .Values.podMonitor to avoid naming collision
 dependencies:
   - name: cf-common
     repository: https://chartmuseum.codefresh.io/cf-common

charts/cf-runtime/README.md

@@ -1,6 +1,6 @@
 ## Codefresh Runner
 
-![Version: 6.1.1](https://img.shields.io/badge/Version-6.1.1-informational?style=flat-square)
+![Version: 6.1.2](https://img.shields.io/badge/Version-6.1.2-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
 
@@ -889,13 +889,14 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | monitor.updateStrategy | object | `{"type":"RollingUpdate"}` | Upgrade strategy |
 | nameOverride | string | `""` | String to partially override cf-runtime.fullname template (will maintain the release name) |
 | podMonitor | object | See below | Add podMonitor (for engine pods) |
-| podMonitor.main.enabled | bool | `false` | Enable service monitor |
+| podMonitor.main.enabled | bool | `false` | Enable pod monitor for engine pods |
+| podMonitor.runner.enabled | bool | `false` | Enable pod monitor for runner pod |
 | re | object | `{}` |  |
 | runner | object | See below | Runner parameters |
 | runner.affinity | object | `{}` | Set affinity |
 | runner.enabled | bool | `true` | Enable the runner |
 | runner.env | object | `{}` | Add additional env vars |
-| runner.image | object | `{"registry":"quay.io","repository":"codefresh/venona","tag":"1.9.17"}` | Set image |
+| runner.image | object | `{"registry":"quay.io","repository":"codefresh/venona","tag":"1.10.1"}` | Set image |
 | runner.init | object | `{"image":{"registry":"quay.io","repository":"codefresh/cli","tag":"0.85.0-rootless"},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"0.2","memory":"256Mi"}}}` | Init container |
 | runner.nodeSelector | object | `{}` | Set node selector |
 | runner.podAnnotations | object | `{}` | Set pod annotations |
@@ -958,8 +959,8 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | runtime.rbac.rules | list | `[]` | Add custom rule to the engine role |
 | runtime.runtimeExtends | list | `["system/default/hybrid/k8s_low_limits"]` | Set parent runtime to inherit. Should not be changes. Parent runtime is controlled from Codefresh side. |
 | runtime.serviceAccount | object | `{"annotations":{},"create":true}` | Set annotation on engine Service Account Ref: https://codefresh.io/docs/docs/administration/codefresh-runner/#injecting-aws-arn-roles-into-the-cluster |
-| serviceMonitor | object | See below | Add serviceMonitor (for dind pods) |
-| serviceMonitor.main.enabled | bool | `false` | Enable service monitor |
+| serviceMonitor | object | See below | Add serviceMonitor |
+| serviceMonitor.main.enabled | bool | `false` | Enable service monitor for dind pods |
 | storage.azuredisk.cachingMode | string | `"None"` |  |
 | storage.azuredisk.skuName | string | `"Premium_LRS"` | Set storage type (`Premium_LRS`) |
 | storage.backend | string | `"local"` | Set backend volume type (`local`/`ebs`/`ebs-csi`/`gcedisk`/`azuredisk`) |

charts/cf-runtime/templates/_components/runner/_rbac.yaml

@@ -22,7 +22,7 @@ metadata:
 rules:
   - apiGroups: [ "" ]
     resources: [ "pods", "persistentvolumeclaims" ]
-    verbs: [ "get", "create", "delete" ]
+    verbs: [ "get", "create", "delete", patch ]
   - apiGroups: [ "" ]
     resources: [ "configmaps", "secrets" ]
     verbs: [ "get", "create", "update", patch ]

charts/cf-runtime/values.yaml

@@ -79,7 +79,7 @@ runner:
   image:
     registry: quay.io
     repository: codefresh/venona
-    tag: 1.9.17
+    tag: 1.10.1
 
   # -- Init container
   init:
@@ -742,12 +742,13 @@ monitor:
   # -- Set affinity
   affinity: {}
 
-# -- Add serviceMonitor (for dind pods)
+# -- Add serviceMonitor
 # @default -- See below
 serviceMonitor:
   main:
-    # -- Enable service monitor
+    # -- Enable service monitor for dind pods
     enabled: false
+    nameOverride: dind
     selector:
       matchLabels:
         app: dind
@@ -762,14 +763,25 @@ serviceMonitor:
 # @default -- See below
 podMonitor:
   main:
-    # -- Enable service monitor
+    # -- Enable pod monitor for engine pods
     enabled: false
+    nameOverride: engine
     selector:
       matchLabels:
         app: runtime
     podMetricsEndpoints:
     - path: /metrics
       targetPort: 9100
+  runner:
+    # -- Enable pod monitor for runner pod
+    enabled: false
+    nameOverride: runner
+    selector:
+      matchLabels:
+        codefresh.io/application: runner
+    podMetricsEndpoints:
+    - path: /metrics
+      targetPort: 8080
 
 # -- Event exporter parameters
 # @default -- See below