Fixing issue when service label selector used Release.Name - overridd…

…ing with more general fullnameOverride (#44)
blockscout · Nov 6, 2024 · 2d1cadd · 2d1cadd
1 parent 96df411
commit 2d1cadd
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 28 deletions.
diff --git a/charts/blockscout-stack/CHANGELOG.md b/charts/blockscout-stack/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## 1.7.1
+
+### Fix
+
+- Service selector labels now support fullnameOverride variable instead of Release.Name
+
 ## 1.7.0
 
 ### Feature

diff --git a/charts/blockscout-stack/Chart.yaml b/charts/blockscout-stack/Chart.yaml
@@ -15,10 +15,10 @@ 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.7.0
+version: 1.7.1
 
 # 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: "6.8.0"
+appVersion: "6.9.0"
diff --git a/charts/blockscout-stack/templates/blockscout-deployment.yaml b/charts/blockscout-stack/templates/blockscout-deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-blockscout
   labels:
-    app: {{ .Release.Name }}-blockscout
+    app: {{ include "blockscout-stack.fullname" . }}-blockscout
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   {{- if .Values.blockscout.separateApi.enabled }}
@@ -14,7 +14,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-blockscout
+      app: {{ include "blockscout-stack.fullname" . }}-blockscout
   template:
     metadata:
       annotations:
@@ -23,7 +23,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app: {{ .Release.Name }}-blockscout
+        app: {{ include "blockscout-stack.fullname" . }}-blockscout
         {{- include "blockscout-stack.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
@@ -227,13 +227,13 @@ kind: Deployment
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-blockscout-indexer
   labels:
-    app: {{ .Release.Name }}-blockscout-indexer
+    app: {{ include "blockscout-stack.fullname" . }}-blockscout-indexer
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.blockscout.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-blockscout-indexer
+      app: {{ include "blockscout-stack.fullname" . }}-blockscout-indexer
   template:
     metadata:
       annotations:
@@ -242,7 +242,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        app: {{ .Release.Name }}-blockscout-indexer
+        app: {{ include "blockscout-stack.fullname" . }}-blockscout-indexer
         {{- include "blockscout-stack.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/blockscout-stack/templates/blockscout-service.yaml b/charts/blockscout-stack/templates/blockscout-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-blockscout-svc
   labels:
-    app: {{ .Release.Name }}-blockscout-svc
+    app: {{ include "blockscout-stack.fullname" . }}-blockscout-svc
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.blockscout.service.type }}
@@ -14,5 +14,5 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app: {{ .Release.Name }}-blockscout
+    app: {{ include "blockscout-stack.fullname" . }}-blockscout
 {{- end }}
diff --git a/charts/blockscout-stack/templates/frontend-deployment.yaml b/charts/blockscout-stack/templates/frontend-deployment.yaml
@@ -4,13 +4,13 @@ kind: Deployment
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-frontend
   labels:
-    app: {{ .Release.Name }}-frontend
+    app: {{ include "blockscout-stack.fullname" . }}-frontend
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.frontend.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-frontend
+      app: {{ include "blockscout-stack.fullname" . }}-frontend
   template:
     metadata:
       annotations:
@@ -19,7 +19,7 @@ spec:
         releaseTime: {{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}
       {{- end }}
       labels:
-        app: {{ .Release.Name }}-frontend
+        app: {{ include "blockscout-stack.fullname" . }}-frontend
         {{- include "blockscout-stack.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/blockscout-stack/templates/frontend-podmonitor.yaml b/charts/blockscout-stack/templates/frontend-podmonitor.yaml
@@ -11,5 +11,5 @@ spec:
     path: /node-api/metrics
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-frontend
+      app: {{ include "blockscout-stack.fullname" . }}-frontend
 {{- end }}
diff --git a/charts/blockscout-stack/templates/frontend-service.yaml b/charts/blockscout-stack/templates/frontend-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-frontend-svc
   labels:
-    app: {{ .Release.Name }}-frontend-svc
+    app: {{ include "blockscout-stack.fullname" . }}-frontend-svc
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.frontend.service.type }}
@@ -14,5 +14,5 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app: {{ .Release.Name }}-frontend
+    app: {{ include "blockscout-stack.fullname" . }}-frontend
 {{- end }}
diff --git a/charts/blockscout-stack/templates/stats-deployment.yaml b/charts/blockscout-stack/templates/stats-deployment.yaml
@@ -4,13 +4,13 @@ kind: Deployment
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-stats
   labels:
-    app: {{ .Release.Name }}-stats
+    app: {{ include "blockscout-stack.fullname" . }}-stats
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.stats.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-stats
+      app: {{ include "blockscout-stack.fullname" . }}-stats
   template:
     metadata:
       annotations:
@@ -19,7 +19,7 @@ spec:
         releaseTime: {{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}
       {{- end }}
       labels:
-        app: {{ .Release.Name }}-stats
+        app: {{ include "blockscout-stack.fullname" . }}-stats
         {{- include "blockscout-stack.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/blockscout-stack/templates/stats-service.yaml b/charts/blockscout-stack/templates/stats-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-stats-svc
   labels:
-    app: {{ .Release.Name }}-stats-svc
+    app: {{ include "blockscout-stack.fullname" . }}-stats-svc
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.stats.service.type }}
@@ -18,5 +18,5 @@ spec:
       protocol: TCP
       name: http-metrics
   selector:
-    app: {{ .Release.Name }}-stats
+    app: {{ include "blockscout-stack.fullname" . }}-stats
 {{- end }}
diff --git a/charts/blockscout-stack/templates/user-ops-indexer-deployment.yaml b/charts/blockscout-stack/templates/user-ops-indexer-deployment.yaml
@@ -4,13 +4,13 @@ kind: Deployment
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer
   labels:
-    app: {{ .Release.Name }}-user-ops-indexer
+    app: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.userOpsIndexer.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}-user-ops-indexer
+      app: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer
   template:
     metadata:
       annotations:
@@ -19,7 +19,7 @@ spec:
         releaseTime: {{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}
       {{- end }}
       labels:
-        app: {{ .Release.Name }}-user-ops-indexer
+        app: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer
         {{- include "blockscout-stack.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/blockscout-stack/templates/user-ops-indexer-service.yaml b/charts/blockscout-stack/templates/user-ops-indexer-service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer-svc
   labels:
-    app: {{ .Release.Name }}-user-ops-indexer-svc
+    app: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer-svc
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.userOpsIndexer.service.type }}
@@ -18,15 +18,15 @@ spec:
       protocol: TCP
       name: http-metrics
   selector:
-    app: {{ .Release.Name }}-user-ops-indexer
+    app: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer
 ---
 {{- if .Values.userOpsIndexer.service.grpc.enabled }}
 kind: Service
 apiVersion: v1
 metadata:
   name: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer-grpc-svc
   labels:
-    app: {{ .Release.Name }}-user-ops-indexer-svc
+    app: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer-svc
     {{- include "blockscout-stack.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.userOpsIndexer.service.type }}
@@ -36,6 +36,6 @@ spec:
       protocol: TCP
       name: grpc
   selector:
-    app: {{ .Release.Name }}-user-ops-indexer
+    app: {{ include "blockscout-stack.fullname" . }}-user-ops-indexer
 {{- end }}
 {{- end }}