Skip to content

Commit 1635efe

Browse files
mikhail-klimkomikhail-klimko
authored
fix: fullnameoverride (#488)
1 parent 1f5f6f3 commit 1635efe

23 files changed

+43
-6
lines changed

‎charts/cf-runtime/.ci/values-ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Values used in `helm-chart-ci` pipeline
22
# All placeholders will be set during ci build
3+
fullnameOverride: cf-runtime-override
34
global:
45
codefreshToken: placeholder
56
accountId: placeholder

‎charts/cf-runtime/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
description: A Helm chart for Codefresh Runner
33
name: cf-runtime
4-
version: 6.3.46
4+
version: 6.3.47
55
keywords:
66
- codefresh
77
- runner
@@ -17,8 +17,8 @@ annotations:
1717
artifacthub.io/containsSecurityUpdates: "false"
1818
# Supported kinds: `added`, `changed`, `deprecated`, `removed`, `fixed`, `security`:
1919
artifacthub.io/changes: |
20-
- kind: security
21-
description: "updated dind-volume-provisioner image tag to fix security vulnerabilities"
20+
- kind: fixed
21+
description: "Fix templates when fullnameOverride is set"
2222
dependencies:
2323
- name: cf-common
2424
repository: oci://quay.io/codefresh/charts

‎charts/cf-runtime/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Codefresh Runner
22

3-
![Version: 6.3.46](https://img.shields.io/badge/Version-6.3.46-informational?style=flat-square)
3+
![Version: 6.3.47](https://img.shields.io/badge/Version-6.3.47-informational?style=flat-square)
44

55
Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
66

@@ -1056,7 +1056,7 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
10561056
| event-exporter.tolerations | list | `[]` | Set tolerations |
10571057
| event-exporter.updateStrategy | object | `{"type":"Recreate"}` | Upgrade strategy |
10581058
| extraResources | list | `[]` | Array of extra objects to deploy with the release |
1059-
| fullNameOverride | string | `""` | String to fully override cf-runtime.fullname template |
1059+
| fullnameOverride | string | `""` | String to fully override cf-runtime.fullname template |
10601060
| global | object | See below | Global parameters |
10611061
| global.accountId | string | `""` | Account ID (required!) Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information |
10621062
| global.agentName | string | `""` | Agent Name (optional!) If omitted, the following format will be used `{{ .Values.global.context }}_{{ .Release.Namespace }}` |

‎charts/cf-runtime/templates/app-proxy/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $appProxyContext := deepCopy . }}
22
{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
33
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $appProxyContext.Values.enabled }}
68
{{- include "app-proxy.resources.deployment" $appProxyContext }}

‎charts/cf-runtime/templates/app-proxy/ingress.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $appProxyContext := deepCopy . }}
22
{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
33
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $appProxyContext.Values.enabled }}
68
{{- include "app-proxy.resources.ingress" $appProxyContext }}

‎charts/cf-runtime/templates/app-proxy/rbac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $appProxyContext := deepCopy . }}
22
{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
33
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $appProxyContext.Values.enabled }}
68
{{- include "app-proxy.resources.rbac" $appProxyContext }}

‎charts/cf-runtime/templates/app-proxy/service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $appProxyContext := deepCopy . }}
22
{{- $_ := set $appProxyContext "Values" (get .Values "appProxy") }}
33
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $appProxyContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $appProxyContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $appProxyContext.Values.enabled }}
68
{{- include "app-proxy.resources.service" $appProxyContext }}

‎charts/cf-runtime/templates/event-exporter/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $eventExporterContext := deepCopy . }}
22
{{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
33
{{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if and $eventExporterContext.Values.enabled }}
68
{{- include "event-exporter.resources.deployment" $eventExporterContext }}

‎charts/cf-runtime/templates/event-exporter/rbac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $eventExporterContext := deepCopy . }}
22
{{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
33
{{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if and $eventExporterContext.Values.enabled }}
68
{{- include "event-exporter.resources.rbac" $eventExporterContext }}

‎charts/cf-runtime/templates/event-exporter/service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $eventExporterContext := deepCopy . }}
22
{{- $_ := set $eventExporterContext "Values" (get .Values "event-exporter") }}
33
{{- $_ := set $eventExporterContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $eventExporterContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $eventExporterContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $eventExporterContext.Values.enabled }}
68
{{- include "event-exporter.resources.service" $eventExporterContext }}

‎charts/cf-runtime/templates/monitor/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $monitorContext := deepCopy . }}
22
{{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
33
{{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $monitorContext.Values.enabled }}
68
{{- include "monitor.resources.deployment" $monitorContext }}

‎charts/cf-runtime/templates/monitor/rbac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $monitorContext := deepCopy . }}
22
{{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
33
{{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $monitorContext.Values.enabled }}
68
{{- include "monitor.resources.rbac" $monitorContext }}

‎charts/cf-runtime/templates/monitor/service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $monitorContext := deepCopy . }}
22
{{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
33
{{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $monitorContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $monitorContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $monitorContext.Values.enabled }}
68
{{- include "monitor.resources.service" $monitorContext }}

‎charts/cf-runtime/templates/runner/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $runnerContext := deepCopy . }}
22
{{- $_ := set $runnerContext "Values" (get .Values "runner") }}
33
{{- $_ := set $runnerContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $runnerContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $runnerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if and $runnerContext.Values.enabled .Values.runtime.agent }}
68
{{- include "runner.resources.deployment" $runnerContext }}

‎charts/cf-runtime/templates/runner/rbac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $runnerContext := deepCopy . }}
22
{{- $_ := set $runnerContext "Values" (get .Values "runner") }}
33
{{- $_ := set $runnerContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $runnerContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $runnerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if and $runnerContext.Values.enabled .Values.runtime.agent }}
68
{{- include "runner.resources.rbac" $runnerContext }}

‎charts/cf-runtime/templates/volume-provisioner/cronjob.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
{{- $_ := set $volumeProvisionerContext.Values "serviceAccount" (get .Values.volumeProvisioner "serviceAccount") }}
44
{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
55
{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
6+
{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
7+
{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
68

79
{{- if and $volumeProvisionerContext.Values.enabled .Values.volumeProvisioner.enabled }}
810
{{- include "dind-volume-provisioner.resources.cronjob" $volumeProvisionerContext }}

‎charts/cf-runtime/templates/volume-provisioner/daemonset.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
{{- $_ := set $volumeProvisionerContext.Values "serviceAccount" (get .Values.volumeProvisioner "serviceAccount") }}
44
{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
55
{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
6+
{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
7+
{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
68

79
{{- if and $volumeProvisionerContext.Values.enabled .Values.volumeProvisioner.enabled }}
810
{{- include "dind-volume-provisioner.resources.daemonset" $volumeProvisionerContext }}

‎charts/cf-runtime/templates/volume-provisioner/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
33
{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
44
{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
5+
{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
6+
{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
57

68
{{- if $volumeProvisionerContext.Values.enabled }}
79
{{- include "dind-volume-provisioner.resources.deployment" $volumeProvisionerContext }}

‎charts/cf-runtime/templates/volume-provisioner/env-vars.yaml

Whitespace-only changes.

‎charts/cf-runtime/templates/volume-provisioner/rbac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{- $volumeProvisionerContext := deepCopy . }}
22
{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
33
{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
5+
{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
46

57
{{- if $volumeProvisionerContext.Values.enabled }}
68
{{- include "dind-volume-provisioner.resources.rbac" $volumeProvisionerContext }}

‎charts/cf-runtime/templates/volume-provisioner/secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
33
{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
44
{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
5+
{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
6+
{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
57

68
{{- if $volumeProvisionerContext.Values.enabled }}
79
{{- include "dind-volume-provisioner.resources.secret" $volumeProvisionerContext }}

‎charts/cf-runtime/templates/volume-provisioner/storageclass.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{{- $_ := set $volumeProvisionerContext "Values" (get .Values "volumeProvisioner") }}
33
{{- $_ := set $volumeProvisionerContext.Values "global" (get .Values "global") }}
44
{{- $_ := set $volumeProvisionerContext.Values "storage" (get .Values "storage") }}
5+
{{- $_ := set $volumeProvisionerContext.Values "nameOverride" (get .Values "nameOverride") }}
6+
{{- $_ := set $volumeProvisionerContext.Values "fullnameOverride" (get .Values "fullnameOverride") }}
57

68
{{- if $volumeProvisionerContext.Values.enabled }}
79
{{- include "dind-volume-provisioner.resources.storageclass" $volumeProvisionerContext }}

‎charts/cf-runtime/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -- String to partially override cf-runtime.fullname template (will maintain the release name)
22
nameOverride: ""
33
# -- String to fully override cf-runtime.fullname template
4-
fullNameOverride: ""
4+
fullnameOverride: ""
55

66
# -- Global parameters
77
# @default -- See below

0 commit comments

Comments
 (0)