Merge pull request #2 from seyyedmojtabarezvani/fix/delete-ingress-ad…

…d-nodeport-number-if-exists

Delete Ingress file from template and ingress configs from values, also add listeningNodePort to values

charts/janus/Chart.yaml

@@ -12,6 +12,6 @@ maintainers:
 
 type: application
 
-version: 0.1.0
+version: 0.1.1
 
 appVersion: "latest"

charts/janus/templates/NOTES.txt

@@ -1,11 +1,5 @@
 1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
+{{- if contains "NodePort" .Values.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "janus.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT

charts/janus/templates/service.yaml

@@ -12,11 +12,17 @@ spec:
       targetPort: tcp-8188
       port: 8188
       protocol: TCP
+      {{- if and (eq .Values.service.type "NodePort") .Values.service.listeningWSNodePort }}
+      nodePort: {{ .Values.service.listeningWSNodePort }}
+      {{- end }}
 
     - name: tcp-8088
       targetPort: tcp-8088
       port: 8088
       protocol: TCP
+      {{- if and (eq .Values.service.type "NodePort") .Values.service.listeningHTTPNodePort }}
+      nodePort: {{ .Values.service.listeningHTTPNodePort }}
+      {{- end }}
 
     - name: tcp-8089
       targetPort: tcp-8089

charts/janus/values.yaml

@@ -41,17 +41,8 @@ securityContext:
 
 service:
   type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  router: private
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: Prefix
-  tls: []
+  listeningWSNodePort: 31777
+  listeningHTTPNodePort: 31778
 
 resources:
   limits: