From e6d9b99255864cf3f88becc4326e2ea38ee71bb4 Mon Sep 17 00:00:00 2001
From: Dmitry Chepurovskiy <me@dm3ch.net>
Date: Tue, 3 Oct 2023 03:42:46 +0300
Subject: [PATCH] Allow using label selectors for system labels for sql
 backend.

Fixes #12435

Signed-off-by: Dmitry Chepurovskiy <me@dm3ch.net>
---
 pkg/storage/driver/sql.go      | 14 ++++++++++++++
 pkg/storage/driver/sql_test.go | 11 +++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pkg/storage/driver/sql.go b/pkg/storage/driver/sql.go
index 743886e80..a1c2209a3 100644
--- a/pkg/storage/driver/sql.go
+++ b/pkg/storage/driver/sql.go
@@ -19,6 +19,7 @@ package driver // import "helm.sh/helm/v3/pkg/storage/driver"
 import (
 	"fmt"
 	"sort"
+	"strconv"
 	"time"
 
 	"github.com/jmoiron/sqlx"
@@ -368,6 +369,9 @@ func (s *SQL) List(filter func(*rspb.Release) bool) ([]*rspb.Release, error) {
 			s.Log("failed to get release %s/%s custom labels: %v", record.Namespace, record.Key, err)
 			return nil, err
 		}
+		for k, v := range getReleaseSystemLabels(release) {
+			release.Labels[k] = v
+		}
 
 		if filter(release) {
 			releases = append(releases, release)
@@ -681,3 +685,13 @@ func (s *SQL) getReleaseCustomLabels(key string, namespace string) (map[string]s
 
 	return filterSystemLabels(labelsMap), nil
 }
+
+// Rebuild system labels from release object
+func getReleaseSystemLabels(rls *rspb.Release) map[string]string {
+	return map[string]string{
+		"name":    rls.Name,
+		"owner":   sqlReleaseDefaultOwner,
+		"status":  rls.Info.Status.String(),
+		"version": strconv.Itoa(rls.Version),
+	}
+}
diff --git a/pkg/storage/driver/sql_test.go b/pkg/storage/driver/sql_test.go
index 067b3cf47..446dfafa9 100644
--- a/pkg/storage/driver/sql_test.go
+++ b/pkg/storage/driver/sql_test.go
@@ -157,6 +157,17 @@ func TestSQLList(t *testing.T) {
 	if err := mock.ExpectationsWereMet(); err != nil {
 		t.Errorf("sql expectations weren't met: %v", err)
 	}
+
+	// Check if release having both system and custom labels, this is needed to ensure that selector filtering would work.
+	rls := ssd[0]
+	_, ok := rls.Labels["name"]
+	if !ok {
+		t.Fatalf("Expected 'name' label in results, actual %v", rls.Labels)
+	}
+	_, ok = rls.Labels["key1"]
+	if !ok {
+		t.Fatalf("Expected 'key-1' label in results, actual %v", rls.Labels)
+	}
 }
 
 func TestSqlCreate(t *testing.T) {