Merge branch 'apache:master' into master

Author: wangzhigang1999

.github/workflows/license.yml

@@ -41,10 +41,10 @@ jobs:
           distribution: temurin
           java-version: 8
           cache: 'maven'
-      - run: >-
-          build/mvn org.apache.rat:apache-rat-plugin:check
-          -Ptpcds -Pkubernetes-it
-          -Pspark-3.3 -Pspark-3.4 -Pspark-3.5
+      - run: |
+          build/mvn org.apache.rat:apache-rat-plugin:check \
+            -Ptpcds -Pkubernetes-it \
+            -Pspark-3.3 -Pspark-3.4 -Pspark-3.5 -Pspark-4.0
       - name: Upload rat report
         if: failure()
         uses: actions/upload-artifact@v4

.github/workflows/master.yml

@@ -77,7 +77,7 @@ jobs:
             comment: 'verify-on-spark-3.4-binary'
           - java: 17
             spark: '3.5'
-            spark-archive: '-Pscala-2.13 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-4.0.0-preview2 -Dspark.archive.name=spark-4.0.0-preview2-bin-hadoop3.tgz'
+            spark-archive: '-Pscala-2.13 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-4.0.0 -Dspark.archive.name=spark-4.0.0-bin-hadoop3.tgz'
             exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.SparkLocalClusterTest'
             comment: 'verify-on-spark-4.0-binary'
     env:

.rat-excludes

@@ -43,6 +43,7 @@ build/scala-*/**
 **/metadata-store-schema*.sql
 **/*.derby.sql
 **/*.mysql.sql
+**/*.postgresql.sql
 **/*.sqlite.sql
 **/node/**
 **/web-ui/dist/**

build/release/known_translations

@@ -63,6 +63,7 @@ Wang, Fei - Fei Wang
 wangmiao1002 - Miao Wang
 waywtdcc - Chao Chen
 wForget - Zhen Wang
+xglv1985 - Xu Guang Lv
 Xieming LI - Xieming Li
 XorSum - Baokun Han
 yabola - Chenliang Lu

build/release/pre_gen_release_notes.py

@@ -214,8 +214,8 @@ def is_revert(commit_title):
 # e.g. * Fu Chen
 contributors_file = open(os.path.join(release_dir, contributors_file_name), "w")
 sorted_authors = list(authors)
-sorted_authors.sort(key=lambda author: author.split(" ")[-1])
-for author in authors:
+sorted_authors.sort(key=lambda author: author.split(" ")[0].lower())
+for author in sorted_authors:
     contributors_file.write("* %s\n" % author)
 contributors_file.close()
 print("Contributors list is successfully written to %s!" % contributors_file_name)

charts/kyuubi/templates/kyuubi-alert.yaml

@@ -22,6 +22,9 @@ metadata:
   name: {{ .Release.Name }}
   labels:
     {{- include "kyuubi.labels" . | nindent 4 }}
+    {{- if .Values.metrics.prometheusRule.labels }}
+      {{- toYaml .Values.metrics.prometheusRule.labels | nindent 4 }}
+    {{- end }}
 spec:
   groups:
     {{- toYaml .Values.metrics.prometheusRule.groups | nindent 4 }}

charts/kyuubi/templates/kyuubi-headless-service.yaml

@@ -21,6 +21,10 @@ metadata:
   name: {{ .Release.Name }}-headless
   labels:
     {{- include "kyuubi.labels" $ | nindent 4 }}
+  {{- with .Values.service.headless.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: ClusterIP
   clusterIP: None

charts/kyuubi/templates/kyuubi-podmonitor.yaml

@@ -23,7 +23,7 @@ metadata:
   labels:
     {{- include "kyuubi.labels" . | nindent 4 }}
     {{- if .Values.metrics.podMonitor.labels }}
-    {{- toYaml .Values.metrics.podMonitor.labels | nindent 4 }}
+      {{- toYaml .Values.metrics.podMonitor.labels | nindent 4 }}
     {{- end }}
 spec:
   selector:

charts/kyuubi/templates/kyuubi-servicemonitor.yaml

@@ -23,7 +23,7 @@ metadata:
   labels:
     {{- include "kyuubi.labels" . | nindent 4 }}
     {{- if .Values.metrics.serviceMonitor.labels }}
-    {{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
+      {{- toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
     {{- end }}
 spec:
   selector:

charts/kyuubi/templates/kyuubi-statefulset.yaml

@@ -40,6 +40,9 @@ spec:
       annotations:
         checksum/conf: {{ include (print $.Template.BasePath "/kyuubi-configmap.yaml") . | sha256sum }}
         checksum/conf-hadoop: {{ include (print $.Template.BasePath "/kyuubi-hadoop-configmap.yaml") . | sha256sum }}
+        {{- with .Values.podAnnotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 8 }}