Merge branch 'main' into avimoondra/update-port-names-for-istio--2

tryretool · May 21, 2024 · 6349293 · 6349293
2 parents 6bb4313 + 379baa8
commit 6349293
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-deployment.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-deployment.yaml
@@ -195,6 +195,9 @@ spec:
             - name: rpc
               containerPort: {{ include (printf "temporal.%s.grpcPort" $service) $ }}
               protocol: TCP
+            - name: http-membership
+              containerPort: {{ include (printf "temporal.%s.membershipPort" $service) $ }}
+              protocol: TCP
             - name: http-metrics
               containerPort: 9090
               protocol: TCP

diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml
@@ -19,11 +19,22 @@ spec:
   ports:
     - port: {{ .Values.server.frontend.service.port }}
       targetPort: rpc
+{{- if semverCompare ">=1.20-0" $.Capabilities.KubeVersion.Version }}
+      appProtocol: TCP
+{{- end }}
       protocol: TCP
       name: grpc-rpc
       {{- if hasKey .Values.server.frontend.service "nodePort" }}
       nodePort: {{ .Values.server.frontend.service.nodePort }}
       {{- end }}
+    - port: {{ include "temporal.frontend.membershipPort" $ }}
+      targetPort: membership
+{{- if semverCompare ">=1.20-0" $.Capabilities.KubeVersion.Version }}
+      appProtocol: TCP
+{{- end }}
+      protocol: TCP
+      name: grpc-membership
+
   selector:
     app.kubernetes.io/name: {{ include "temporal.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -64,7 +75,17 @@ spec:
     - port: {{ $serviceValues.service.port }}
       targetPort: rpc
       protocol: TCP
+{{- if semverCompare ">=1.20-0" $.Capabilities.KubeVersion.Version }}
+      appProtocol: TCP
+{{- end }}
       name: grpc-rpc
+    - port: {{ include (printf "temporal.%s.membershipPort" $service) $ }}
+      targetPort: membership
+{{- if semverCompare ">=1.20-0" $.Capabilities.KubeVersion.Version }}
+      appProtocol: TCP
+{{- end }}
+      protocol: TCP
+      name: grpc-membership
     - port: 9090
       targetPort: http-metrics
       protocol: TCP