Skip to content

Commit 347e19a

Browse files
committed
feat: remove product config & clean up
1 parent e2b7055 commit 347e19a

38 files changed

Lines changed: 2470 additions & 2120 deletions

Cargo.lock

Lines changed: 178 additions & 154 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 359 additions & 275 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ edition = "2021"
1010
repository = "https://github.com/stackabletech/trino-operator"
1111

1212
[workspace.dependencies]
13-
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
1413
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.111.0", features = ["webhook"] }
1514

1615
anyhow = "1.0"
1716
async-trait = "0.1"
1817
built = { version = "0.8", features = ["chrono", "git2"] }
19-
clap = "4.5"
18+
clap = "4.6"
2019
const_format = "0.2"
2120
futures = { version = "0.3", features = ["compat"] }
2221
indoc = "2.0"
@@ -26,9 +25,10 @@ serde_json = "1.0"
2625
serde_yaml = "0.9"
2726
snafu = "0.9"
2827
strum = { version = "0.28", features = ["derive"] }
29-
tokio = { version = "1.40", features = ["full"] }
28+
tokio = { version = "1.52", features = ["full"] }
3029
tracing = "0.1"
30+
uuid = "1.23"
3131

32-
# [patch."https://github.com/stackabletech/operator-rs.git"]
33-
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
32+
[patch."https://github.com/stackabletech/operator-rs.git"]
33+
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "smooth-operator"}
3434
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

crate-hashes.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/config-spec/properties.yaml

