♻️ (relax-sounds): Merge metrics service into main

gabe565 · Jul 9, 2023 · a0fe345 · a0fe345
1 parent e709685
commit a0fe345
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/charts/relax-sounds/Chart.yaml b/charts/relax-sounds/Chart.yaml
@@ -4,7 +4,7 @@ description: Relax Sounds is a website that lets you stream relaxing sounds to y
 home: https://charts.gabe565.com/charts/relax-sounds/
 icon: https://github.com/gabe565/relax-sounds/raw/3e55b07a957f2e20aceeeba1d36226791f2f1569/frontend/src/assets/icon-purple.svg
 type: application
-version: 0.6.1
+version: 0.6.2
 # renovate datasource=docker depName=ghcr.io/gabe565/relax-sounds
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
@@ -16,8 +16,8 @@ sources:
   - https://github.com/gabe565/relax-sounds
 annotations:
   artifacthub.io/changes: |-
-    - kind: added
-      description: Add ServiceMonitor values
+    - kind: changed
+      description: Merge merics service into main
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/gabe565/relax-sounds

diff --git a/charts/relax-sounds/README.md b/charts/relax-sounds/README.md
@@ -2,7 +2,7 @@
 
 <img src="https://github.com/gabe565/relax-sounds/raw/3e55b07a957f2e20aceeeba1d36226791f2f1569/frontend/src/assets/icon-purple.svg" align="right" width="92" alt="relax-sounds logo">
 
-![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat)
+![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
 ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat)
 
@@ -11,7 +11,7 @@ Relax Sounds is a website that lets you stream relaxing sounds to your browser o
 **Homepage:** <https://charts.gabe565.com/charts/relax-sounds/>
 
 **This chart is not maintained by the upstream project and any issues with the chart should be raised
-[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=relax-sounds&version=0.6.1)**
+[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=relax-sounds&version=0.6.2)**
 
 ## Source Code
 
@@ -93,7 +93,6 @@ N/A
 | service | object | See [values.yaml](./values.yaml) | Configures service settings for the chart. |
 | serviceMonitor.main.enabled | bool | `false` | Enables or disables the serviceMonitor. |
 | serviceMonitor.main.endpoints | list | See [values.yaml](./values.yaml) | Configures the endpoints for the serviceMonitor. |
-| serviceMonitor.main.serviceName | string | `"{{ include \"bjw-s.common.lib.chart.names.fullname\" $ }}-metrics"` | Configures the target Service for the serviceMonitor. Helm templates can be used. |
 
 ---
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
diff --git a/charts/relax-sounds/values.yaml b/charts/relax-sounds/values.yaml
@@ -28,9 +28,6 @@ service:
     ports:
       http:
         port: 80
-  metrics:
-    enabled: false
-    ports:
       metrics:
         port: 9090
 
@@ -67,8 +64,6 @@ serviceMonitor:
   main:
     # -- Enables or disables the serviceMonitor.
     enabled: false
-    # -- Configures the target Service for the serviceMonitor. Helm templates can be used.
-    serviceName: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}-metrics'
     # -- Configures the endpoints for the serviceMonitor.
     # @default -- See [values.yaml](./values.yaml)
     endpoints: