Skip to content

Commit 7079b74

Browse files
fantapsodyfantapsody
authored
Merge branch 'master' into yyang/bundle-catalog
2 parents 5392036 + 1d177a1 commit 7079b74

56 files changed

Lines changed: 457 additions & 388 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci/clusters/compute_v1alpha1_function.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ metadata:
55
namespace: default
66
spec:
77
className: org.apache.pulsar.functions.api.examples.ExclamationFunction
8-
sourceType: java.lang.String
9-
sinkType: java.lang.String
108
forwardSourceMessageProperty: true
119
MaxPendingAsyncRequests: 1000
1210
replicas: 1
@@ -15,8 +13,10 @@ spec:
1513
input:
1614
topics:
1715
- persistent://public/default/source-topic1
16+
typeClassName: java.lang.String
1817
output:
1918
topic: persistent://public/default/sink-topic
19+
typeClassName: java.lang.String
2020
resources:
2121
requests:
2222
cpu: "0.1"

‎.ci/clusters/compute_v1alpha1_go_function.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ metadata:
44
name: go-function-sample
55
namespace: default
66
spec:
7-
sourceType: java.lang.String
8-
sinkType: java.lang.String
97
forwardSourceMessageProperty: true
108
MaxPendingAsyncRequests: 1000
119
replicas: 1

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,22 @@ jobs:
101101
username: tuteng
102102
password: ${{ secrets.IMAGE_GITHUB_TOKEN }}
103103

104-
- name: Auto generate crd model
105-
run: cd java-proxy && ./tool/generate-crd.sh
104+
- name: Auto generate crd model
105+
run: cd mesh-worker-service && ./tool/generate-crd.sh
106106

107107
- name: Format license
108-
run: cd java-proxy && mvn license:format
108+
run: cd mesh-worker-service && mvn license:format
109109

110-
- name: Run mesh proxy unit test
110+
- name: Run mesh worker service unit test
111111
run: |
112-
cd java-proxy
112+
cd mesh-worker-service
113113
mvn clean install
114114
115-
- name: Upload java proxy nar package to release
115+
- name: Upload mesh worker service nar package to release
116116
uses: svenstaro/upload-release-action@v2
117117
with:
118118
repo_token: ${{ secrets.GITHUB_TOKEN }}
119-
file: java-proxy/target/java-proxy-${{ github.event.release.tag_name }}.nar
120-
asset_name: java-proxy-${{ github.event.release.tag_name }}.nar
119+
file: mesh-worker-service/target/mesh-worker-service-${{ github.event.release.tag_name }}.nar
120+
asset_name: mesh-worker-service-${{ github.event.release.tag_name }}.nar
121121
tag: ${{ github.ref }}
122122
overwrite: true

.github/workflows/test-function-mesh-proxy.yml renamed to .github/workflows/test-mesh-worker-service.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
password: ${{ secrets.IMAGE_GITHUB_TOKEN }}
3636

3737
- name: Auto generate crd model
38-
run: cd java-proxy && ./tool/generate-crd.sh
38+
run: cd mesh-worker-service && ./tool/generate-crd.sh
3939

4040
- name: Format license
41-
run: cd java-proxy && mvn license:format
41+
run: cd mesh-worker-service && mvn license:format
4242

4343
- name: Run mesh proxy unit test
44-
run: cd java-proxy && mvn clean install
44+
run: cd mesh-worker-service && mvn clean install
4545

‎api/v1alpha1/common.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ type SecretRef struct {
104104
}
105105

