(kyuubi) branch branch-1.8 updated: [KYUUBI #6298][HELM] Make ServiceMonitor use selector labels

[chengpan]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/branch-1.8 by this push:
     new 0cc80b2c2 [KYUUBI #6298][HELM] Make ServiceMonitor use selector labels
0cc80b2c2 is described below

commit 0cc80b2c2b668dec590bc8ee688196db454def1d
Author: Harry <quanghai.ng1...@gmail.com>
AuthorDate: Mon Apr 15 09:43:02 2024 +0800

    [KYUUBI #6298][HELM] Make ServiceMonitor use selector labels
    
    # :mag: Description
    ## Issue References 🔗
    
    This pull request fixes #6298
    
    ## Describe Your Solution 🔧
    
    Change matchlabels field to use template `selectorLabels`
    
    ## Types of changes :bookmark:
    
    - [x] Bugfix (non-breaking change which fixes an issue)
    - [ ] New feature (non-breaking change which adds functionality)
    - [ ] Breaking change (fix or feature that would cause existing 
functionality to change)
    
    ## Test Plan 🧪
    
    #### Behavior Without This Pull Request :coffin:
    
    ServiceMonitor is not able to match kyuubi service
    
    #### Related Unit Tests
    
    Ran `helm template` and produced yaml files as expected
    
    ---
    
    # Checklist 📝
    
    - [x] This patch was not authored or co-authored using [Generative 
Tooling](https://www.apache.org/legal/generative-tooling.html)
    
    **Be nice. Be informative.**
    
    Closes #6301 from sudohainguyen/helmchart.
    
    Closes #6298
    
    cdc669852 [Harry] Include template consistently
    bd82fb426 [Harry] [KYUUBI #6298][HELM] Make ServiceMonitor use selector 
labels to discover metric service
    
    Authored-by: Harry <quanghai.ng1...@gmail.com>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
    (cherry picked from commit 968fa09183dc8cb604ec03e0efb82b2e9fc9eb58)
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 charts/kyuubi/templates/kyuubi-servicemonitor.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/kyuubi/templates/kyuubi-servicemonitor.yaml 
b/charts/kyuubi/templates/kyuubi-servicemonitor.yaml
index 11098a0ea..e09dec785 100644
--- a/charts/kyuubi/templates/kyuubi-servicemonitor.yaml
+++ b/charts/kyuubi/templates/kyuubi-servicemonitor.yaml
@@ -25,7 +25,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: {{ .Release.Name }}
+      {{- include "kyuubi.selectorLabels" . | nindent 6 }}
   endpoints:
     {{- toYaml .Values.serviceMonitor.endpoints | nindent 4 }}
 {{- end }}