Merge pull request #62 from setiseta/main

NodePorts not adjustable & Service for IP Discovery not specified

Author: Anadris

charts/bunkerweb/templates/bunkerweb-service-external.yaml

@@ -20,8 +20,14 @@ spec:
       targetPort: 8080
       protocol: TCP
       name: http
+      {{- if and (eq .Values.service.type "NodePort") .Values.service.nodePortHttp }}
+      nodePort: {{ .Values.service.nodePortHttp }}
+      {{- end }}
     - port: 443
       targetPort: 8443
       protocol: TCP
       name: https
+      {{- if and (eq .Values.service.type "NodePort") .Values.service.nodePortHttps }}
+      nodePort: {{ .Values.service.nodePortHttps }}
+      {{- end }}
 {{- end }}

charts/bunkerweb/templates/controller-deployment.yaml

@@ -67,6 +67,8 @@ spec:
               value: "{{ .Values.settings.kubernetes.domainName }}"
             - name: KUBERNETES_IGNORE_ANNOTATIONS
               value: "{{ .Values.settings.kubernetes.ignoreAnnotations }}"
+            - name: BUNKERWEB_SERVICE_NAME
+              value: "{{ include "bunkerweb.fullname" . }}-external"
             {{- if .Values.controller.extraEnvs }}
             {{- toYaml .Values.controller.extraEnvs | nindent 12 }}
             {{- end }}

charts/bunkerweb/values.yaml

@@ -263,6 +263,10 @@ service:
   # NodePort: Exposes service on each node's IP at a static port
   # ClusterIP: Only accessible within the cluster
   type: LoadBalancer
+  
+  # Set defined NodePorts if using Service type NodePort, if not set, random ports will be assigned
+  # nodePortHttp: 30080
+  # nodePortHttps: 30443
 
   # External traffic policy: Local or Cluster
   # Local: Preserves client IP but may cause uneven distribution