fix tests with reserved labels
This commit is contained in:
		
							parent
							
								
									bcf3f0dfea
								
							
						
					
					
						commit
						be6e2a3166
					
				|  | @ -11,23 +11,42 @@ metadata: | ||||||
|   name: {{ include "gha-runner-scale-set.scale-set-name" . | replace "_" "-" }} |   name: {{ include "gha-runner-scale-set.scale-set-name" . | replace "_" "-" }} | ||||||
|   namespace: {{ include "gha-runner-scale-set.namespace" . }} |   namespace: {{ include "gha-runner-scale-set.namespace" . }} | ||||||
|   labels: |   labels: | ||||||
|  |     {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} | ||||||
|  |     {{- $extra := dict "app.kubernetes.io/component" "" }} | ||||||
|  |     {{- $reserved := merge $base $extra }} | ||||||
|     {{- with .Values.labels }} |     {{- with .Values.labels }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- if $hasCustomResourceMeta }} |     {{- if $hasCustomResourceMeta }} | ||||||
|     {{- with .Values.resourceMeta.autoscalingRunnerSet.labels }} |     {{- with .Values.resourceMeta.autoscalingRunnerSet.labels }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     app.kubernetes.io/component: "autoscaling-runner-set" |     app.kubernetes.io/component: "autoscaling-runner-set" | ||||||
|     {{- include "gha-runner-scale-set.labels" . | nindent 4 }} |     {{- include "gha-runner-scale-set.labels" . | nindent 4 }} | ||||||
|   annotations: |   annotations: | ||||||
|     {{- with .Values.annotations }} |     {{- with .Values.annotations }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasPrefix "actions.github.com/cleanup-" $k) (eq $k "actions.github.com/values-hash")) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- if $hasCustomResourceMeta }} |     {{- if $hasCustomResourceMeta }} | ||||||
|     {{- with .Values.resourceMeta.autoscalingRunnerSet.annotations }} |     {{- with .Values.resourceMeta.autoscalingRunnerSet.annotations }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasPrefix "actions.github.com/cleanup-" $k) (eq $k "actions.github.com/values-hash")) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     actions.github.com/values-hash: {{ toJson .Values | sha256sum | trunc 63 }} |     actions.github.com/values-hash: {{ toJson .Values | sha256sum | trunc 63 }} | ||||||
|  |  | ||||||
|  | @ -6,8 +6,15 @@ metadata: | ||||||
|   name: {{ include "gha-runner-scale-set.githubsecret" . }} |   name: {{ include "gha-runner-scale-set.githubsecret" . }} | ||||||
|   namespace: {{ include "gha-runner-scale-set.namespace" . }} |   namespace: {{ include "gha-runner-scale-set.namespace" . }} | ||||||
|   labels: |   labels: | ||||||
|  |     {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} | ||||||
|  |     {{- $extra := dict "app.kubernetes.io/component" "" }} | ||||||
|  |     {{- $reserved := merge $base $extra }} | ||||||
|     {{- with .Values.labels }} |     {{- with .Values.labels }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- if $hasCustomResourceMeta }} |     {{- if $hasCustomResourceMeta }} | ||||||
|     {{- with .Values.resourceMeta.githubConfigSecret.labels }} |     {{- with .Values.resourceMeta.githubConfigSecret.labels }} | ||||||
|  |  | ||||||
|  | @ -8,8 +8,15 @@ metadata: | ||||||
|   name: {{ include "gha-runner-scale-set.kubeModeRoleName" . }} |   name: {{ include "gha-runner-scale-set.kubeModeRoleName" . }} | ||||||
|   namespace: {{ include "gha-runner-scale-set.namespace" . }} |   namespace: {{ include "gha-runner-scale-set.namespace" . }} | ||||||
|   labels: |   labels: | ||||||
|  |     {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} | ||||||
|  |     {{- $extra := dict "app.kubernetes.io/component" "" }} | ||||||
|  |     {{- $reserved := merge $base $extra }} | ||||||
|     {{- with .Values.labels }} |     {{- with .Values.labels }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- if $hasCustomResourceMeta }} |     {{- if $hasCustomResourceMeta }} | ||||||
|     {{- with .Values.resourceMeta.kubernetesModeRole.labels }} |     {{- with .Values.resourceMeta.kubernetesModeRole.labels }} | ||||||
|  |  | ||||||
|  | @ -7,8 +7,15 @@ metadata: | ||||||
|   name: {{ include "gha-runner-scale-set.kubeModeRoleBindingName" . }} |   name: {{ include "gha-runner-scale-set.kubeModeRoleBindingName" . }} | ||||||
|   namespace: {{ include "gha-runner-scale-set.namespace" . }} |   namespace: {{ include "gha-runner-scale-set.namespace" . }} | ||||||
|   labels: |   labels: | ||||||
|  |     {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} | ||||||
|  |     {{- $extra := dict "app.kubernetes.io/component" "" }} | ||||||
|  |     {{- $reserved := merge $base $extra }} | ||||||
|     {{- with .Values.labels }} |     {{- with .Values.labels }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- if $hasCustomResourceMeta }} |     {{- if $hasCustomResourceMeta }} | ||||||
|     {{- with .Values.resourceMeta.kubernetesModeRoleBinding.labels }} |     {{- with .Values.resourceMeta.kubernetesModeRoleBinding.labels }} | ||||||
|  |  | ||||||
|  | @ -18,8 +18,15 @@ metadata: | ||||||
|     {{- end }} |     {{- end }} | ||||||
|   {{- end }} |   {{- end }} | ||||||
|   labels: |   labels: | ||||||
|  |     {{- $base := include "gha-runner-scale-set.labels" . | fromYaml }} | ||||||
|  |     {{- $extra := dict "app.kubernetes.io/component" "" }} | ||||||
|  |     {{- $reserved := merge $base $extra }} | ||||||
|     {{- with .Values.labels }} |     {{- with .Values.labels }} | ||||||
|     {{- toYaml . | nindent 4 }} |     {{- range $k, $v := . }} | ||||||
|  |     {{- if not (or (hasKey $reserved $k) (hasPrefix "actions.github.com/" $k)) }} | ||||||
|  |     {{ $k }}: {{ $v | quote }} | ||||||
|  |     {{- end }} | ||||||
|  |     {{- end }} | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     {{- if $hasCustomResourceMeta }} |     {{- if $hasCustomResourceMeta }} | ||||||
|     {{- with .Values.resourceMeta.kubernetesModeServiceAccount.labels }} |     {{- with .Values.resourceMeta.kubernetesModeServiceAccount.labels }} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue