Revert chart name and use helper constant to trim the name base (#2824)
Co-authored-by: Bassem Dghaidi <568794+Link-@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									963ab2a748
								
							
						
					
					
						commit
						abc0b678d3
					
				|  | @ -1,5 +1,5 @@ | |||
| apiVersion: v2 | ||||
| name: gha-rs-controller | ||||
| name: gha-runner-scale-set-controller | ||||
| description: A Helm chart for install actions-runner-controller CRD | ||||
| 
 | ||||
| # A chart can be either an 'application' or a 'library' chart. | ||||
|  |  | |||
|  | @ -1,8 +1,14 @@ | |||
| {{/* | ||||
| Expand the name of the chart. | ||||
| */}} | ||||
| 
 | ||||
| 
 | ||||
| {{- define "gha-base-name" -}} | ||||
| gha-rs-controller | ||||
| {{- end }} | ||||
| 
 | ||||
| {{- define "gha-runner-scale-set-controller.name" -}} | ||||
| {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} | ||||
| {{- default (include "gha-base-name" .) .Values.nameOverride | trunc 63 | trimSuffix "-" }} | ||||
| {{- end }} | ||||
| 
 | ||||
| {{/* | ||||
|  | @ -14,7 +20,7 @@ If release name contains chart name it will be used as a full name. | |||
| {{- if .Values.fullnameOverride }} | ||||
| {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} | ||||
| {{- else }} | ||||
| {{- $name := default .Chart.Name .Values.nameOverride }} | ||||
| {{- $name := default (include "gha-base-name" .) .Values.nameOverride }} | ||||
| {{- if contains $name .Release.Name }} | ||||
| {{- .Release.Name | trunc 63 | trimSuffix "-" }} | ||||
| {{- else }} | ||||
|  | @ -27,7 +33,7 @@ If release name contains chart name it will be used as a full name. | |||
| Create chart name and version as used by the chart label. | ||||
| */}} | ||||
| {{- define "gha-runner-scale-set-controller.chart" -}} | ||||
| {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} | ||||
| {{- printf "%s-%s" (include "gha-base-name" .) .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} | ||||
| {{- end }} | ||||
| 
 | ||||
| {{/* | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| apiVersion: v2 | ||||
| name: gha-rs | ||||
| name: gha-runner-scale-set | ||||
| description: A Helm chart for deploying an AutoScalingRunnerSet | ||||
| 
 | ||||
| # A chart can be either an 'application' or a 'library' chart. | ||||
|  |  | |||
|  | @ -1,8 +1,13 @@ | |||
| {{/* | ||||
| Expand the name of the chart. | ||||
| */}} | ||||
| 
 | ||||
| {{- define "gha-base-name" -}} | ||||
| gha-rs | ||||
| {{- end }} | ||||
| 
 | ||||
| {{- define "gha-runner-scale-set.name" -}} | ||||
| {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} | ||||
| {{- default (include "gha-base-name" .) .Values.nameOverride | trunc 63 | trimSuffix "-" }} | ||||
| {{- end }} | ||||
| 
 | ||||
| {{/* | ||||
|  | @ -11,7 +16,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this | |||
| If release name contains chart name it will be used as a full name. | ||||
| */}} | ||||
| {{- define "gha-runner-scale-set.fullname" -}} | ||||
| {{- $name := default .Chart.Name }} | ||||
| {{- $name := default (include "gha-base-name" .) }} | ||||
| {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} | ||||
| {{- end }} | ||||
| 
 | ||||
|  | @ -19,7 +24,7 @@ If release name contains chart name it will be used as a full name. | |||
| Create chart name and version as used by the chart label. | ||||
| */}} | ||||
| {{- define "gha-runner-scale-set.chart" -}} | ||||
| {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} | ||||
| {{- printf "%s-%s" (include "gha-base-name" .) .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} | ||||
| {{- end }} | ||||
| 
 | ||||
| {{/* | ||||
|  |  | |||
|  | @ -53,6 +53,7 @@ You can follow [this troubleshooting guide](https://docs.github.com/en/actions/h | |||
| 1. Add configurable log format to values.yaml and propagate it to listener [#2686](https://github.com/actions/actions-runner-controller/pull/2686) | ||||
| 1. Extend manager roles to accept ephemeralrunnerset/finalizers [#2493](https://github.com/actions/actions-runner-controller/pull/2493) | ||||
| 1. Trim repo/org/enterprise to 63 characters in label values [#2657](https://github.com/actions/actions-runner-controller/pull/2657) | ||||
| 1. Revert back chart renaming [#2824](https://github.com/actions/actions-runner-controller/pull/2824) | ||||
| 1. Discard logs on helm chart tests [#2607](https://github.com/actions/actions-runner-controller/pull/2607) | ||||
| 1. Use build.Version to check if resource version is a mismatch [#2521](https://github.com/actions/actions-runner-controller/pull/2521) | ||||
| 1. Reordering methods and constants so it is easier to look it up [#2501](https://github.com/actions/actions-runner-controller/pull/2501) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue