Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from apache:master #51

Merged
merged 3 commits into from
Dec 9, 2024
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 9, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

wForget and others added 3 commits December 9, 2024 19:56
### Why are the changes needed?

Enable gluten CI for kyuubi apache repo

### How was this patch tested?

Review

### Was this patch authored or co-authored using generative AI tooling?

No

Closes #6846 from wForget/gluten_ci.

Closes #6846

22ab3ad [wforget] Enable gluten CI for kyuubi apache repo

Authored-by: wforget <[email protected]>
Signed-off-by: wforget <[email protected]>
# Description

Currently, Kyuubi supports Trino progress in scala-2.12, but got some error in scala-2.13.
* Make Trino progress available in scala-2.13

## Types of changes 🔖

- [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 🧪

---

# 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 #6841 from naive-zhang/trino-scala13.

Closes #6726

0693d28 [Cheng Pan] Update externals/kyuubi-trino-engine/pom.xml
c20c49a [native-zhang] modify scala code style
6cfe445 [native-zhang] unify scala grammar
c0cd92e [native-zhang] change total stage num back into 3 in TrinoOperationProgressSuite
852398d [naive-zhang] Merge branch 'apache:master' into trino-scala13
6a038ec [native-zhang] move trino progress monitor available in profile scala-2.13
f434a21 [native-zhang] move trino progress monitor into scala-2.12 impl and change state num in some test case
8d291f5 [native-zhang] add scala version diff in pom for trino module

Lead-authored-by: native-zhang <[email protected]>
Co-authored-by: Cheng Pan <[email protected]>
Co-authored-by: naive-zhang <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
### Why are the changes needed?

I am using the podminitor of kyuubi metrics, But I found using the podmonitor's selector.matchLabels can not select correct pods . So I fix it .

I also changed the values.yaml to add an example of podmonitor to improve the usability.

### How was this patch tested?

```
helm install kyuubi .
# kubectl get podmonitor kyuubi -oyaml
apiVersion: monitoring.coreos.com/v1
kind: PodMonitor
metadata:
  annotations:
    meta.helm.sh/release-name: kyuubi
    meta.helm.sh/release-namespace: default
  creationTimestamp: "2024-12-06T07:46:12Z"
  generation: 1
  labels:
    app.kubernetes.io/instance: kyuubi
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/name: kyuubi
    app.kubernetes.io/version: 1.8.0
    helm.sh/chart: kyuubi-0.1.0
  name: kyuubi
  namespace: default
  resourceVersion: "7583800"
  uid: 0dd11e43-d126-434e-988a-7f1914586e2b
spec:
  podMetricsEndpoints:
  - path: /metrics
    port: prometheus
  selector:
    matchLabels:
      app.kubernetes.io/instance: kyuubi
      app.kubernetes.io/name: kyuubi
# kubectl get po -l app.kubernetes.io/instance=kyuubi
NAME       READY   STATUS    RESTARTS   AGE
kyuubi-0   1/1     Running   0          24m
kyuubi-1   1/1     Running   0          22m
# kubectl get po -l  app.kubernetes.io/name=kyuubi
NAME       READY   STATUS    RESTARTS   AGE
kyuubi-0   1/1     Running   0          24m
kyuubi-1   1/1     Running   0          23m
```
### Was this patch authored or co-authored using generative AI tooling?

No

Closes #6840 from zhifanggao/change_podmonitor.

Closes #6840

092f13f [zhifanggao] change the podmonitor to select pods correctly

Authored-by: zhifanggao <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
@pull pull bot added the ⤵️ pull label Dec 9, 2024
@pull pull bot merged commit 99e27d4 into huangxiaopingRD:master Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants