HELM-64 Add nodePort to XWiki service

charts/xwiki/Chart.yaml

@@ -4,11 +4,11 @@ name: xwiki
 version: 1.4.0-Beta.2
 type: application
 keywords:
-- xwiki
+  - xwiki
 home: http://xwiki.org
 icon: https://www.xwiki.org/xwiki/bin/download/Main/Logo/logo-x.png
 sources:
-- https://github.com/xwiki-contrib/docker-xwiki
+  - https://github.com/xwiki-contrib/docker-xwiki
 maintainers:
 - name: Ashish Sharma
   email: [email protected]

charts/xwiki/templates/service.yaml

@@ -17,6 +17,11 @@ spec:
       targetPort: {{ .Values.service.internalPort }}
       protocol: TCP
       name: {{ .Values.service.name }}
+      {{- if (and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.http))) }}
+      nodePort: {{ .Values.service.nodePorts.http }}
+      {{- else if eq .Values.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
   {{- if .Values.prometheus.javaagent.enabled }}
     - port: {{ .Values.prometheus.javaagent.port }}
       targetPort: {{ .Values.prometheus.javaagent.port }}

charts/xwiki/values.yaml

@@ -13,20 +13,29 @@ cluster:
 image:
   name: xwiki
   pullPolicy: IfNotPresent
-## Image Tag useful when externalDB is been used
-  tag: ''
+  ## Image Tag useful when externalDB is been used
+  tag: ""
+
 service:
   portName: node
   name: http
   type: ClusterIP
   externalPort: 80
   internalPort: 8080
+  ## Node ports to expose
+  ## @param service.nodePorts.http Node port for HTTP
+  ## NOTE: choose port between <30000-32767>
+  ##
+  nodePorts:
+    http: ""
   # Set an array of externalIPs for the service
-  externalIPs: []
+  externalIPs:
+    []
     # - 10.20.30.40
     # - 10.20.30.41
   # Reference: https://kubernetes.io/docs/reference/networking/virtual-ips/#session-affinity
   sessionAffinity: ClientIP
+
 resources: {}
 #  limits:
 #    cpu: 2000m
@@ -75,7 +84,7 @@ volumePermissions:
 ## https://github.com/bitnami/charts/tree/main/bitnami/mysql
 ##
 mysql:
- ## Whether to deploy a mysql server. Set false for a different database.
+  ## Whether to deploy a mysql server. Set false for a different database.
   enabled: true
   auth:
     rootPassword: "xwiki"
@@ -126,7 +135,7 @@ mysql:
 ## https://github.com/bitnami/charts/tree/main/bitnami/mariadb
 ##
 mariadb:
- ## Whether to deploy a mysql server. Set false for a different database.
+  ## Whether to deploy a mysql server. Set false for a different database.
   enabled: false
   auth:
     rootPassword: "xwiki"
@@ -167,13 +176,14 @@ mariadb:
       port=3306
       socket=/opt/bitnami/mariadb/tmp/mysql.sock
       pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+
 ##
 ## PostgreSQL chart configuration
 ##
 ## https://github.com/helm/charts/tree/master/stable/postgresql
 ##
 postgresql:
- ## Whether to deploy a postgresql server. Set false for a different database.
+  ## Whether to deploy a postgresql server. Set false for a different database.
   enabled: false
   auth:
     postgresPassword: "xwiki"
@@ -198,8 +208,8 @@ externalDB:
   # If set to true default secret will not be created, use custom secret
   customKeyRef:
     enabled: false
-    name: ''
-    key: ''
+    name: ""
+    key: ""
 
 ##
 ## To use external solr enable solr, provide host and port
@@ -209,7 +219,8 @@ solr:
   enabled: false
   replicaCount: 1
   image: gridexx/xwiki:solr8
-  extraEnvVars: []
+  extraEnvVars:
+    []
     # - name: FOO
     #   value: "bar"
   resources: {}
@@ -283,7 +294,6 @@ istio:
       #  name: issuer
       #  kind: ClusterIssuer
 
-
 persistence:
   enabled: true
   existingClaim: ""
@@ -307,14 +317,16 @@ podDisruptionBudget:
 nodeSelector: {}
 
 # Reference: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-tolerations: []
+tolerations:
+  []
   # - key: "key"
   #   operator: "Equal"
   #   value: "value"
   #   effect: "NoSchedule"
 
 # https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-affinity: {}
+affinity:
+  {}
   # nodeAffinity:
   #   requiredDuringSchedulingIgnoredDuringExecution:
   #     nodeSelectorTerms:
@@ -333,16 +345,15 @@ affinity: {}
 #
 imagePullSecrets: []
 
-
 # Custom configuration files for xwiki
 customConfigs:
   # Properties key that exists, replace in line is done with value here defined.
   # If key don't exists, this key and value will be appended in that specific file.
   # This files are list of key: value that are translated as key=value in that file.
   # xwiki.cfg:
-    #
+  #
   # xwiki.properties:
-    #
+  #
 
 # Properties to be passed to Java process with -D parameters using JAVA_OPTS
 properties: