Make it possible to create a dedicated hazelcast svc

src/main/charts/bitbucket/templates/service-hazelcast.yaml

@@ -0,0 +1,21 @@
+{{ if .Values.bitbucket.hazelcastService.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.names.fullname" . }}-hazelcast
+  labels:
+    {{- include "common.labels.commonLabels" . | nindent 4 }}
+  annotations:
+    {{- with .Values.bitbucket.hazelcastService.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  type: {{ .Values.bitbucket.service.type }}
+  ports:
+    - port: {{ .Values.bitbucket.ports.hazelcast }}
+      targetPort: hazelcast
+      protocol: TCP
+      name: hazelcast
+  selector:
+    {{- include "common.labels.selectorLabels" . | nindent 4 }}
+{{ end }}

src/main/charts/bitbucket/templates/service.yaml

@@ -29,9 +29,11 @@ spec:
       targetPort: ssh
       protocol: TCP
       name: ssh
+  {{- if not .Values.bitbucket.hazelcastService.enabled }}
     - port: {{ .Values.bitbucket.ports.hazelcast }}
       targetPort: hazelcast
       protocol: TCP
       name: hazelcast
+  {{- end }}
   selector:
     {{- include "common.labels.selectorLabels" . | nindent 4 }}

src/main/charts/bitbucket/values.yaml

@@ -543,6 +543,26 @@ bitbucket:
     #
     annotations: {}
 
+  hazelcastService:
+
+    # -- Enable or disable an additional Hazelcast service Bitbucket nodes use to join a cluster
+    # It is recommended to create a separate Hazelcast service if Bitbucket service
+    # is of LoadBalancer type (e.g. NLB), i.e. not expose Hazelcast port at all
+    #
+    enabled: false
+
+    # -- The port on which the Bitbucket K8s Hazelcast Service will listen
+    #
+    port: 5701
+
+    # -- The type of the Hazelcast K8s service to use for Bitbucket
+    #
+    type: ClusterIP
+
+    # -- Additional annotations to apply to the Hazelcast Service
+    #
+    annotations: {}
+
   # Standard K8s field that holds pod-level security attributes and common container settings.
   # https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
   # Do not populate when deploying to OpenShift, unless anyuid policy is attached to a service account.

src/main/charts/confluence/templates/service-hazelcast.yaml

@@ -0,0 +1,21 @@
+{{ if .Values.confluence.hazelcastService.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.names.fullname" . }}-hazelcast
+  labels:
+    {{- include "common.labels.commonLabels" . | nindent 4 }}
+  annotations:
+    {{- with .Values.confluence.hazelcastService.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  type: {{ .Values.confluence.service.type }}
+  ports:
+    - port: {{ .Values.confluence.ports.hazelcast }}
+      targetPort: hazelcast
+      protocol: TCP
+      name: hazelcast
+  selector:
+    {{- include "common.labels.selectorLabels" . | nindent 4 }}
+{{ end }}

src/main/charts/confluence/templates/service.yaml

@@ -24,9 +24,11 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+  {{- if not .Values.confluence.hazelcastService.enabled }}
     - port: {{ .Values.confluence.ports.hazelcast }}
       targetPort: hazelcast
       protocol: TCP
       name: hazelcast
+  {{- end }}
   selector:
     {{- include "common.labels.selectorLabels" . | nindent 4 }}

src/main/charts/confluence/values.yaml

@@ -529,6 +529,26 @@ confluence:
     #
     annotations: {}
 
+  hazelcastService:
+
+    # -- Enable or disable an additional Hazelcast service Confluence nodes use to join a cluster
+    # It is recommended to create a separate Hazelcast service if Confluence service
+    # is of LoadBalancer type (e.g. NLB), i.e. not expose Hazelcast port at all
+    #
+    enabled: false
+
+    # -- The port on which the Confluence K8s Hazelcast Service will listen
+    #
+    port: 5701
+
+    # -- The type of the Hazelcast K8s service to use for Confluence
+    #
+    type: ClusterIP
+
+    # -- Additional annotations to apply to the Hazelcast Service
+    #
+    annotations: {}
+
   # Standard K8s field that holds pod-level security attributes and common container settings.
   # https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
   # Do not populate when deploying to OpenShift, unless anyuid policy is attached to a service account.

src/test/java/test/ServiceTest.java

@@ -131,4 +131,31 @@ void synchrony_service_custom_annotations(Product product) throws Exception {
                 "confluence", "qwerty-synchrony"
         ));
     }
+
+    @ParameterizedTest
+    @EnumSource(value = Product.class, names = {"bitbucket", "confluence"})
+    void dedicated_hazelcast_service(Product product) throws Exception {
+        final var resources = helm.captureKubeResourcesFromHelmChart(product, Map.of(
+                product.name() + ".hazelcastService.enabled", "true"
+        ));
+
+        final var hazelcastService = resources.get(Kind.Service, Service.class, product.getHelmReleaseName() + "-hazelcast");
+
+        assertThat(hazelcastService.getType()).hasTextEqualTo("ClusterIP");
+        assertThat(hazelcastService.getPort("hazelcast"))
+                .hasValueSatisfying(node -> assertThat(node.path("port")).hasValueEqualTo(5701));
+
+        final var service = resources.get(Kind.Service, Service.class, product.getHelmReleaseName());
+        assertThat(service.getPort("hazelcast")).isEmpty();
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Product.class, names = {"bitbucket", "confluence"})
+    void hazelcast_one_service(Product product) throws Exception {
+        final var resources = helm.captureKubeResourcesFromHelmChart(product, Map.of());
+
+        final var service = resources.get(Kind.Service, Service.class, product.getHelmReleaseName());
+        assertThat(service.getPort("hazelcast"))
+                .hasValueSatisfying(node -> assertThat(node.path("port")).hasValueEqualTo(5701));
+    }
 }