From 10876a1435e40656be24138af90838532e4e6b7f Mon Sep 17 00:00:00 2001
From: Andree Klattenhoff <andree.klattenhoff@open-xchange.com>
Date: Thu, 8 Jun 2023 11:59:44 +0200
Subject: [PATCH] Change: Renamed monitoring port to follow Istio naming
convention
---
.gitlab/preview/templates/kubernetes-resources.yaml | 2 +-
helm/core-ui-middleware/Chart.yaml | 2 +-
helm/core-ui-middleware/templates/deployment.yaml | 2 +-
helm/core-ui-middleware/templates/service.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab/preview/templates/kubernetes-resources.yaml b/.gitlab/preview/templates/kubernetes-resources.yaml
index 503ebd2..5dff5b2 100644
--- a/.gitlab/preview/templates/kubernetes-resources.yaml
+++ b/.gitlab/preview/templates/kubernetes-resources.yaml
@@ -185,7 +185,7 @@ metadata:
spec:
endpoints:
- path: /metrics
- port: monitoring
+ port: tcp-monitoring
selector:
matchLabels:
grafana.ox.io/service-monitor-implementation: default
diff --git a/helm/core-ui-middleware/Chart.yaml b/helm/core-ui-middleware/Chart.yaml
index 74a553b..51c966e 100644
--- a/helm/core-ui-middleware/Chart.yaml
+++ b/helm/core-ui-middleware/Chart.yaml
@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.0
+version: 2.0.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
diff --git a/helm/core-ui-middleware/templates/deployment.yaml b/helm/core-ui-middleware/templates/deployment.yaml
index 0b84011..c9d328a 100644
--- a/helm/core-ui-middleware/templates/deployment.yaml
+++ b/helm/core-ui-middleware/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
- name: http
containerPort: {{ .Values.containerPort | default 8080 }}
protocol: TCP
- - name: monitoring
+ - name: tcp-monitoring
containerPort: 9090
protocol: TCP
{{- if .Values.probe.liveness.enabled }}
diff --git a/helm/core-ui-middleware/templates/service.yaml b/helm/core-ui-middleware/templates/service.yaml
index 8438e22..f7f8c03 100644
--- a/helm/core-ui-middleware/templates/service.yaml
+++ b/helm/core-ui-middleware/templates/service.yaml
@@ -13,7 +13,7 @@ spec:
protocol: TCP
name: http
- port: 9090
- targetPort: monitoring
+ targetPort: tcp-monitoring
protocol: TCP
name: monitoring
selector:
--
GitLab