diff --git a/stable/sonatype-nexus/Chart.yaml b/stable/sonatype-nexus/Chart.yaml index 1be6446ca0..2d5a6d5d5c 100644 --- a/stable/sonatype-nexus/Chart.yaml +++ b/stable/sonatype-nexus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: sonatype-nexus -version: 1.18.4 +version: 1.18.5 appVersion: 3.15.2-01 description: Sonatype Nexus is an open source repository manager keywords: diff --git a/stable/sonatype-nexus/templates/ingress.yaml b/stable/sonatype-nexus/templates/ingress.yaml index 3a9fe9b85b..da2da37d4f 100644 --- a/stable/sonatype-nexus/templates/ingress.yaml +++ b/stable/sonatype-nexus/templates/ingress.yaml @@ -11,6 +11,7 @@ metadata: {{- end }} spec: rules: +{{- if .Values.nexusProxy.enabled -}} {{- if .Values.nexusProxy.env.nexusHttpHost }} - host: {{ .Values.nexusProxy.env.nexusHttpHost }} http: @@ -37,6 +38,10 @@ spec: servicePort: {{ .Values.nexusProxy.port }} path: {{ .Values.ingress.path }} {{- end }} +{{- end -}} +{{- with .Values.ingress.rules }} +{{ toYaml . | indent 2 }} + {{- end -}} {{- if .Values.ingress.tls.enabled }} tls: - hosts: diff --git a/stable/sonatype-nexus/templates/service.yaml b/stable/sonatype-nexus/templates/service.yaml index 5d4513359d..4962ac6ce9 100644 --- a/stable/sonatype-nexus/templates/service.yaml +++ b/stable/sonatype-nexus/templates/service.yaml @@ -18,12 +18,17 @@ metadata: {{- end }} spec: ports: - - name: {{ .Values.service.portName }} - port: {{ .Values.service.port }} - protocol: TCP - targetPort: {{ .Values.service.targetPort }} + {{- if .Values.service.portName }} + - name: {{ .Values.service.portName }} + port: {{ .Values.service.port }} + targetPort: {{ .Values.service.targetPort }} + {{- end }} + {{- with .Values.service.ports }} +{{ toYaml . | indent 2 }} + {{- end -}} selector: app: {{ template "nexus.name" . }} release: {{ .Release.Name }} type: {{ .Values.service.serviceType }} -{{- end}} \ No newline at end of file +{{- end}} + diff --git a/stable/sonatype-nexus/values.yaml b/stable/sonatype-nexus/values.yaml index 8a2a44e9ae..c4f88385a4 100644 --- a/stable/sonatype-nexus/values.yaml +++ b/stable/sonatype-nexus/values.yaml @@ -155,6 +155,15 @@ ingress: tls: enabled: true secretName: nexus-tls + # Specify custom rules in addition to or instead of the nexus-proxy rules + rules: + # - host: http://nexus.127.0.0.1.nip.io + # http: + # paths: + # - backend: + # serviceName: additional-svc + # servicePort: 80 + tolerations: [] @@ -195,8 +204,9 @@ secret: service: # name: additional-svc enabled: false - portName: nexus-service labels: {} annotations: {} - targetPort: 80 - port: 80 + ports: + - name: nexus-service + targetPort: 80 + port: 80