simple-app 0.14.0: * Add monitoringCoreos.port for case when monito…

…ring endpoint is on a different port
epoch8 · Oct 23, 2024 · 0474a37 · 0474a37
1 parent ba0d8f8
commit 0474a37
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/charts/simple-app/CHANGELOG.md b/charts/simple-app/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.14.0
+
+* Add `monitoringCoreos.port` for case when monitoring endpoint is on a
+  different port
+
 # 0.13.0
 
 * Add `spreadServiceAcrossNodes` setting

diff --git a/charts/simple-app/Chart.yaml b/charts/simple-app/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: "0.13.0"
+version: "0.14.0"
 
 # 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/charts/simple-app/TODO b/charts/simple-app/TODO
@@ -0,0 +1,2 @@
+* Remove `fullnameOverride` - it should always be equal to `.Release.Name`
+* Rename `nameOverride` to `appName`, make it required
diff --git a/charts/simple-app/templates/servicemonitor.yaml b/charts/simple-app/templates/servicemonitor.yaml
@@ -7,8 +7,8 @@ metadata:
   name: {{ include "simple-app.fullname" . }}
 spec:
   endpoints:
-    - path: {{ .Values.gke.monitoring.path }}
-      port: http
+    - path: {{ .Values.monitoringCoreos.path }}
+      port: {{ .Values.monitoringCoreos.port }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/charts/simple-app/values.schema.json b/charts/simple-app/values.schema.json
@@ -234,6 +234,9 @@
                 },
                 "path": {
                     "type": "string"
+                },
+                "port": {
+                    "type": ["string", "integer"]
                 }
             }
         }

diff --git a/charts/simple-app/values.yaml b/charts/simple-app/values.yaml
@@ -204,3 +204,4 @@ monitoringCoreos:
   # If enabled, creates ServiceMonitor for Prometheus Operator
   enabled: false
   path: "/metrics"
+  port: http
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Remove `fullnameOverride` - it should always be equal to `.Release.Name`
		* Rename `nameOverride` to `appName`, make it required