Merge pull request #146 from abhilashjoseph/master

Add namespace to nexus chart
Oteemo · Jul 24, 2020 · 6d46d92 · 6d46d92
2 parents 694d7c7 + c5d58ad
commit 6d46d92
Show file tree

Hide file tree

Showing 20 changed files with 32 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: 2.3.2
+version: 2.4.0
 appVersion: 3.23.0
 description: Sonatype Nexus is an open source repository manager
 keywords:

diff --git a/charts/sonatype-nexus/README.md b/charts/sonatype-nexus/README.md
@@ -77,6 +77,7 @@ The following table lists the configurable parameters of the Nexus chart and the
 
 | Parameter                                                     | Description                         | Default                                 |
 | ------------------------------------------------------------  | ----------------------------------  | ----------------------------------------|
+| `namespaceOverride`                                           | Override for namespace              | `nil` |
 | `statefulset.enabled`                                         | Use statefulset instead of deployment | `false` |
 | `replicaCount`                                                | Number of Nexus service replicas    | `1`                                     |
 | `deploymentStrategy`                                          | Deployment Strategy     |  `rollingUpdate` |

diff --git a/charts/sonatype-nexus/templates/_helpers.tpl b/charts/sonatype-nexus/templates/_helpers.tpl
@@ -24,6 +24,17 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts.
+*/}}
+{{- define "nexus.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

diff --git a/charts/sonatype-nexus/templates/adtl-configmap.yaml b/charts/sonatype-nexus/templates/adtl-configmap.yaml
@@ -6,6 +6,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ $cm.name }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" $root | indent 4 }}
 {{- if $.Values.nexus.labels }}

diff --git a/charts/sonatype-nexus/templates/backup-pv.yaml b/charts/sonatype-nexus/templates/backup-pv.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: {{ .Values.nexusBackup.persistence.pdName }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 spec:

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

diff --git a/charts/sonatype-nexus/templates/backup-secret.yaml b/charts/sonatype-nexus/templates/backup-secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "nexus.fullname" . }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 type: Opaque

diff --git a/charts/sonatype-nexus/templates/configmap.yaml b/charts/sonatype-nexus/templates/configmap.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "nexus.name" . }}-conf
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 {{- if .Values.nexus.labels }}

diff --git a/charts/sonatype-nexus/templates/deployment-statefulset.yaml b/charts/sonatype-nexus/templates/deployment-statefulset.yaml
@@ -7,6 +7,7 @@ kind: Deployment
 {{- end }}
 metadata:
   name: {{ template "nexus.fullname" . }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 {{- if .Values.nexus.labels }}

diff --git a/charts/sonatype-nexus/templates/ingress.yaml b/charts/sonatype-nexus/templates/ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ template "nexus.fullname" . }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
     {{- range $key, $value := .Values.ingress.labels }}

diff --git a/charts/sonatype-nexus/templates/proxy-ks-secret.yaml b/charts/sonatype-nexus/templates/proxy-ks-secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "nexus.proxy-ks.name" . }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 type: Opaque

diff --git a/charts/sonatype-nexus/templates/proxy-route.yaml b/charts/sonatype-nexus/templates/proxy-route.yaml
@@ -3,6 +3,7 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ template "nexus.fullname" . }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
     {{- range $key, $value := .Values.nexusProxyRoute.labels }}
     {{ $key }}: {{ $value | quote }}

diff --git a/charts/sonatype-nexus/templates/proxy-svc.yaml b/charts/sonatype-nexus/templates/proxy-svc.yaml
@@ -7,6 +7,7 @@ metadata:
 {{- else }}
   name: {{ template "nexus.fullname" . }}
 {{- end }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 {{- if .Values.nexus.labels }}

diff --git a/charts/sonatype-nexus/templates/pv.yaml b/charts/sonatype-nexus/templates/pv.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: {{ .Values.persistence.pdName }}
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 spec:

diff --git a/charts/sonatype-nexus/templates/pvc.yaml b/charts/sonatype-nexus/templates/pvc.yaml
@@ -4,6 +4,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "nexus.fullname" . }}-data
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 {{- if .Values.persistence.annotations }}

diff --git a/charts/sonatype-nexus/templates/route.yaml b/charts/sonatype-nexus/templates/route.yaml
@@ -3,6 +3,7 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ .Values.route.name }}
+  namespace: {{ template "nexus.namespace" . }}
   labels: 
     {{- range $key, $value := .Values.route.labels }}
     {{ $key }}: {{ $value | quote }}

diff --git a/charts/sonatype-nexus/templates/secret.yaml b/charts/sonatype-nexus/templates/secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "nexus.name" . }}-secret
+  namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 {{- if .Values.nexus.labels }}

diff --git a/charts/sonatype-nexus/templates/service.yaml b/charts/sonatype-nexus/templates/service.yaml
@@ -4,6 +4,7 @@ kind: Service
 metadata:
 {{- if .Values.service.name }}
   name: {{ .Values.service.name }}
+  namespace: {{ template "nexus.namespace" . }}
 {{- else }}
   name: {{ template "nexus.name" . }}-service
 {{- end }}

diff --git a/charts/sonatype-nexus/templates/serviceaccount.yaml b/charts/sonatype-nexus/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "nexus.fullname" . }}
+  namespace: {{ template "nexus.namespace" . }}
   {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
   {{- end }}

diff --git a/charts/sonatype-nexus/values.yaml b/charts/sonatype-nexus/values.yaml
@@ -1,3 +1,6 @@
+## Overrides for generated resource names
+# namespaceOverride:
+
 statefulset:
   enabled: false
 replicaCount: 1