feat: extra ebs tags

codefresh-io · Jun 28, 2024 · a6906b1 · a6906b1
1 parent 8d22eb1
commit a6906b1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/charts/cf-runtime/Chart.yaml b/charts/cf-runtime/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Codefresh Runner
 name: cf-runtime
-version: 6.3.38
+version: 6.3.39
 keywords:
   - codefresh
   - runner
@@ -17,8 +17,8 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "false"
   # Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Downgrade dind image to 26.0.0-1.28.6
+    - kind: added
+      description: Add option to specify extra tags for EBS volumes
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts

diff --git a/charts/cf-runtime/README.md b/charts/cf-runtime/README.md
@@ -1,6 +1,6 @@
 ## Codefresh Runner
 
-![Version: 6.3.38](https://img.shields.io/badge/Version-6.3.38-informational?style=flat-square)
+![Version: 6.3.39](https://img.shields.io/badge/Version-6.3.39-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
 
@@ -1189,6 +1189,7 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | storage.ebs.accessKeyIdSecretKeyRef | object | `{}` | Existing secret containing AWS_ACCESS_KEY_ID. |
 | storage.ebs.availabilityZone | string | `"us-east-1a"` | Set EBS volumes availability zone (required) |
 | storage.ebs.encrypted | string | `"false"` | Enable encryption (optional) |
+| storage.ebs.extraVolumeTags | object | `{}` | Set additional tags for EBS volumes (optional) |
 | storage.ebs.kmsKeyId | string | `""` | Set KMS encryption key ID (optional) |
 | storage.ebs.secretAccessKey | string | `""` | Set AWS_SECRET_ACCESS_KEY for volume-provisioner (optional) Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#dind-volume-provisioner-permissions |
 | storage.ebs.secretAccessKeySecretKeyRef | object | `{}` | Existing secret containing AWS_SECRET_ACCESS_KEY |

diff --git a/charts/cf-runtime/templates/_components/volume-provisioner/_storageclass.yaml b/charts/cf-runtime/templates/_components/volume-provisioner/_storageclass.yaml
@@ -31,6 +31,13 @@ parameters:
   {{- with .Values.storage.ebs.throughput }}
   throughput: {{ . | quote }}
   {{- end }}
+  {{- with .Values.storage.ebs.extraVolumeTags }}
+    {{- $index := 1 }}
+    {{- range $key, $val := . }}
+  {{ printf "tagSpecification_%d" $index }}: {{ printf "%s=%s" $key $val | quote }}
+    {{- $index = add $index 1 }}
+    {{- end }}
+  {{- end }}
 {{- else if or (eq .Values.storage.backend "azuredisk") (eq .Values.storage.backend "azuredisk-csi")}}
   volumeBackend: {{ .Values.storage.backend }}
   kind: managed
@@ -44,4 +51,4 @@ parameters:
   resourceGroup: {{ . | quote }}
   {{- end }}
 {{- end }}
-{{- end -}}
+{{- end -}}
diff --git a/charts/cf-runtime/values.yaml b/charts/cf-runtime/values.yaml
@@ -303,6 +303,12 @@ storage:
     encrypted: "false"
     # -- Set KMS encryption key ID (optional)
     kmsKeyId: ""
+    # -- Set additional tags for EBS volumes (optional)
+    extraVolumeTags: {}
+    # E.g.
+    # extraVolumeTags:
+    #   key1: value1
+    #   key2: value2
 
     # -- Set AWS_ACCESS_KEY_ID for volume-provisioner (optional)
     # Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#dind-volume-provisioner-permissions