Add support to change service name (helm#8506)

* Add support for additional secret, initContainers, postStart command and deployment annotations Signed-off-by: faizanahmad055 <[email protected]> * Add support for additional secret Signed-off-by: faizanahmad055 <[email protected]> * Add support for additional container, additional volume and separate container port and exposed port Signed-off-by: faizanahmad055 <[email protected]> * Rename exposedPort to port and Add additional service Signed-off-by: faizanahmad055 <[email protected]> * Diasble additional service by default Signed-off-by: faizanahmad055 <[email protected]> * Add support to disable nexus-proxy Signed-off-by: faizanahmad055 <[email protected]> * Update readme for nexusProxy.enabled Signed-off-by: faizanahmad055 <[email protected]> * Add support to change service name Signed-off-by: faizanahmad055 <[email protected]> * Update nexus patch version Signed-off-by: faizanahmad055 <[email protected]>
rtnpro · Oct 16, 2018 · 2bc37c9 · 2bc37c9
1 parent e6793d7
commit 2bc37c9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/stable/sonatype-nexus/Chart.yaml b/stable/sonatype-nexus/Chart.yaml
@@ -1,5 +1,5 @@
 name: sonatype-nexus
-version: 1.12.0
+version: 1.12.1
 appVersion: 3.13.0-01
 description: Sonatype Nexus is an open source repository manager
 keywords:

diff --git a/stable/sonatype-nexus/README.md b/stable/sonatype-nexus/README.md
@@ -86,6 +86,7 @@ The following table lists the configurable parameters of the Nexus chart and the
 | `nexus.readinessProbe.path`                 | Path for ReadinessProbe             | /                                       |
 | `nexus.hostAliases`                         | Aliases for IPs in /etc/hosts       | []                                      |
 | `nexusProxy.enabled`                        | Enable nexus proxy                  | `true`                                  |
+| `nexusProxy.svcName`                        | Nexus proxy service name            | `nil`                                  |
 | `nexusProxy.targetPort`                     | Container Port for Nexus proxy      | `8080`                                  |
 | `nexusProxy.port`                           | Port for exposing Nexus             | `8080`                                  |
 | `nexusProxy.imageName`                      | Proxy image                         | `quay.io/travelaudience/docker-nexus-proxy` |
@@ -134,6 +135,7 @@ The following table lists the configurable parameters of the Nexus chart and the
 | `secret.data`                               | Secret data                      | `nil`                                      |
 | `service.enabled`                           | Enable additional service        | `nil`                                      |
 | `service.name`                              | Service name                     | `nil`                                      |
+| `service.portName`                          | Service port name                | `nil`                                      |
 | `service.labels`                            | Service labels                   | `nil`                                      |
 | `service.annotations`                       | Service annotations              | `nil`                                      |
 | `service.targetPort`                        | Service port                     | `nil`                                      |

diff --git a/stable/sonatype-nexus/templates/proxy-svc.yaml b/stable/sonatype-nexus/templates/proxy-svc.yaml
@@ -1,7 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
+{{- if .Values.nexusProxy.svcName }}
+  name: {{ .Values.nexusProxy.svcName }}
+{{- else }}
   name: {{ template "nexus.fullname" . }}
+{{- end }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 {{- if .Values.nexus.labels }}

diff --git a/stable/sonatype-nexus/templates/service.yaml b/stable/sonatype-nexus/templates/service.yaml
@@ -2,7 +2,11 @@
 apiVersion: v1
 kind: Service
 metadata:
+{{- if .Values.service.name }}
+  name: {{ .Values.service.name }}
+{{- else }}
   name: {{ template "nexus.name" . }}-service
+{{- end }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
 {{- if .Values.service.labels }}
@@ -14,7 +18,7 @@ metadata:
 {{- end }}
 spec:
   ports:
-    - name: {{ .Values.service.name }}
+    - name: {{ .Values.service.portName }}
       port: {{ .Values.service.port }}
       protocol: TCP
       targetPort: {{ .Values.service.targetPort }}

diff --git a/stable/sonatype-nexus/values.yaml b/stable/sonatype-nexus/values.yaml
@@ -56,6 +56,7 @@ nexus:
 
 nexusProxy:
   enabled: true
+  # svcName: proxy-svc
   imageName: quay.io/travelaudience/docker-nexus-proxy
   imageTag: 2.3.0
   imagePullPolicy: IfNotPresent
@@ -170,8 +171,9 @@ secret:
 
 # # To use an additional service, set enable to true
 service:
+  # name: additional-svc
   enabled: false
-  name: nexus-service
+  portName: nexus-service
   labels: {}
   annotations: {}
   targetPort: 80