fix: prometheus serviceMonitor and up to 0.6.0-rc3

VERSION

@@ -1 +1 @@
-0.6.0-rc2
+0.6.0-rc3

charts/interpolator/Chart.yaml

@@ -13,9 +13,9 @@ 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: 0.6.0-rc2
+version: 0.6.0-rc3
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.6.0-rc2"
+appVersion: "0.6.0-rc3"

charts/interpolator/README.md

@@ -2,7 +2,7 @@
 
 
 
-![Version: 0.6.0-rc2](https://img.shields.io/badge/Version-0.6.0--rc2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0-rc2](https://img.shields.io/badge/AppVersion-0.6.0--rc2-informational?style=flat-square) 
+![Version: 0.6.0-rc3](https://img.shields.io/badge/Version-0.6.0--rc3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0-rc3](https://img.shields.io/badge/AppVersion-0.6.0--rc3-informational?style=flat-square) 
 
 Interpolator Helm Chart
 
@@ -24,7 +24,7 @@ Interpolator Helm Chart
 | controllerManager.manager.containerSecurityContext.allowPrivilegeEscalation | bool | `false` |  |
 | controllerManager.manager.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | controllerManager.manager.image.repository | string | `"ghcr.io/grzegorzgniadek/interpolator-operator"` |  |
-| controllerManager.manager.image.tag | string | `"0.6.0-rc2"` |  |
+| controllerManager.manager.image.tag | string | `"0.6.0-rc3"` |  |
 | controllerManager.manager.imagePullPolicy | string | `"Always"` |  |
 | controllerManager.manager.resources.limits.cpu | string | `"200m"` |  |
 | controllerManager.manager.resources.limits.memory | string | `"128Mi"` |  |
@@ -34,10 +34,10 @@ Interpolator Helm Chart
 | controllerManager.serviceAccount.annotations | object | `{}` |  |
 | kubernetesClusterDomain | string | `"cluster.local"` |  |
 | metricsService.enabled | bool | `true` |  |
-| metricsService.ports[0].name | string | `"http"` |  |
+| metricsService.ports[0].name | string | `"metrics"` |  |
 | metricsService.ports[0].port | int | `8080` |  |
 | metricsService.ports[0].protocol | string | `"TCP"` |  |
 | metricsService.ports[0].targetPort | int | `8080` |  |
 | metricsService.type | string | `"ClusterIP"` |  |
 | prometheusMonitor.enabled | bool | `false` |  |
-| prometheusMonitor.path | string | `"/metrics"` |  |
+| prometheusMonitor.interval | string | `"15s"` |  |

charts/interpolator/templates/metrics-monitor.yaml

@@ -4,13 +4,11 @@ kind: ServiceMonitor
 metadata:
   name: {{ include "interpolator.fullname" . }}-metrics-monitor
   labels:
-    control-plane: controller-manager
   {{- include "interpolator.labels" . | nindent 4 }}
 spec:
   endpoints:
-  - path: {{ .Values.prometheusMonitor.path }}
-    port: http
-    scheme: http
+  - interval: {{ .Values.prometheusMonitor.interval }}
+    port: metrics
   selector:
     matchLabels:
       control-plane: controller-manager

charts/interpolator/templates/metrics-service.yaml

@@ -4,13 +4,16 @@ kind: Service
 metadata:
   name: {{ include "interpolator.fullname" . }}-metrics-service
   labels:
-    control-plane: controller-manager
   {{- include "interpolator.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.metricsService.type }}
   selector:
     control-plane: controller-manager
   {{- include "interpolator.selectorLabels" . | nindent 4 }}
   ports:
+  - name: metrics
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
 	{{- .Values.metricsService.ports | toYaml | nindent 2 }}
 {{- end -}}

charts/interpolator/values.yaml

@@ -11,7 +11,7 @@ controllerManager:
         - ALL
     image:
       repository: ghcr.io/grzegorzgniadek/interpolator-operator
-      tag: 0.6.0-rc2
+      tag: 0.6.0-rc3
     imagePullPolicy: Always
     resources:
       limits:
@@ -27,11 +27,11 @@ kubernetesClusterDomain: cluster.local
 metricsService:
   enabled: true
   ports:
-  - name: http
+  - name: metrics
     port: 8080
     protocol: TCP
     targetPort: 8080
   type: ClusterIP
 prometheusMonitor:
   enabled: false
-  path: /metrics
+  interval: 15s

config/manager/kustomization.yaml

@@ -7,4 +7,4 @@ kind: Kustomization
 images:
   - name: controller
     newName: ghcr.io/grzegorzgniadek/interpolator-operator
-    newTag: "0.6.0-rc2"
+    newTag: "0.6.0-rc3"