Lines changed: 3 additions & 267 deletions
Original file line numberDiff line numberDiff line change
@@ -1,269 +1,5 @@
1+
---
12
version: 0.1.0
23
spec:
3-
units:
4-
- unit: &unitNodeEnvironment
5-
name: "node_environment"
6-
regex: "^[a-z][a-z0-9_]*[a-z0-9]$"
7-
examples:
8-
- "a1_2_3b"
9-
- unit: &unitMemory
10-
name: "memory"
11-
regex: "(^\\p{N}+)(?:\\s*)((?:b|k|m|g|t|p|kb|mb|gb|tb|pb|B|K|M|G|T|P|KB|MB|GB|TB|PB)\\b$)"
12-
examples:
13-
- "1024b"
14-
- "1024kb"
15-
- "500m"
16-
- "1g"
17-
18-
###################################################################################################
19-
# node.properties
20-
###################################################################################################
21-
properties:
22-
- property:
23-
propertyNames:
24-
- name: "networkaddress.cache.ttl"
25-
kind:
26-
type: "file"
27-
file: "security.properties"
28-
datatype:
29-
type: "integer"
30-
min: "0"
31-
recommendedValues:
32-
- fromVersion: "0.0.0"
33-
value: "30"
34-
roles:
35-
- name: "coordinator"
36-
required: true
37-
asOfVersion: "0.0.0"
38-
comment: "TTL for successfully resolved domain names."
39-
description: "TTL for successfully resolved domain names."
40-
41-
- property:
42-
propertyNames:
43-
- name: "networkaddress.cache.ttl"
44-
kind:
45-
type: "file"
46-
file: "security.properties"
47-
datatype:
48-
type: "integer"
49-
min: "0"
50-
recommendedValues:
51-
- fromVersion: "0.0.0"
52-
value: "30"
53-
roles:
54-
- name: "worker"
55-
required: true
56-
asOfVersion: "0.0.0"
57-
comment: "TTL for successfully resolved domain names."
58-
description: "TTL for successfully resolved domain names."
59-
60-
- property:
61-
propertyNames:
62-
- name: "networkaddress.cache.negative.ttl"
63-
kind:
64-
type: "file"
65-
file: "security.properties"
66-
datatype:
67-
type: "integer"
68-
min: "0"
69-
recommendedValues:
70-
- fromVersion: "0.0.0"
71-
value: "0"
72-
roles:
73-
- name: "coordinator"
74-
required: true
75-
asOfVersion: "0.0.0"
76-
comment: "TTL for domain names that cannot be resolved."
77-
description: "TTL for domain names that cannot be resolved."
78-
79-
- property:
80-
propertyNames:
81-
- name: "networkaddress.cache.negative.ttl"
82-
kind:
83-
type: "file"
84-
file: "security.properties"
85-
datatype:
86-
type: "integer"
87-
min: "0"
88-
recommendedValues:
89-
- fromVersion: "0.0.0"
90-
value: "0"
91-
roles:
92-
- name: "worker"
93-
required: true
94-
asOfVersion: "0.0.0"
95-
comment: "TTL for domain names that cannot be resolved."
96-
description: "TTL for domain names that cannot be resolved."
97-
98-
99-
- property: &nodeEnvironment
100-
propertyNames:
101-
- name: "node.environment"
102-
kind:
103-
type: "file"
104-
file: "node.properties"
105-
datatype:
106-
type: "string"
107-
unit: *unitNodeEnvironment
108-
roles:
109-
- name: "coordinator"
110-
required: true
111-
- name: "worker"
112-
required: true
113-
asOfVersion: "0.0.0"
114-
115-
###################################################################################################
116-
# config.properties
117-
###################################################################################################
118-
- property: &coordinator
119-
propertyNames:
120-
- name: "coordinator"
121-
kind:
122-
type: "file"
123-
file: "config.properties"
124-
datatype:
125-
type: "bool"
126-
defaultValues:
127-
- fromVersion: "0.0.0"
128-
value: "false"
129-
roles:
130-
- name: "coordinator"
131-
required: true
132-
- name: "worker"
133-
required: true
134-
asOfVersion: "0.0.0"
135-
136-
- property: &nodeSchedulerIncludeCoordinator
137-
propertyNames:
138-
- name: "node-scheduler.include-coordinator"
139-
kind:
140-
type: "file"
141-
file: "config.properties"
142-
datatype:
143-
type: "bool"
144-
defaultValues:
145-
- fromVersion: "0.0.0"
146-
value: "false"
147-
roles:
148-
- name: "coordinator"
149-
required: true
150-
asOfVersion: "0.0.0"
151-
152-
- property: &httpServerHttpPort
153-
propertyNames:
154-
- name: "http-server.http.port"
155-
kind:
156-
type: "file"
157-
file: "config.properties"
158-
datatype:
159-
type: "integer"
160-
min: "1024"
161-
max: "65535"
162-
defaultValues:
163-
- fromVersion: "0.0.0"
164-
value: "8080"
165-
roles:
166-
- name: "coordinator"
167-
required: false
168-
- name: "worker"
169-
required: false
170-
asOfVersion: "0.0.0"
171-
172-
- property: &httpServerHttpsPort
173-
propertyNames:
174-
- name: "http-server.https.port"
175-
kind:
176-
type: "file"
177-
file: "config.properties"
178-
datatype:
179-
type: "integer"
180-
min: "1024"
181-
max: "65535"
182-
defaultValues:
183-
- fromVersion: "0.0.0"
184-
value: "8443"
185-
roles:
186-
- name: "coordinator"
187-
required: false
188-
- name: "worker"
189-
required: false
190-
asOfVersion: "0.0.0"
191-
192-
- property: &queryMaxMemory
193-
propertyNames:
194-
- name: "query.max-memory"
195-
kind:
196-
type: "file"
197-
file: "config.properties"
198-
datatype:
199-
type: "string"
200-
unit: *unitMemory
201-
defaultValues:
202-
- fromVersion: "0.0.0"
203-
value: "50GB"
204-
roles:
205-
- name: "coordinator"
206-
required: true
207-
- name: "worker"
208-
required: true
209-
asOfVersion: "0.0.0"
210-
211-
- property: &queryMaxMemoryPerNode
212-
propertyNames:
213-
- name: "query.max-memory-per-node"
214-
kind:
215-
type: "file"
216-
file: "config.properties"
217-
datatype:
218-
type: "string"
219-
unit: *unitMemory
220-
roles:
221-
- name: "coordinator"
222-
required: false
223-
- name: "worker"
224-
required: false
225-
asOfVersion: "0.0.0"
226-
227-
- property: &httpServerAuthenticationType
228-
propertyNames:
229-
- name: "http-server.authentication.type"
230-
kind:
231-
type: "file"
232-
file: "config.properties"
233-
datatype:
234-
type: "string"
235-
roles:
236-
- name: "coordinator"
237-
required: false
238-
asOfVersion: "0.0.0"
239-
240-
###################################################################################################
241-
# jvm.config
242-
###################################################################################################
243-
244-
###################################################################################################
245-
# log.properties
246-
###################################################################################################
247-
248-
- property: &ioTrino
249-
propertyNames:
250-
- name: "io.trino"
251-
kind:
252-
type: "file"
253-
file: "log.properties"
254-
datatype:
255-
type: "string"
256-
defaultValues:
257-
- fromVersion: "0.0.0"
258-
value: "INFO"
259-
allowedValues:
260-
- "INFO"
261-
- "DEBUG"
262-
- "WARN"
263-
- "ERROR"
264-
roles:
265-
- name: "coordinator"
266-
required: true
267-
- name: "worker"
268-
required: true
269-
asOfVersion: "0.0.0"
4+
units: []
5+
properties: []

0 commit comments

Comments
 (0)