106106
type InputConf struct {
107+
TypeClassName string `json:"typeClassName,omitempty"`
107108
Topics []string `json:"topics,omitempty"`
108109
TopicPattern string `json:"topicPattern,omitempty"`
109110
CustomSerdeSources map[string]string `json:"customSerdeSources,omitempty"`
@@ -122,6 +123,7 @@ type ConsumerConfig struct {
122123
}
123124

124125
type OutputConf struct {
126+
TypeClassName string `json:"typeClassName,omitempty"`
125127
Topic string `json:"topic,omitempty"`
126128
SinkSerdeClassName string `json:"sinkSerdeClassName,omitempty"`
127129
SinkSchemaType string `json:"sinkSchemaType,omitempty"`

‎api/v1alpha1/function_types.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ type FunctionSpec struct {
3333
ClassName string `json:"className,omitempty"`
3434
Tenant string `json:"tenant,omitempty"`
3535
ClusterName string `json:"clusterName,omitempty"`
36-
SourceType string `json:"sourceType,omitempty"`
37-
SinkType string `json:"sinkType,omitempty"`
3836
Replicas *int32 `json:"replicas,omitempty"`
3937
MaxReplicas *int32 `json:"maxReplicas,omitempty"` // if provided, turn on autoscaling
4038
Input InputConf `json:"input,omitempty"`

‎api/v1alpha1/sink_types.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ type SinkSpec struct {
3333
ClassName string `json:"className,omitempty"`
3434
ClusterName string `json:"clusterName,omitempty"`
3535
Tenant string `json:"tenant,omitempty"`
36-
SourceType string `json:"sourceType,omitempty"`
37-
SinkType string `json:"sinkType,omitempty"`
36+
SinkType string `json:"sinkType,omitempty"` // refer to `--sink-type` as builtin connector
3837
Replicas *int32 `json:"replicas,omitempty"`
3938
MaxReplicas *int32 `json:"maxReplicas,omitempty"` // if provided, turn on autoscaling
4039
Input InputConf `json:"input,omitempty"`

‎api/v1alpha1/source_types.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ type SourceSpec struct {
3333
ClassName string `json:"className,omitempty"`
3434
Tenant string `json:"tenant,omitempty"`
3535
ClusterName string `json:"clusterName,omitempty"`
36-
SourceType string `json:"sourceType,omitempty"`
37-
SinkType string `json:"sinkType,omitempty"`
36+
SourceType string `json:"sourceType,omitempty"` // refer to `--source-type` as builtin connector
3837
Replicas *int32 `json:"replicas,omitempty"`
3938
MaxReplicas *int32 `json:"maxReplicas,omitempty"` // if provided, turn on autoscaling
4039
Output OutputConf `json:"output,omitempty"`

‎config/crd/bases/compute.functionmesh.io_functionmeshes.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ spec:
134134
items:
135135
type: string
136136
type: array
137+
typeClassName:
138+
type: string
137139
type: object
138140
java:
139141
properties:
@@ -212,6 +214,8 @@ spec:
212214
type: string
213215
topic:
214216
type: string
217+
typeClassName:
218+
type: string
215219
type: object
216220
pod:
217221
properties:
@@ -2916,10 +2920,6 @@ spec:
29162920
type: string
29172921
type: object
29182922
type: object
2919-
sinkType:
2920-
type: string
2921-
sourceType:
2922-
type: string
29232923
subscriptionName:
29242924
type: string
29252925
subscriptionPosition:
@@ -3054,6 +3054,8 @@ spec:
30543054
items:
30553055
type: string
30563056
type: array
3057+
typeClassName:
3058+
type: string
30573059
type: object
30583060
java:
30593061
properties:
@@ -5783,8 +5785,6 @@ spec:
57835785
type: object
57845786
sinkType:
57855787
type: string
5786-
sourceType:
5787-
type: string
57885788
subscriptionName:
57895789
type: string
57905790
subscriptionPosition:
@@ -5915,6 +5915,8 @@ spec:
59155915
type: string
59165916
topic:
59175917
type: string
5918+
typeClassName:
5919+
type: string
59185920
type: object
59195921
pod:
59205922
properties:
@@ -8615,8 +8617,6 @@ spec:
86158617
type: string
86168618
type: object
86178619
type: object
8618-
sinkType:
8619-
type: string
86208620
sourceConfig:
86218621
additionalProperties:
86228622
type: string

‎config/crd/bases/compute.functionmesh.io_functions.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ spec:
134134
items:
135135
type: string
136136
type: array
137+
typeClassName:
138+
type: string
137139
type: object
138140
java:
139141
properties:
@@ -212,6 +214,8 @@ spec:
212214
type: string
213215
topic:
214216
type: string
217+
typeClassName:
218+
type: string
215219
type: object
216220
pod:
217221
properties:
@@ -2916,10 +2920,6 @@ spec:
29162920
type: string
29172921
type: object
29182922
type: object
2919-
sinkType:
2920-
type: string
2921-
sourceType:
2922-
type: string
29232923
subscriptionName:
29242924
type: string
29252925
subscriptionPosition:

0 commit comments

Comments
 (0)