Merge pull request 'ozg-6665-hotfix' (#124) from ozg-6665-hotfix into release

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/user-manager/pulls/124


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

pom.xml

@@ -35,7 +35,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.ozgcloud.user</groupId>
 	<artifactId>user-manager</artifactId>
-	<version>2.7.0</version>
+	<version>2.7.1</version>
 	<name>OZG-Cloud User Manager</name>
 	<packaging>pom</packaging>
 

src/main/helm/templates/deployment.yaml

@@ -137,11 +137,14 @@ spec:
           - containerPort: 8080
             name: http
             protocol: TCP
+          - containerPort: 9002
+            name: metrics
+            protocol: TCP
         readinessProbe:
           failureThreshold: 3
           httpGet:
             path: /q/health/ready
-            port: 8080
+            port: metrics
             scheme: HTTP
           periodSeconds: 10
           successThreshold: 1
@@ -150,7 +153,7 @@ spec:
           failureThreshold: 10
           httpGet:
             path: /q/health/started
-            port: 8080
+            port: metrics
             scheme: HTTP
           initialDelaySeconds: 30
           periodSeconds: 10
@@ -161,7 +164,7 @@ spec:
           failureThreshold: 10
           httpGet:
             path: /q/health/started
-            port: 8080
+            port: metrics
             scheme: HTTP
           initialDelaySeconds: 15
           periodSeconds: 5

src/main/helm/templates/service.yaml

@@ -39,6 +39,9 @@ spec:
     - name: http
       port: 8080
       protocol: TCP
+    - name: metrics
+      port: 9002
+      protocol: TCP
   selector:
     {{- include "app.matchLabels" . | indent 4 }}
     component: user-manager

src/main/helm/templates/service_monitor.yaml

@@ -36,7 +36,7 @@ metadata:
 spec:
   endpoints:
   - interval: 30s
-    targetPort: 8080
+    targetPort: metrics
     path: /q/metrics
     scheme: http
   namespaceSelector:

src/test/helm/deployment_probes_test.yaml

@@ -53,7 +53,7 @@ tests:
             failureThreshold: 10
             httpGet:
               path: /q/health/started
-              port: 8080
+              port: metrics
               scheme: HTTP
             initialDelaySeconds: 15
             periodSeconds: 5
@@ -72,7 +72,7 @@ tests:
             failureThreshold: 3
             httpGet:
               path: /q/health/ready
-              port: 8080
+              port: metrics
               scheme: HTTP
             periodSeconds: 10
             successThreshold: 1
@@ -86,7 +86,7 @@ tests:
             failureThreshold: 10
             httpGet:
               path: /q/health/started
-              port: 8080
+              port: metrics
               scheme: HTTP
             initialDelaySeconds: 30
             periodSeconds: 10

src/test/helm/service_monitor_test.yaml

@@ -71,7 +71,7 @@ tests:
             interval: 30s
             path: /q/metrics
             scheme: http
-            targetPort: 8080
+            targetPort: metrics
   - it: namespace selector should contain the namespace
     asserts:
       - contains:

src/test/helm/service_test.yaml

@@ -85,6 +85,16 @@ tests:
             protocol: TCP
           count: 1
           any: true
+  - it: ports should contain the metrics port
+    asserts:
+      - contains:
+          path: spec.ports
+          content:
+            name: metrics
+            port: 9002
+            protocol: TCP
+          count: 1
+          any: true
   - it: selector should contain the component label with the value user-manager
     asserts:
       - equal:

user-manager-interface/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.user</groupId>
 		<artifactId>user-manager</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>user-manager-interface</artifactId>

user-manager-server/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.user</groupId>
 		<artifactId>user-manager</artifactId>
-		<version>2.7.0</version>
+		<version>2.7.1</version>
 	</parent>
 
 	<artifactId>user-manager-server</artifactId>

user-manager-server/src/main/resources/application.yaml

@@ -31,6 +31,9 @@ quarkus:
     level: INFO
   mongodb:
     database: usermanager
+  management:
+    enabled: true
+    port: 9002
 
 grpc:
   server:

user-manager-server/src/test/resources/application.yml

@@ -15,6 +15,8 @@ quarkus:
     level: INFO
   oidc:
     auth-server-url: https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev
+  management:
+    test-port: 9003
 
 keycloak:
   url: http://localhost:8088