add 'labels' to the Helm chart to simplify the declaration of labels

ansible · May 28, 2024 · e4cabc7 · e4cabc7
1 parent 56df327
commit e4cabc7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/.helm/starter/README.md b/.helm/starter/README.md
@@ -226,6 +226,7 @@ AWX:
 | Value | Description | Default |
 |---|---|---|
 | `AWX.enabled` | Enable this AWX resource configuration | `false` |
+| `AWX.labels` | Set AWX resource labels | - |
 | `AWX.name` | The name of the AWX resource and default prefix for other resources | `"awx"` |
 | `AWX.spec` | specs to directly configure the AWX resource | `{}` |
 | `AWX.postgres` | configurations for the external postgres secret | - |

diff --git a/.helm/starter/templates/_helpers.tpl b/.helm/starter/templates/_helpers.tpl
@@ -4,3 +4,13 @@ Generate the name of the postgres secret, expects AWX context passed in
 {{- define "postgres.secretName" -}}
 {{ default (printf "%s-postgres-configuration" .Values.AWX.name) .Values.AWX.postgres.secretName }}
 {{- end }}
+{{/*
+Generate liste of labels
+*/}}
+{{- define "awx.labels" }}
+{{- if hasKey .Values.AWX "labels" -}}
+{{- range $key, $value := .Values.AWX.labels }}
+{{ $key }}: {{ $value | quote }}
+{{- end }}
+{{- end -}}
+{{- end }}
diff --git a/.helm/starter/templates/awx-deploy.yaml b/.helm/starter/templates/awx-deploy.yaml
@@ -5,6 +5,11 @@ kind: AWX
 metadata:
  name: {{ .name }}
  namespace: {{ $.Release.Namespace }}
+{{- /* Provide labels if present */}}
+{{- if hasKey . "labels" }}
+ labels:
+ {{- include "awx.labels" . | indent 4 }}
+{{- end }}
 spec:
 {{- /* Provide custom persistent volumes configs if enabled */}}
 {{- include "spec.storageClassNames" $ }}

diff --git a/Makefile b/Makefile
@@ -375,6 +375,13 @@ helm-chart-generate: kustomize helm kubectl-slice yq charts
  for file in $${cluster_scoped_files}; do\
  $(YQ) -i '.metadata.name += "-{{ .Release.Name }}"' $${file};\
  done
+ # Add labels to all deployment resources
+ for file in charts/$(CHART_NAME)/raw-files/deployment*.yaml; do\
+ $(YQ) -i '.metadata.labels += { "INCLUDE_ANCHOR": "INCLUDE_INDENT_4"}' $${file};\
+ $(YQ) -i '.spec.template.metadata.labels += { "INCLUDE_ANCHOR": "INCLUDE_INDENT_8"}' $${file};\
+ $(SED_I) 's/INCLUDE_ANCHOR: INCLUDE_INDENT_4/{{- include ""awx.labels"" . | indent 4 }}/g' $${file};\
+ $(SED_I) 's/INCLUDE_ANCHOR: INCLUDE_INDENT_8/{{- include ""awx.labels"" . | indent 8 }}/g' $${file};\
+ done
 
  # Correct the reference for the clusterrolebinding
  $(YQ) -i '.roleRef.name += "-{{ .Release.Name }}"' 'charts/$(CHART_NAME)/raw-files/clusterrolebinding-awx-operator-proxy-rolebinding.yaml'