diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e6afe7ab521aea573c622285ea05e74f69b4009..8bb163e80e38607c8f5f5b8d7a53bac08bc39839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog --- +## [29.1.0-bb.7] - 2021-07-27 +### Fixes +- Fixed extraLabels indentation in all resources that have it. +### Added +- Added extraLabels to Deployment template labels. + ## [29.1.0-bb.6] - 2021-06-30 ### Added - Add openshift toggle, conditionally add port 5353 egress. Changing "openshift:" to true in values.yaml will enable. diff --git a/chart/Chart.yaml b/chart/Chart.yaml index e07100e2a6f047a8399559ef1200946f27758aca..bc634c5e5fd9408a3fdfa8972a5afb485540b9b1 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nexus-repository-manager -version: 29.1.0-bb.6 +version: 29.1.0-bb.7 appVersion: 3.29.0 description: Sonatype Nexus Repository Manager - Universal Binary repository type: application diff --git a/chart/templates/bigbang/configmap-proxy.yaml b/chart/templates/bigbang/configmap-proxy.yaml index e3bdc66725abbcae3a538882448f1c7233e371ee..a38c3234cb60d7dc6276ba515eda96b352ab7d4e 100644 --- a/chart/templates/bigbang/configmap-proxy.yaml +++ b/chart/templates/bigbang/configmap-proxy.yaml @@ -4,11 +4,11 @@ kind: ConfigMap metadata: name: {{ template "nexus.name" . }}-proxy labels: {{- include "nexus.labels" . | nindent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} data: proxy: {{ .Values.proxy.request | toJson | quote }} {{- end }} diff --git a/chart/templates/bigbang/configmap-sso.yaml b/chart/templates/bigbang/configmap-sso.yaml index 6230c5c4ed5e71e97b23ec6ce14bdd8da2eeb397..2eac574f9924d175018c6f7f7981afbd036ec4d2 100644 --- a/chart/templates/bigbang/configmap-sso.yaml +++ b/chart/templates/bigbang/configmap-sso.yaml @@ -4,11 +4,11 @@ kind: ConfigMap metadata: name: {{ template "nexus.name" . }}-sso labels: {{- include "nexus.labels" . | nindent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} data: idp-metadata: {{ .Values.sso.idp_data | toJson | quote }} #realm: {{ .Values.sso.realm | quote }} diff --git a/chart/templates/bigbang/license.yaml b/chart/templates/bigbang/license.yaml index ffab010074af14591a804beb050bae6177987e63..f33d48ede41f3940869abb89295b474f9d76d41d 100644 --- a/chart/templates/bigbang/license.yaml +++ b/chart/templates/bigbang/license.yaml @@ -5,11 +5,11 @@ metadata: name: {{ template "nexus.name" . }}-license labels: {{ include "nexus.labels" . | indent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} data: {{ include "nexus.licenseKey" . | indent 2 }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/chart/templates/bigbang/secret.yaml b/chart/templates/bigbang/secret.yaml index 78c07b364498a9bc54a563b0c2e5ccf5d8d01262..8981d9835f08d9ba8378cc9d95a60c9eb1385634 100644 --- a/chart/templates/bigbang/secret.yaml +++ b/chart/templates/bigbang/secret.yaml @@ -13,11 +13,11 @@ metadata: name: {{ template "nexus.name" . }}-secret labels: {{ include "nexus.labels" . | indent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} data: admin.password: {{ $nexusAdminPass }} admin.username: YWRtaW4K diff --git a/chart/templates/configmap-properties.yaml b/chart/templates/configmap-properties.yaml index 78cf7fbfa1b6e23efd540df52118d9d512f95df9..39a8bccc3254b49b5a97638a21d548ab22295a87 100644 --- a/chart/templates/configmap-properties.yaml +++ b/chart/templates/configmap-properties.yaml @@ -4,11 +4,11 @@ kind: ConfigMap metadata: name: {{ template "nexus.name" . }}-properties labels: {{- include "nexus.labels" . | nindent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} data: nexus.properties: | {{- $data := dict -}} @@ -20,4 +20,4 @@ data: {{- range $k, $v := $data }} {{ $k }}={{ $v }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/chart/templates/configmap.yaml b/chart/templates/configmap.yaml index 55418b146d9792589eddd0e6a1c193971b347383..c4dcd635330e37477f3e5cee2930c3db3d557675 100644 --- a/chart/templates/configmap.yaml +++ b/chart/templates/configmap.yaml @@ -5,11 +5,11 @@ metadata: name: {{ template "nexus.name" . }}-conf labels: {{ include "nexus.labels" . | indent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} data: {{ toYaml .Values.config.data | indent 2 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index c678ca374b9bc7d31309c3becaadbf7db4d279c9..8f3a3901e681968eff5b21e809acbbf9db1e89fd 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -4,11 +4,11 @@ metadata: name: {{ template "nexus.fullname" . }} labels: {{ include "nexus.labels" . | indent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} {{- end }} +{{- end }} {{- if .Values.deployment.annotations }} annotations: {{ toYaml .Values.deployment.annotations | indent 4 }} @@ -34,6 +34,9 @@ spec: {{- end }} labels: {{- include "nexus.selectorLabels" . | nindent 8 }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} spec: serviceAccountName: {{ include "nexus.serviceAccountName" . }} {{- if .Values.deployment.initContainers }} diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index 2711a21c88431019933f086af1757339e0c1e08c..c54db04c7df6578d177cb44607c0c0e71b872b1e 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -8,11 +8,11 @@ metadata: name: {{ $fullName }} labels: {{- include "nexus.labels" . | nindent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/chart/templates/psp-clusterrole.yaml b/chart/templates/psp-clusterrole.yaml index a810a4fb8c2b9694471d012044a753fe0714afc1..3a559075de2604defe4cd5cfce965e444d8af457 100644 --- a/chart/templates/psp-clusterrole.yaml +++ b/chart/templates/psp-clusterrole.yaml @@ -3,9 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: labels: {{- include "nexus.labels" . | nindent 4 }} +{{- if .Values.nexus.extraLabels }} {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} + {{ toYaml . }} {{- end }} +{{- end }} name: {{ template "nexus.name" . }}-psp-use rules: - apiGroups: @@ -16,4 +18,4 @@ rules: - {{ template "nexus.name" . }} verbs: - use -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/chart/templates/psp-rolebinding.yaml b/chart/templates/psp-rolebinding.yaml index 042a2ff4530c771a83ffb726e8cf9b9a23261a76..69040c8e3478b742e43771d58f418f18a74b7fd1 100644 --- a/chart/templates/psp-rolebinding.yaml +++ b/chart/templates/psp-rolebinding.yaml @@ -3,9 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: {{- include "nexus.labels" . | nindent 4 }} +{{- if .Values.nexus.extraLabels }} {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} + {{ toYaml . }} {{- end }} +{{- end }} name: {{ template "nexus.name" . }}-psp-use roleRef: apiGroup: rbac.authorization.k8s.io @@ -14,4 +16,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "nexus.serviceAccountName" . }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/chart/templates/psp.yaml b/chart/templates/psp.yaml index 0d7978efcf712898e6ed84ff07af8d6559757df8..c044a3fff217d5fa39afc1669c80a1e405a3516d 100644 --- a/chart/templates/psp.yaml +++ b/chart/templates/psp.yaml @@ -3,9 +3,11 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: labels: {{- include "nexus.labels" . | nindent 4 }} +{{- if .Values.nexus.extraLabels }} {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} + {{ toYaml . }} {{- end }} +{{- end }} name: {{ template "nexus.name" . }} spec: requiredDropCapabilities: diff --git a/chart/templates/pv.yaml b/chart/templates/pv.yaml index 1f17872ddf8899c1ce3b3ea5b8851c959a0b8761..a7cb01c8de030b66b06d5860a32473e94fa2c19b 100644 --- a/chart/templates/pv.yaml +++ b/chart/templates/pv.yaml @@ -6,11 +6,11 @@ metadata: name: {{ .Values.persistence.pdName }} labels: {{ include "nexus.labels" . | indent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} spec: capacity: storage: {{ .Values.persistence.storageSize }} diff --git a/chart/templates/pvc.yaml b/chart/templates/pvc.yaml index 32e9b78e110309deb2526aa7970c640768117fc0..ae8f1463f9d0e6d2da3e2aa5d4a27b4572782260 100644 --- a/chart/templates/pvc.yaml +++ b/chart/templates/pvc.yaml @@ -5,11 +5,11 @@ metadata: name: {{ template "nexus.fullname" . }}-data labels: {{ include "nexus.labels" . | indent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} {{- if .Values.persistence.annotations }} annotations: {{ toYaml .Values.persistence.annotations | indent 4 }} diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml index ba7acb7f4747157daa5b49ed71fc13abb957c1c5..758f09995b8f13feaf86425b3820c1175c7b7e7d 100644 --- a/chart/templates/service.yaml +++ b/chart/templates/service.yaml @@ -10,11 +10,11 @@ metadata: {{- end }} labels: {{- include "nexus.labels" . | nindent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} + {{- end }} +{{- end }} spec: type: {{ .Values.service.type }} ports: diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml index 5bb8fa500b83e55fce8b02b180616d1d60d9550c..59a8b272058afe67793134e2bf84970c1c3c2682 100644 --- a/chart/templates/serviceaccount.yaml +++ b/chart/templates/serviceaccount.yaml @@ -4,11 +4,11 @@ kind: ServiceAccount metadata: name: {{ include "nexus.serviceAccountName" . }} labels: {{- include "nexus.labels" . | nindent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | indent 4 }} - {{- end }} +{{- if .Values.nexus.extraLabels }} + {{- with .Values.nexus.extraLabels }} + {{ toYaml . }} {{- end }} +{{- end }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 84fc2d39632a264653024e67eae4abacd6566a24..fe0644ba22c72d0d1f3b52905ab464486b0836dd 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -100,6 +100,8 @@ image: pullPolicy: IfNotPresent nexus: + extraLabels: + app: nexus-repository-manager docker: enabled: false registries: []