From 0474a37c1209eed56dc24467b7f774f8145e12e7 Mon Sep 17 00:00:00 2001
From: Andrey Tatarinov <a@tatarinov.co>
Date: Wed, 23 Oct 2024 12:43:26 +0400
Subject: [PATCH] simple-app 0.14.0: * Add `monitoringCoreos.port` for case
 when monitoring endpoint is on a different port

---
 charts/simple-app/CHANGELOG.md                  | 5 +++++
 charts/simple-app/Chart.yaml                    | 2 +-
 charts/simple-app/TODO                          | 2 ++
 charts/simple-app/templates/servicemonitor.yaml | 4 ++--
 charts/simple-app/values.schema.json            | 3 +++
 charts/simple-app/values.yaml                   | 1 +
 6 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 charts/simple-app/TODO

diff --git a/charts/simple-app/CHANGELOG.md b/charts/simple-app/CHANGELOG.md
index c114e01..721cfa7 100644
--- 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
index 6737762..5cb25fb 100644
--- 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
new file mode 100644
index 0000000..56c1844
--- /dev/null
+++ 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
index f788dd9..e6ac45e 100644
--- 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
index 1aae96e..741f58e 100644
--- 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
index 2f62c7c..e7100d2 100644
--- 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