feat: add appProtocol for service meshes (#847)

atlassian · Aug 3, 2024 · 19cc5e6 · 19cc5e6
1 parent e01bfce
commit 19cc5e6
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 0 deletions.
diff --git a/src/main/charts/bamboo/templates/service-jmx.yaml b/src/main/charts/bamboo/templates/service-jmx.yaml
@@ -14,6 +14,7 @@ spec:
   ports:
     - port: {{ .Values.monitoring.jmxExporterPort}}
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
   {{- include "common.labels.selectorLabels" . | nindent 4 }}

diff --git a/src/main/charts/bitbucket/templates/service-jmx.yaml b/src/main/charts/bitbucket/templates/service-jmx.yaml
@@ -14,6 +14,7 @@ spec:
   ports:
     - port: {{ .Values.monitoring.jmxExporterPort}}
       targetPort: jmx
+      appProtocol: http
       name: jmx
     - port: 9998
       targetPort: 9998

diff --git a/src/main/charts/bitbucket/templates/service-mesh.yaml b/src/main/charts/bitbucket/templates/service-mesh.yaml
@@ -21,6 +21,7 @@ spec:
     {{- if .Values.monitoring.exposeJmxMetrics}}
     - port: {{ .Values.monitoring.jmxExporterPort}}
       targetPort: jmx
+      appProtocol: http
       name: jmx
     {{- end }}
   selector:

diff --git a/src/main/charts/confluence/templates/service-jmx.yaml b/src/main/charts/confluence/templates/service-jmx.yaml
@@ -14,6 +14,7 @@ spec:
   ports:
     - port: {{ .Values.monitoring.jmxExporterPort}}
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
   {{- include "common.labels.selectorLabels" . | nindent 4 }}

diff --git a/src/main/charts/crowd/templates/service-jmx.yaml b/src/main/charts/crowd/templates/service-jmx.yaml
@@ -14,6 +14,7 @@ spec:
   ports:
     - port: {{ .Values.monitoring.jmxExporterPort}}
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
   {{- include "common.labels.selectorLabels" . | nindent 4 }}

diff --git a/src/main/charts/jira/templates/service-jmx.yaml b/src/main/charts/jira/templates/service-jmx.yaml
@@ -14,6 +14,7 @@ spec:
   ports:
     - port: {{ .Values.monitoring.jmxExporterPort}}
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
   {{- include "common.labels.selectorLabels" . | nindent 4 }}

diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml
@@ -390,6 +390,7 @@ spec:
   ports:
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
     app.kubernetes.io/name: bamboo

diff --git a/src/test/resources/expected_helm_output/bitbucket/output.yaml b/src/test/resources/expected_helm_output/bitbucket/output.yaml
@@ -440,6 +440,7 @@ spec:
   ports:
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
     - port: 9998
       targetPort: 9998
@@ -469,6 +470,7 @@ spec:
       name: mesh
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
     statefulset.kubernetes.io/pod-name: unittest-bitbucket-mesh-0
@@ -494,6 +496,7 @@ spec:
       name: mesh
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
     statefulset.kubernetes.io/pod-name: unittest-bitbucket-mesh-1
@@ -519,6 +522,7 @@ spec:
       name: mesh
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
     statefulset.kubernetes.io/pod-name: unittest-bitbucket-mesh-2

diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml
@@ -452,6 +452,7 @@ spec:
   ports:
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
     app.kubernetes.io/name: confluence

diff --git a/src/test/resources/expected_helm_output/crowd/output.yaml b/src/test/resources/expected_helm_output/crowd/output.yaml
@@ -314,6 +314,7 @@ spec:
   ports:
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
     app.kubernetes.io/name: crowd

diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml
@@ -333,6 +333,7 @@ spec:
   ports:
     - port: 9999
       targetPort: jmx
+      appProtocol: http
       name: jmx
   selector:
     app.kubernetes.io/name: jira