Merge pull request #271 from hamza3202/add-labels-to-nexus-resources

Add labels to resources
Oteemo · Mar 31, 2021 · f070d9d · f070d9d
2 parents 6904bc3 + fd317ef
commit f070d9d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 1 deletion.
diff --git a/charts/sonatype-nexus/Chart.yaml b/charts/sonatype-nexus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sonatype-nexus
-version: 4.4.3
+version: 5.0.0
 appVersion: 3.27.0
 description: Sonatype Nexus is an open source repository manager
 keywords:

diff --git a/charts/sonatype-nexus/templates/backup-pv.yaml b/charts/sonatype-nexus/templates/backup-pv.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 spec:
   capacity:
     storage: {{ .Values.nexusBackup.persistence.storageSize }}

diff --git a/charts/sonatype-nexus/templates/backup-pvc.yaml b/charts/sonatype-nexus/templates/backup-pvc.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 {{- if .Values.nexusBackup.persistence.annotations }}
   annotations:
 {{ toYaml .Values.nexusBackup.persistence.annotations | indent 4 }}

diff --git a/charts/sonatype-nexus/templates/backup-secret.yaml b/charts/sonatype-nexus/templates/backup-secret.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 type: Opaque
 data:
   nexus.nexusAdminPassword: {{ printf "%s%s" "Basic " (printf "%s%s" "admin:" .Values.nexusBackup.nexusAdminPassword | b64enc) | cat | b64enc | quote }}

diff --git a/charts/sonatype-nexus/templates/cloudiam-pvc.yaml b/charts/sonatype-nexus/templates/cloudiam-pvc.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 {{- if .Values.nexusCloudiam.persistence.annotations }}
   annotations:
 {{ toYaml .Values.nexusCloudiam.persistence.annotations | indent 4 }}

diff --git a/charts/sonatype-nexus/templates/pv.yaml b/charts/sonatype-nexus/templates/pv.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 spec:
   capacity:
     storage: {{ .Values.persistence.storageSize }}

diff --git a/charts/sonatype-nexus/templates/pvc.yaml b/charts/sonatype-nexus/templates/pvc.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 {{- if .Values.persistence.annotations }}
   annotations:
 {{ toYaml .Values.persistence.annotations | indent 4 }}

diff --git a/charts/sonatype-nexus/templates/serviceaccount.yaml b/charts/sonatype-nexus/templates/serviceaccount.yaml
@@ -8,6 +8,11 @@ metadata:
   name: {{ template "nexus.fullname" . }}
   {{- end }}
   namespace: {{ template "nexus.namespace" . }}
+  labels:
+{{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
   {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
   {{- end }}