From aa610d51fd28c8a47dd140836fb86332cad1cfbc Mon Sep 17 00:00:00 2001
From: kw1knode <vince@nodeify.net>
Date: Mon, 8 Jul 2024 15:30:56 -0700
Subject: [PATCH] bump version, fix labels

---
 charts/substreams-sink-noop/Chart.yaml                 | 2 +-
 charts/substreams-sink-noop/templates/service.yaml     | 5 ++---
 charts/substreams-sink-noop/templates/statefulSet.yaml | 9 ++++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/charts/substreams-sink-noop/Chart.yaml b/charts/substreams-sink-noop/Chart.yaml
index af1cee0..190c9a2 100644
--- a/charts/substreams-sink-noop/Chart.yaml
+++ b/charts/substreams-sink-noop/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: 1.0.0
+version: 2.0.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/substreams-sink-noop/templates/service.yaml b/charts/substreams-sink-noop/templates/service.yaml
index 4fbd6ed..944d1dc 100644
--- a/charts/substreams-sink-noop/templates/service.yaml
+++ b/charts/substreams-sink-noop/templates/service.yaml
@@ -9,7 +9,7 @@ kind: Service
 metadata:
   name: {{ include "noop.uniqueName" . }}-svc
   labels:
-    {{- include "noop.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ include "noop.uniqueName" . }}-svc
 spec:
   type: {{ .Values.noop.service.type }}
   {{- if .Values.noop.service.ipFamilyPolicy }}
@@ -28,5 +28,4 @@ spec:
       targetPort: metrics
       protocol: TCP
   selector:
-    {{- include "noop.selectorLabels" . | nindent 4 }}
-    {{- $componentLabel | nindent 4 }}
\ No newline at end of file
+    app.kubernetes.io/name: {{ include "noop.uniqueName" . }}
\ No newline at end of file
diff --git a/charts/substreams-sink-noop/templates/statefulSet.yaml b/charts/substreams-sink-noop/templates/statefulSet.yaml
index dc7d693..9773fb3 100644
--- a/charts/substreams-sink-noop/templates/statefulSet.yaml
+++ b/charts/substreams-sink-noop/templates/statefulSet.yaml
@@ -9,11 +9,14 @@ metadata:
   name: {{ include "noop.uniqueName" .}}
   labels:
     {{- include "noop.labels" . | nindent 4 }}
+    {{- if $componentLabel }}
     {{- $componentLabel | nindent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
-      {{- include "noop.selectorLabels" . | nindent 4 }}
+      app.kubernetes.io/name: {{ include "noop.uniqueName" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   {{- if $values.volumeClaimSpec.enabled }}
   volumeClaimTemplates:
     - metadata:
@@ -31,8 +34,8 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "noop.labels" . | nindent 4 }}
-        {{- $componentLabel | nindent 4 }}
+        app.kubernetes.io/name: {{ include "noop.uniqueName" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       {{- with $values.podSecurityContext }}
       securityContext: