fix: fullnameoverride (#488)

codefresh-io · Jul 12, 2024 · 1635efe · 1635efe
1 parent 1f5f6f3
commit 1635efe
Show file tree

Hide file tree

Showing 23 changed files with 43 additions and 6 deletions.
diff --git a/charts/cf-runtime/.ci/values-ci.yaml b/charts/cf-runtime/.ci/values-ci.yaml
@@ -1,5 +1,6 @@
 # Values used in `helm-chart-ci` pipeline
 # All placeholders will be set during ci build
+fullnameOverride: cf-runtime-override
 global:
   codefreshToken: placeholder
   accountId: placeholder

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.46
+version: 6.3.47
 keywords:
   - codefresh
   - runner
@@ -17,8 +17,8 @@ annotations:
   artifacthub.io/containsSecurityUpdates: "false"
   # Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
   artifacthub.io/changes: |
-    - kind: security
-      description: "updated dind-volume-provisioner image tag to fix security vulnerabilities"
+    - kind: fixed
+      description: "Fix templates when fullnameOverride is set"
 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.46](https://img.shields.io/badge/Version-6.3.46-informational?style=flat-square)
+![Version: 6.3.47](https://img.shields.io/badge/Version-6.3.47-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
 
@@ -1056,7 +1056,7 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | event-exporter.tolerations | list | `[]` | Set tolerations |
 | event-exporter.updateStrategy | object | `{"type":"Recreate"}` | Upgrade strategy |
 | extraResources | list | `[]` | Array of extra objects to deploy with the release |
-| fullNameOverride | string | `""` | String to fully override cf-runtime.fullname template |
+| fullnameOverride | string | `""` | String to fully override cf-runtime.fullname template |
 | global | object | See below | Global parameters |
 | global.accountId | string | `""` | Account ID (required!) Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information |
 | global.agentName | string | `""` | Agent Name (optional!) If omitted, the following format will be used `{{ .Values.global.context }}_{{ .Release.Namespace }}` |

diff --git a/charts/cf-runtime/templates/app-proxy/deployment.yaml b/charts/cf-runtime/templates/app-proxy/deployment.yaml
@@ -1,6 +1,8 @@
 {{- $appProxyContext := deepCopy . }}
 {{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
 {{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $appProxyContext.Values.enabled }}
 {{- include "app-proxy.resources.deployment" $appProxyContext }}

diff --git a/charts/cf-runtime/templates/app-proxy/ingress.yaml b/charts/cf-runtime/templates/app-proxy/ingress.yaml
@@ -1,6 +1,8 @@
 {{- $appProxyContext := deepCopy . }}
 {{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
 {{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $appProxyContext.Values.enabled }}
 {{- include "app-proxy.resources.ingress" $appProxyContext }}

diff --git a/charts/cf-runtime/templates/app-proxy/rbac.yaml b/charts/cf-runtime/templates/app-proxy/rbac.yaml
@@ -1,6 +1,8 @@
 {{- $appProxyContext := deepCopy . }}
 {{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
 {{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $appProxyContext.Values.enabled }}
 {{- include "app-proxy.resources.rbac" $appProxyContext }}

diff --git a/charts/cf-runtime/templates/app-proxy/service.yaml b/charts/cf-runtime/templates/app-proxy/service.yaml
@@ -1,6 +1,8 @@
 {{- $appProxyContext := deepCopy . }}
 {{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
 {{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
+{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $appProxyContext.Values.enabled }}
 {{- include "app-proxy.resources.service" $appProxyContext }}

diff --git a/charts/cf-runtime/templates/event-exporter/deployment.yaml b/charts/cf-runtime/templates/event-exporter/deployment.yaml
@@ -1,6 +1,8 @@
 {{- $eventExporterContext := deepCopy . }}
 {{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
 {{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
+{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if and $eventExporterContext.Values.enabled }}
 {{- include "event-exporter.resources.deployment" $eventExporterContext }}

diff --git a/charts/cf-runtime/templates/event-exporter/rbac.yaml b/charts/cf-runtime/templates/event-exporter/rbac.yaml
@@ -1,6 +1,8 @@
 {{- $eventExporterContext := deepCopy . }}
 {{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
 {{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
+{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if and $eventExporterContext.Values.enabled }}
 {{- include "event-exporter.resources.rbac" $eventExporterContext }}

diff --git a/charts/cf-runtime/templates/event-exporter/service.yaml b/charts/cf-runtime/templates/event-exporter/service.yaml
@@ -1,6 +1,8 @@
 {{- $eventExporterContext := deepCopy . }}
 {{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
 {{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
+{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $eventExporterContext.Values.enabled }}
 {{- include "event-exporter.resources.service" $eventExporterContext }}

diff --git a/charts/cf-runtime/templates/monitor/deployment.yaml b/charts/cf-runtime/templates/monitor/deployment.yaml
@@ -1,6 +1,8 @@
 {{- $monitorContext := deepCopy . }}
 {{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
 {{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
+{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $monitorContext.Values.enabled }}
 {{- include "monitor.resources.deployment" $monitorContext }}

diff --git a/charts/cf-runtime/templates/monitor/rbac.yaml b/charts/cf-runtime/templates/monitor/rbac.yaml
@@ -1,6 +1,8 @@
 {{- $monitorContext := deepCopy . }}
 {{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
 {{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
+{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $monitorContext.Values.enabled }}
 {{- include "monitor.resources.rbac" $monitorContext }}

diff --git a/charts/cf-runtime/templates/monitor/service.yaml b/charts/cf-runtime/templates/monitor/service.yaml
@@ -1,6 +1,8 @@
 {{- $monitorContext := deepCopy . }}
 {{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
 {{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
+{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $monitorContext.Values.enabled }}
 {{- include "monitor.resources.service" $monitorContext }}

diff --git a/charts/cf-runtime/templates/runner/deployment.yaml b/charts/cf-runtime/templates/runner/deployment.yaml
@@ -1,6 +1,8 @@
 {{- $runnerContext := deepCopy . }}
 {{- $_ := set $runnerContext "Values" (get .Values "runner") }}
 {{- $_ := set $runnerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $runnerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $runnerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if and $runnerContext.Values.enabled .Values.runtime.agent }}
 {{- include "runner.resources.deployment" $runnerContext }}

diff --git a/charts/cf-runtime/templates/runner/rbac.yaml b/charts/cf-runtime/templates/runner/rbac.yaml
@@ -1,6 +1,8 @@
 {{- $runnerContext := deepCopy . }}
 {{- $_ := set $runnerContext "Values" (get .Values "runner") }}
 {{- $_ := set $runnerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $runnerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $runnerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if and $runnerContext.Values.enabled .Values.runtime.agent }}
 {{- include "runner.resources.rbac" $runnerContext }}

diff --git a/charts/cf-runtime/templates/volume-provisioner/cronjob.yaml b/charts/cf-runtime/templates/volume-provisioner/cronjob.yaml
@@ -3,6 +3,8 @@
 {{- $_ := set $volumeProvisionerContext.Values "serviceAccount" (get .Values.volumeProvisioner "serviceAccount") }}
 {{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
 {{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if and $volumeProvisionerContext.Values.enabled .Values.volumeProvisioner.enabled }}
 {{- include "dind-volume-provisioner.resources.cronjob" $volumeProvisionerContext }}

diff --git a/charts/cf-runtime/templates/volume-provisioner/daemonset.yaml b/charts/cf-runtime/templates/volume-provisioner/daemonset.yaml
@@ -3,6 +3,8 @@
 {{- $_ := set $volumeProvisionerContext.Values "serviceAccount" (get .Values.volumeProvisioner "serviceAccount") }}
 {{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
 {{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if and $volumeProvisionerContext.Values.enabled .Values.volumeProvisioner.enabled }}
 {{- include "dind-volume-provisioner.resources.daemonset" $volumeProvisionerContext }}

diff --git a/charts/cf-runtime/templates/volume-provisioner/deployment.yaml b/charts/cf-runtime/templates/volume-provisioner/deployment.yaml
@@ -2,6 +2,8 @@
 {{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
 {{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
 {{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $volumeProvisionerContext.Values.enabled }}
 {{- include "dind-volume-provisioner.resources.deployment" $volumeProvisionerContext }}

diff --git a/charts/cf-runtime/templates/volume-provisioner/env-vars.yaml b/charts/cf-runtime/templates/volume-provisioner/env-vars.yaml
diff --git a/charts/cf-runtime/templates/volume-provisioner/rbac.yaml b/charts/cf-runtime/templates/volume-provisioner/rbac.yaml
@@ -1,6 +1,8 @@
 {{- $volumeProvisionerContext := deepCopy . }}
 {{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
 {{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $volumeProvisionerContext.Values.enabled }}
 {{- include "dind-volume-provisioner.resources.rbac" $volumeProvisionerContext }}

diff --git a/charts/cf-runtime/templates/volume-provisioner/secret.yaml b/charts/cf-runtime/templates/volume-provisioner/secret.yaml
@@ -2,6 +2,8 @@
 {{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
 {{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
 {{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $volumeProvisionerContext.Values.enabled }}
 {{- include "dind-volume-provisioner.resources.secret" $volumeProvisionerContext }}

diff --git a/charts/cf-runtime/templates/volume-provisioner/storageclass.yaml b/charts/cf-runtime/templates/volume-provisioner/storageclass.yaml
@@ -2,6 +2,8 @@
 {{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
 {{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
 {{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
+{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
+{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
 
 {{- if $volumeProvisionerContext.Values.enabled }}
 {{- include "dind-volume-provisioner.resources.storageclass" $volumeProvisionerContext }}

diff --git a/charts/cf-runtime/values.yaml b/charts/cf-runtime/values.yaml
@@ -1,7 +1,7 @@
 # -- String to partially override cf-runtime.fullname template (will maintain the release name)
 nameOverride: ""
 # -- String to fully override cf-runtime.fullname template
-fullNameOverride: ""
+fullnameOverride: ""
 
 # -- Global parameters
 # @default -- See below